Commit a2183c04 authored by Masahiro Yamada's avatar Masahiro Yamada

initramfs: replace klibcdirs in Makefile with FORCE

'klibcdirs' was added by commit d39a206b ("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: default avatarMasahiro Yamada <masahiroy@kernel.org>
Reviewed-by: default avatarGreg Thelen <gthelen@google.com>
parent 9945722a
...@@ -3,9 +3,6 @@ ...@@ -3,9 +3,6 @@
# kbuild file for usr/ - including initramfs image # kbuild file for usr/ - including initramfs image
# #
klibcdirs:;
PHONY += klibcdirs
suffix_y = $(subst $\",,$(CONFIG_INITRAMFS_COMPRESSION)) suffix_y = $(subst $\",,$(CONFIG_INITRAMFS_COMPRESSION))
datafile_y = initramfs_data.cpio$(suffix_y) datafile_y = initramfs_data.cpio$(suffix_y)
datafile_d_y = .$(datafile_y).d datafile_d_y = .$(datafile_y).d
...@@ -50,13 +47,12 @@ targets := $(datafile_y) ...@@ -50,13 +47,12 @@ targets := $(datafile_y)
# do not try to update files included in initramfs # do not try to update files included in initramfs
$(deps_initramfs): ; $(deps_initramfs): ;
$(deps_initramfs): klibcdirs
# We rebuild initramfs_data.cpio if: # We rebuild initramfs_data.cpio if:
# 1) Any included file is newer than initramfs_data.cpio # 1) Any included file is newer than initramfs_data.cpio
# 2) There are changes in which files are included (added or deleted) # 2) There are changes in which files are included (added or deleted)
# 3) If gen_init_cpio are newer than initramfs_data.cpio # 3) If gen_init_cpio are newer than initramfs_data.cpio
# 4) Arguments to gen_initramfs.sh changes # 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) $(Q)$(initramfs) -l $(ramfs-input) > $(obj)/$(datafile_d_y)
$(call if_changed,initfs) $(call if_changed,initfs)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment