From 955268e13f8f9422e7e89ee6350ec793dddd1e94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Tue, 1 Nov 2022 09:44:59 +0100 Subject: nixos: try to fix Turris Omnia PCIe on Linux 6.0 Unfortunatelly this seems to not work. --- .../0038-usr-sanitize-deps_initramfs-list.patch | 37 ---------------------- 1 file changed, 37 deletions(-) delete mode 100644 nixos/modules/kernel-patches/0038-usr-sanitize-deps_initramfs-list.patch (limited to 'nixos/modules/kernel-patches/0038-usr-sanitize-deps_initramfs-list.patch') 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 deleted file mode 100644 index 684905c..0000000 --- a/nixos/modules/kernel-patches/0038-usr-sanitize-deps_initramfs-list.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 994a9ab083bc730f0057131d8fde7cb0dc7b490f Mon Sep 17 00:00:00 2001 -From: Gabor Juhos -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 -Signed-off-by: Felix Fietkau ---- - 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 - -- cgit v1.2.3