]> git.baikalelectronics.ru Git - uboot.git/commitdiff
env: do not fail on non-existing env.in file
authorAndrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
Sun, 3 Apr 2022 14:06:03 +0000 (16:06 +0200)
committerTom Rini <trini@konsulko.com>
Mon, 4 Apr 2022 12:25:41 +0000 (08:25 -0400)
If include/generated/env.in does not exist, which is a typical case for
clean build, quiet_cmd_gen_envp command tries to delete this file
unconditionally.

This produces following warning during the build:
  ENVP    include/generated/env.in
rm: cannot remove 'include/generated/env.in': No such file or directory

Add '-f' option to the `rm` command to not complain if file does not
exist.

Fixes: 673de390c485 ("env: Avoid using a leftover text-environment file")
Reviewed-by: Sean Anderson <seanga2@gmail.com>
Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
Makefile

index 4672147318e7d72115787fd4109476d1073c5a9b..868445bf33c9aa92b9b061462a31171028f7d496 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1846,7 +1846,7 @@ quiet_cmd_gen_envp = ENVP    $@
                        -I$(srctree)/arch/$(ARCH)/include \
                        $< -o $@; \
        else \
-               rm $@; \
+               rm -f $@; \
                touch $@ ; \
        fi
 include/generated/env.in: include/generated/env.txt FORCE