From 7b9dfebde479bccaada3c877cbf6b05dc52c9938 Mon Sep 17 00:00:00 2001 From: juhosg Date: Fri, 9 Nov 2012 09:07:29 +0000 Subject: generic: sanitize deps_initramfs list If any filename in the intramfs dependency list contains a colon, that causes a kernel build error like this: /devel/openwrt/build_dir/linux-ar71xx_generic/linux-3.6.6/usr/Makefile:58: *** multiple target patterns. Stop. make[5]: *** [usr] Error 2 Fix it by removing such filenames from the deps_initramfs list. Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34125 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- ...unsane-filenames-from-deps_initramfs-list.patch | 28 ++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 target/linux/generic/patches-3.6/970-remove-unsane-filenames-from-deps_initramfs-list.patch (limited to 'target/linux/generic/patches-3.6') diff --git a/target/linux/generic/patches-3.6/970-remove-unsane-filenames-from-deps_initramfs-list.patch b/target/linux/generic/patches-3.6/970-remove-unsane-filenames-from-deps_initramfs-list.patch new file mode 100644 index 000000000..65c6ef7d0 --- /dev/null +++ b/target/linux/generic/patches-3.6/970-remove-unsane-filenames-from-deps_initramfs-list.patch @@ -0,0 +1,28 @@ +--- a/usr/Makefile ++++ b/usr/Makefile +@@ -50,20 +50,22 @@ ifneq ($(wildcard $(obj)/.initramfs_data + include $(obj)/.initramfs_data.cpio.d + endif + ++deps_initramfs_sane := $(foreach v,$(deps_initramfs),$(if $(findstring :,$(v)),,$(v))) ++ + 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 + # do not try to update files included in initramfs +-$(deps_initramfs): ; ++$(deps_initramfs_sane): ; + +-$(deps_initramfs): klibcdirs ++$(deps_initramfs_sane): klibcdirs + # We rebuild initramfs_data.cpio if: + # 1) Any included file is newer then initramfs_data.cpio + # 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)/initramfs_data.cpio$(suffix_y): $(obj)/gen_init_cpio $(deps_initramfs_sane) klibcdirs + $(Q)$(initramfs) -l $(ramfs-input) > $(obj)/.initramfs_data.cpio.d + $(call if_changed,initfs) + -- cgit v1.2.3