diff options
| author | Masahiro Yamada <masahiroy@kernel.org> | 2020-01-05 00:02:26 +0900 |
|---|---|---|
| committer | Masahiro Yamada <masahiroy@kernel.org> | 2020-01-14 10:42:44 +0900 |
| commit | a2183c0437987409bbf87582621d096561bf321c (patch) | |
| tree | 4e88c3e79ce47ab52ab9f8330e93633222697d68 | |
| parent | 9945722afdc3443eab826b2da1122509a13a50a5 (diff) | |
| download | linux-a2183c0437987409bbf87582621d096561bf321c.tar.gz linux-a2183c0437987409bbf87582621d096561bf321c.tar.bz2 linux-a2183c0437987409bbf87582621d096561bf321c.zip | |
initramfs: replace klibcdirs in Makefile with FORCE
'klibcdirs' was added by commit d39a206bc35d ("kbuild: rebuild initramfs
if content of initramfs changes"). If this is just a matter of forcing
execution of the recipe line, we can replace it with FORCE.
The following code is currently useless:
$(deps_initramfs): klibcdirs
The original intent could be a hook for the klibc integration into the
kernel tree, but klibc is a separate project, which can be built
independently. Clean it up.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Reviewed-by: Greg Thelen <gthelen@google.com>
| -rw-r--r-- | usr/Makefile | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/usr/Makefile b/usr/Makefile index e6f7cb2f81db..55c942da01cd 100644 --- a/usr/Makefile +++ b/usr/Makefile @@ -3,9 +3,6 @@ # kbuild file for usr/ - including initramfs image # -klibcdirs:; -PHONY += klibcdirs - suffix_y = $(subst $\",,$(CONFIG_INITRAMFS_COMPRESSION)) datafile_y = initramfs_data.cpio$(suffix_y) datafile_d_y = .$(datafile_y).d @@ -50,13 +47,12 @@ targets := $(datafile_y) # do not try to update files included in initramfs $(deps_initramfs): ; -$(deps_initramfs): klibcdirs # We rebuild initramfs_data.cpio if: # 1) Any included file is newer than initramfs_data.cpio # 2) There are changes in which files are included (added or deleted) # 3) If gen_init_cpio are newer than initramfs_data.cpio # 4) Arguments to gen_initramfs.sh changes -$(obj)/$(datafile_y): $(obj)/gen_init_cpio $(deps_initramfs) klibcdirs +$(obj)/$(datafile_y): $(obj)/gen_init_cpio $(deps_initramfs) FORCE $(Q)$(initramfs) -l $(ramfs-input) > $(obj)/$(datafile_d_y) $(call if_changed,initfs) |