]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
kbuild: initramfs fix dependency checking for compressed target
authorNicholas Piggin <npiggin@gmail.com>
Thu, 5 Jan 2017 10:29:35 +0000 (20:29 +1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 5 Jan 2017 17:40:16 +0000 (09:40 -0800)
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) <klondike@klondike.es>
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
usr/Makefile

index 17a513268325d197b76aa36d7c26c337a70b9a4d..746c3fd0b933692cf440a55e5187384309b2cb62 100644 (file)
@@ -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