Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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>
+1
-5
+1
-5
usr/Makefile
+1
-5
usr/Makefile
···
3
3
# kbuild file for usr/ - including initramfs image
4
4
#
5
5
6
-
klibcdirs:;
7
-
PHONY += klibcdirs
8
-
9
6
suffix_y = $(subst $\",,$(CONFIG_INITRAMFS_COMPRESSION))
10
7
datafile_y = initramfs_data.cpio$(suffix_y)
11
8
datafile_d_y = .$(datafile_y).d
···
47
50
# do not try to update files included in initramfs
48
51
$(deps_initramfs): ;
49
52
50
-
$(deps_initramfs): klibcdirs
51
53
# We rebuild initramfs_data.cpio if:
52
54
# 1) Any included file is newer than initramfs_data.cpio
53
55
# 2) There are changes in which files are included (added or deleted)
54
56
# 3) If gen_init_cpio are newer than initramfs_data.cpio
55
57
# 4) Arguments to gen_initramfs.sh changes
56
-
$(obj)/$(datafile_y): $(obj)/gen_init_cpio $(deps_initramfs) klibcdirs
58
+
$(obj)/$(datafile_y): $(obj)/gen_init_cpio $(deps_initramfs) FORCE
57
59
$(Q)$(initramfs) -l $(ramfs-input) > $(obj)/$(datafile_d_y)
58
60
$(call if_changed,initfs)
59
61