f440305c9bfdcbd5efef05ea91514b5dfd0b6cf9
[openwrt/openwrt.git] / target / linux / generic / pending-4.14 / 240-remove-unsane-filenames-from-deps_initramfs-list.patch
1 From: Gabor Juhos <juhosg@openwrt.org>
2 Subject: usr: sanitize deps_initramfs list
3
4 If any filename in the intramfs dependency
5 list contains a colon, that causes a kernel
6 build error like this:
7
8 /devel/openwrt/build_dir/linux-ar71xx_generic/linux-3.6.6/usr/Makefile:58: *** multiple target patterns. Stop.
9 make[5]: *** [usr] Error 2
10
11 Fix it by removing such filenames from the
12 deps_initramfs list.
13
14 Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
15 ---
16 usr/Makefile | 8 +++++---
17 1 file changed, 5 insertions(+), 3 deletions(-)
18
19 --- a/usr/Makefile
20 +++ b/usr/Makefile
21 @@ -39,20 +39,22 @@ ifneq ($(wildcard $(obj)/$(datafile_d_y)
22 include $(obj)/$(datafile_d_y)
23 endif
24
25 +deps_initramfs_sane := $(foreach v,$(deps_initramfs),$(if $(findstring :,$(v)),,$(v)))
26 +
27 quiet_cmd_initfs = GEN $@
28 cmd_initfs = $(initramfs) -o $@ $(ramfs-args) $(ramfs-input)
29
30 targets := $(datafile_y)
31
32 # do not try to update files included in initramfs
33 -$(deps_initramfs): ;
34 +$(deps_initramfs_sane): ;
35
36 -$(deps_initramfs): klibcdirs
37 +$(deps_initramfs_sane): klibcdirs
38 # We rebuild initramfs_data.cpio if:
39 # 1) Any included file is newer then initramfs_data.cpio
40 # 2) There are changes in which files are included (added or deleted)
41 # 3) If gen_init_cpio are newer than initramfs_data.cpio
42 # 4) arguments to gen_initramfs.sh changes
43 -$(obj)/$(datafile_y): $(obj)/gen_init_cpio $(deps_initramfs) klibcdirs
44 +$(obj)/$(datafile_y): $(obj)/gen_init_cpio $(deps_initramfs_sane) klibcdirs
45 $(Q)$(initramfs) -l $(ramfs-input) > $(obj)/$(datafile_d_y)
46 $(call if_changed,initfs)