OpenWrt – Blame information for rev 2
?pathlinks?
Rev | Author | Line No. | Line |
---|---|---|---|
1 | office | 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 | @@ -53,6 +53,8 @@ ifneq ($(wildcard $(obj)/.initramfs_data |
||
22 | include $(obj)/.initramfs_data.cpio.d |
||
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 | @@ -61,14 +63,14 @@ targets := initramfs_data.cpio.gz initra |
||
31 | initramfs_data.cpio.lzo initramfs_data.cpio.lz4 \ |
||
32 | initramfs_data.cpio |
||
33 | # do not try to update files included in initramfs |
||
34 | -$(deps_initramfs): ; |
||
35 | +$(deps_initramfs_sane): ; |
||
36 | |||
37 | -$(deps_initramfs): klibcdirs |
||
38 | +$(deps_initramfs_sane): klibcdirs |
||
39 | # We rebuild initramfs_data.cpio if: |
||
40 | # 1) Any included file is newer then initramfs_data.cpio |
||
41 | # 2) There are changes in which files are included (added or deleted) |
||
42 | # 3) If gen_init_cpio are newer than initramfs_data.cpio |
||
43 | # 4) arguments to gen_initramfs.sh changes |
||
44 | -$(obj)/initramfs_data.cpio$(suffix_y): $(obj)/gen_init_cpio $(deps_initramfs) klibcdirs |
||
45 | +$(obj)/initramfs_data.cpio$(suffix_y): $(obj)/gen_init_cpio $(deps_initramfs_sane) klibcdirs |
||
46 | $(Q)$(initramfs) -l $(ramfs-input) > $(obj)/.initramfs_data.cpio.d |
||
47 | $(call if_changed,initfs) |