Skip to contentSkip to conversation

kbuild: initramfs fix dependency checking for compressed target

PATCH In review Nicholas Piggin 2 participants 4 messages Jan 5, 2017 Kbuild

lore
Share & tools
lore

Nicholas Piggin

author
#0 lore raw

PATCH 1/2 kbuild: initramfs fix dependency checking for compressed target

When using initramfs compression, the data file compression suffix gets quotes pulled in from Kconfig, e.g., initramfs_data.cpio".gz" which make does not match a target and causes rebuild.

Fix this by filtering out quotes from the Kconfig string.

Fixes 35e669e1a254 ("initramfs: select builtin initram compression algorithm on KConfig instead of Makefile")
Reviewed-by Francisco Blas Izquierdo Riera (klondike) <[email protected]>
Signed-off-by Nicholas Piggin <[email protected]>
---
 usr/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
usr/Makefile +1 -1
index 17a513268325..746c3fd0b933 100644
@@ -5,7 +5,7 @@
 klibcdirs:;
 PHONY += klibcdirs
 
-suffix_y = $(CONFIG_INITRAMFS_COMPRESSION)
+suffix_y = $(subst $\",,$(CONFIG_INITRAMFS_COMPRESSION))
 AFLAGS_initramfs_data.o += -DINITRAMFS_IMAGE="usr/initramfs_data.cpio$(suffix_y)"
 
 # Generate builtin.o based on initramfs_data.o
Signature · 1 line
2.11.0
author
#1 lore raw

PATCH 2/2 kbuild: initramfs cleanup, set target from Kconfig

Rather than keep a list of all possible compression types in the Makefile, set the target explicitly from Kconfig.

Reviewed-by Francisco Blas Izquierdo Riera (klondike) <[email protected]>
Signed-off-by Nicholas Piggin <[email protected]>
---
 usr/Makefile | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
usr/Makefile +7 -7
index 746c3fd0b933..0b87e71c00fc 100644
@@ -6,7 +6,9 @@ klibcdirs:;
 PHONY += klibcdirs
 
 suffix_y = $(subst $\",,$(CONFIG_INITRAMFS_COMPRESSION))
-AFLAGS_initramfs_data.o += -DINITRAMFS_IMAGE="usr/initramfs_data.cpio$(suffix_y)"
+datafile_y = initramfs_data.cpio$(suffix_y)
+AFLAGS_initramfs_data.o += -DINITRAMFS_IMAGE="usr/$(datafile_y)"
+
 
 # Generate builtin.o based on initramfs_data.o
 obj-$(CONFIG_BLK_DEV_INITRD) := initramfs_data.o

@@ -14,7 +16,7 @@ obj-$(CONFIG_BLK_DEV_INITRD) := initramfs_data.o
 # initramfs_data.o contains the compressed initramfs_data.cpio image.
 # The image is included using .incbin, a dependency which is not
 # tracked automatically.
-$(obj)/initramfs_data.o: $(obj)/initramfs_data.cpio$(suffix_y) FORCE
+$(obj)/initramfs_data.o: $(obj)/$(datafile_y) FORCE
 
 #####
 # Generate the initramfs cpio archive

@@ -38,10 +40,8 @@ endif
 quiet_cmd_initfs = GEN     $@
       cmd_initfs = $(initramfs) -o $@ $(ramfs-args) $(ramfs-input)
 
-targets := initramfs_data.cpio.gz initramfs_data.cpio.bz2 \
-	initramfs_data.cpio.lzma initramfs_data.cpio.xz \
-	initramfs_data.cpio.lzo initramfs_data.cpio.lz4 \
-	initramfs_data.cpio
+targets := $(datafile_y)
+
 # do not try to update files included in initramfs
 $(deps_initramfs): ;
 

@@ -51,6 +51,6 @@ $(deps_initramfs): klibcdirs
 # 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)/initramfs_data.cpio$(suffix_y): $(obj)/gen_init_cpio $(deps_initramfs) klibcdirs
+$(obj)/$(datafile_y): $(obj)/gen_init_cpio $(deps_initramfs) klibcdirs
 	$(Q)$(initramfs) -l $(ramfs-input) > $(obj)/.initramfs_data.cpio.d
 	$(call if_changed,initfs)
Signature · 1 line
2.11.0
Reviewed-by on v1 1/2
#3 lore raw
In reply to Nicholas Piggin
Quoted 9 lines · Nicholas Piggin

When using initramfs compression, the data file compression suffix gets quotes pulled in from Kconfig, e.g., initramfs_data.cpio".gz" which make does not match a target and causes rebuild.

Fix this by filtering out quotes from the Kconfig string.

Fixes 35e669e1a254 ("initramfs: select builtin initram compression algorithm on KConfig instead of Makefile")
Reviewed-by Francisco Blas Izquierdo Riera (klondike) <[email protected]>
Signed-off-by Nicholas Piggin <[email protected]>
Reviewed-by Florian Fainelli <[email protected]>
Signature · 1 line
Florian