aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2012-11-09 09:07:29 +0000
committerGabor Juhos <juhosg@openwrt.org>2012-11-09 09:07:29 +0000
commit502661f685844105159a0e02e5141db1cfb48db0 (patch)
tree1503e25235f81024ed17707b32e9c10abc87a96e /target/linux
parent291d24c3ccb1522f976b3124aa7ea4b8a77c9d5e (diff)
downloadupstream-502661f685844105159a0e02e5141db1cfb48db0.tar.gz
upstream-502661f685844105159a0e02e5141db1cfb48db0.tar.bz2
upstream-502661f685844105159a0e02e5141db1cfb48db0.zip
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 <juhosg@openwrt.org> SVN-Revision: 34125
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/generic/patches-3.3/970-remove-unsane-filenames-from-deps_initramfs-list.patch28
-rw-r--r--target/linux/generic/patches-3.6/970-remove-unsane-filenames-from-deps_initramfs-list.patch28
2 files changed, 56 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.3/970-remove-unsane-filenames-from-deps_initramfs-list.patch b/target/linux/generic/patches-3.3/970-remove-unsane-filenames-from-deps_initramfs-list.patch
new file mode 100644
index 0000000000..65c6ef7d0c
--- /dev/null
+++ b/target/linux/generic/patches-3.3/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)
+
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 0000000000..65c6ef7d0c
--- /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)
+