mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-22 15:02:32 +00:00
502661f685
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
29 lines
1.2 KiB
Diff
29 lines
1.2 KiB
Diff
--- 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)
|
|
|