aboutsummaryrefslogtreecommitdiff
path: root/nixos/modules/kernel-patches/0038-usr-sanitize-deps_initramfs-list.patch
diff options
context:
space:
mode:
Diffstat (limited to 'nixos/modules/kernel-patches/0038-usr-sanitize-deps_initramfs-list.patch')
-rw-r--r--nixos/modules/kernel-patches/0038-usr-sanitize-deps_initramfs-list.patch37
1 files changed, 37 insertions, 0 deletions
diff --git a/nixos/modules/kernel-patches/0038-usr-sanitize-deps_initramfs-list.patch b/nixos/modules/kernel-patches/0038-usr-sanitize-deps_initramfs-list.patch
new file mode 100644
index 0000000..684905c
--- /dev/null
+++ b/nixos/modules/kernel-patches/0038-usr-sanitize-deps_initramfs-list.patch
@@ -0,0 +1,37 @@
+From 994a9ab083bc730f0057131d8fde7cb0dc7b490f Mon Sep 17 00:00:00 2001
+From: Gabor Juhos <juhosg@openwrt.org>
+Date: Tue, 27 Sep 2022 16:21:26 +0200
+Subject: [PATCH 38/96] usr: 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>
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
+---
+ usr/Makefile | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/usr/Makefile b/usr/Makefile
+index 59d9e8b07a01..5a8a00cf8580 100644
+--- a/usr/Makefile
++++ b/usr/Makefile
+@@ -56,6 +56,8 @@ hostprogs := gen_init_cpio
+ # The dependency list is generated by gen_initramfs.sh -l
+ -include $(obj)/.initramfs_data.cpio.d
+
++deps_initramfs := $(foreach v,$(deps_initramfs),$(if $(findstring :,$(v)),,$(v)))
++
+ # do not try to update files included in initramfs
+ $(deps_initramfs): ;
+
+--
+2.37.2
+