leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kbuild: unify cmd_copy and cmd_shipped

Browse Source 
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>
This commit is contained in:
Masahiro Yamada 2022-01-25 15:40:27 +09:00
parent 754e0b0e35
commit a5575df580
5 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/microblaze/boot/Makefile
View File

@ -29,7 +29,7 @@ $(obj)/simpleImage.$(DTB).ub: $(obj)/simpleImage.$(DTB) FORCE
$(call if_changed,uimage) $(call if_changed,uimage)
$(obj)/simpleImage.$(DTB).unstrip: vmlinux FORCE $(obj)/simpleImage.$(DTB).unstrip: vmlinux FORCE
$(call if_changed,shipped) $(call if_changed,copy)
$(obj)/simpleImage.$(DTB).strip: vmlinux FORCE $(obj)/simpleImage.$(DTB).strip: vmlinux FORCE
$(call if_changed,strip) $(call if_changed,strip)

2
arch/microblaze/boot/dts/Makefile
View File

@ -12,7 +12,7 @@ $(obj)/linked_dtb.o: $(obj)/system.dtb
# Generate system.dtb from $(DTB).dtb # Generate system.dtb from $(DTB).dtb
ifneq ($(DTB),system) ifneq ($(DTB),system)
$(obj)/system.dtb: $(obj)/$(DTB).dtb $(obj)/system.dtb: $(obj)/$(DTB).dtb
$(call if_changed,shipped) $(call if_changed,copy)
endif endif
endif endif

2
fs/unicode/Makefile
View File

@ -33,7 +33,7 @@ $(obj)/utf8data.c: $(obj)/mkutf8data $(filter %.txt, $(cmd_utf8data)) FORCE
else else
$(obj)/utf8data.c: $(src)/utf8data.c_shipped FORCE $(obj)/utf8data.c: $(src)/utf8data.c_shipped FORCE
$(call if_changed,shipped) $(call if_changed,copy)
endif endif

12
scripts/Makefile.lib
View File

@ -246,20 +246,16 @@ $(foreach m, $(notdir $1), \
$(addprefix $(obj)/, $(foreach s, $3, $($(m:%$(strip $2)=%$(s))))))) $(addprefix $(obj)/, $(foreach s, $3, $($(m:%$(strip $2)=%$(s)))))))
endef endef
quiet_cmd_copy = COPY $@ # Copy a file
cmd_copy = cp $< $@
# Shipped files
# =========================================================================== # ===========================================================================
# 'cp' preserves permissions. If you use it to copy a file in read-only srctree, # '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 # 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. # rule next time. Use 'cat' instead in order to generate a writable file.
quiet_cmd_copy = COPY $@
quiet_cmd_shipped = SHIPPED $@ cmd_copy = cat $< > $@
cmd_shipped = cat $< > $@
$(obj)/%: $(src)/%_shipped $(obj)/%: $(src)/%_shipped
$(call cmd,shipped) $(call cmd,copy)
# Commands useful for building a boot image # Commands useful for building a boot image
# =========================================================================== # ===========================================================================

4
usr/Makefile
View File

@ -3,7 +3,7 @@
# kbuild file for usr/ - including initramfs image # kbuild file for usr/ - including initramfs image
# #
compress-y := shipped compress-y := copy
compress-$(CONFIG_INITRAMFS_COMPRESSION_GZIP) := gzip compress-$(CONFIG_INITRAMFS_COMPRESSION_GZIP) := gzip
compress-$(CONFIG_INITRAMFS_COMPRESSION_BZIP2) := bzip2 compress-$(CONFIG_INITRAMFS_COMPRESSION_BZIP2) := bzip2
compress-$(CONFIG_INITRAMFS_COMPRESSION_LZMA) := lzma compress-$(CONFIG_INITRAMFS_COMPRESSION_LZMA) := lzma
@ -37,7 +37,7 @@ endif
# .cpio.*, use it directly as an initramfs, and avoid double compression. # .cpio.*, use it directly as an initramfs, and avoid double compression.
ifeq ($(words $(subst .cpio.,$(space),$(ramfs-input))),2) ifeq ($(words $(subst .cpio.,$(space),$(ramfs-input))),2)
cpio-data := $(ramfs-input) cpio-data := $(ramfs-input)
compress-y := shipped compress-y := copy
endif endif
endif endif