aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.7/970-remove-unsane-filenames-from-deps_initramfs-list.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2012-11-18 18:52:38 +0000
committerImre Kaloz <kaloz@openwrt.org>2012-11-18 18:52:38 +0000
commit43d2eb64ccb3a223ba2244faee1280aaa6f68d11 (patch)
tree86525769ccc1e76c33de9d10b51d14bdc0e1c8f7 /target/linux/generic/patches-3.7/970-remove-unsane-filenames-from-deps_initramfs-list.patch
parent2b0cba675561342a1a538bad8a7df10cf855323e (diff)
downloadmaster-187ad058-43d2eb64ccb3a223ba2244faee1280aaa6f68d11.tar.gz
master-187ad058-43d2eb64ccb3a223ba2244faee1280aaa6f68d11.tar.bz2
master-187ad058-43d2eb64ccb3a223ba2244faee1280aaa6f68d11.zip
[generic]: add 3.7-rc6 support (patch 820 still has to be fixed)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34247 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.7/970-remove-unsane-filenames-from-deps_initramfs-list.patch')
-rw-r--r--target/linux/generic/patches-3.7/970-remove-unsane-filenames-from-deps_initramfs-list.patch28
1 files changed, 28 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.7/970-remove-unsane-filenames-from-deps_initramfs-list.patch b/target/linux/generic/patches-3.7/970-remove-unsane-filenames-from-deps_initramfs-list.patch
new file mode 100644
index 0000000000..65c6ef7d0c
--- /dev/null
+++ b/target/linux/generic/patches-3.7/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)
+