aboutsummaryrefslogtreecommitdiffstats
path: root/usr/Makefile
diff options
context:
space:
mode:
authorMasahiro Yamada <masahiroy@kernel.org>2020-01-05 00:02:34 +0900
committerMasahiro Yamada <masahiroy@kernel.org>2020-01-16 00:25:21 +0900
commit9668097599aa5fb87351bc2263e06a1c24718d40 (patch)
treefa342f24d89c00c5c1d9c80c561f6f2440975d4b /usr/Makefile
parentinitramfs: specify $(src)/gen_initramfs.sh as a prerequisite in Makefile (diff)
downloadlinux-dev-9668097599aa5fb87351bc2263e06a1c24718d40.tar.xz
linux-dev-9668097599aa5fb87351bc2263e06a1c24718d40.zip
initramfs: generate dependency list and cpio at the same time
Currently, this script is run twice, for the dependency list, and then for the cpio archive. The first one is re-run every time although its build log is suppressed so nobody notices it. Make it work more efficiently by generating the cpio and the dependency list at the same time. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Diffstat (limited to 'usr/Makefile')
-rw-r--r--usr/Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/usr/Makefile b/usr/Makefile
index f58101fb4574..9c7387156c6b 100644
--- a/usr/Makefile
+++ b/usr/Makefile
@@ -39,7 +39,7 @@ ifneq ($(wildcard $(obj)/$(datafile_d_y)),)
endif
quiet_cmd_initfs = GEN $@
- cmd_initfs = $(CONFIG_SHELL) $< -o $@ $(ramfs-args) $(ramfs-input)
+ cmd_initfs = $(CONFIG_SHELL) $< -o $@ -l $(obj)/$(datafile_d_y) $(ramfs-args) $(ramfs-input)
targets := $(datafile_y)
@@ -52,7 +52,6 @@ $(deps_initramfs): ;
# 3) If gen_init_cpio are newer than initramfs_data.cpio
# 4) Arguments to gen_initramfs.sh changes
$(obj)/$(datafile_y): $(src)/gen_initramfs.sh $(obj)/gen_init_cpio $(deps_initramfs) FORCE
- $(Q)$< -l $(ramfs-input) > $(obj)/$(datafile_d_y)
$(call if_changed,initfs)
subdir-$(CONFIG_UAPI_HEADER_TEST) += include