summaryrefslogtreecommitdiff
path: root/usr
diff options
context:
space:
mode:
authorNicholas Piggin <npiggin@gmail.com>2017-01-05 20:29:35 +1000
committerLinus Torvalds <torvalds@linux-foundation.org>2017-01-05 09:40:16 -0800
commitae30ab4cd711a147cafaf5674c333c5a84fe53fb (patch)
tree5f1d8c154dd5ed1f277adbf6312bcc4b1d942475 /usr
parente02003b515e8d95f40f20f213622bb82510873d2 (diff)
downloadlinux-next-ae30ab4cd711a147cafaf5674c333c5a84fe53fb.tar.gz
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) <klondike@klondike.es> Signed-off-by: Nicholas Piggin <npiggin@gmail.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'usr')
-rw-r--r--usr/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/usr/Makefile b/usr/Makefile
index 17a513268325..746c3fd0b933 100644
--- a/usr/Makefile
+++ b/usr/Makefile
@@ -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