diff options
author | Masahiro Yamada <masahiroy@kernel.org> | 2022-01-25 07:40:27 +0100 |
---|---|---|
committer | Masahiro Yamada <masahiroy@kernel.org> | 2022-02-14 02:37:32 +0100 |
commit | a5575df58004e8444e5a2a307407c3f1a6ecf175 (patch) | |
tree | 5cce996c963918112852d73d9023a4f540a9ec29 /scripts | |
parent | Linux 5.17-rc4 (diff) | |
download | linux-a5575df58004e8444e5a2a307407c3f1a6ecf175.tar.xz linux-a5575df58004e8444e5a2a307407c3f1a6ecf175.zip |
kbuild: unify cmd_copy and cmd_shipped
cmd_copy and cmd_shipped have similar functionality. The difference is
that cmd_copy uses 'cp' while cmd_shipped 'cat'.
Unify them into cmd_copy because this macro name is more intuitive.
Going forward, cmd_copy will use 'cat' to avoid the permission issue.
I also thought of 'cp --no-preserve=mode' but this option is not
mentioned in the POSIX spec [1], so I am keeping the 'cat' command.
[1]: https://pubs.opengroup.org/onlinepubs/009695299/utilities/cp.html
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
Reviewed-by: Gabriel Krisman Bertazi <krisman@collabora.com>
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/Makefile.lib | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 79be57fdd32a..40735a3adb54 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -246,20 +246,16 @@ $(foreach m, $(notdir $1), \ $(addprefix $(obj)/, $(foreach s, $3, $($(m:%$(strip $2)=%$(s))))))) endef -quiet_cmd_copy = COPY $@ - cmd_copy = cp $< $@ - -# Shipped files +# Copy a file # =========================================================================== # 'cp' preserves permissions. If you use it to copy a file in read-only srctree, # the copy would be read-only as well, leading to an error when executing the # rule next time. Use 'cat' instead in order to generate a writable file. - -quiet_cmd_shipped = SHIPPED $@ -cmd_shipped = cat $< > $@ +quiet_cmd_copy = COPY $@ + cmd_copy = cat $< > $@ $(obj)/%: $(src)/%_shipped - $(call cmd,shipped) + $(call cmd,copy) # Commands useful for building a boot image # =========================================================================== |