Skip to content

Commit

Permalink
kbuild: initramfs fix dependency checking for compressed target
Browse files Browse the repository at this point in the history
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: 35e669e ("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]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
npiggin authored and torvalds committed Jan 5, 2017
1 parent e02003b commit ae30ab4
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion usr/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit ae30ab4

Please sign in to comment.