summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Kohler <bkohler@gentoo.org>2023-05-24 11:38:21 -0500
committerBen Kohler <bkohler@gentoo.org>2023-05-25 08:16:02 -0500
commit7dfe1687db21ee02e2ceab43f01f07572e5fc47a (patch)
tree5b4a3e613a02b40d44f03f38f0da741e755f8197 /sys-kernel/genkernel/files
parentdev-util/pycharm-community: bump to 2023.1.2 (diff)
downloadgentoo-7dfe1687db21ee02e2ceab43f01f07572e5fc47a.tar.gz
gentoo-7dfe1687db21ee02e2ceab43f01f07572e5fc47a.tar.bz2
gentoo-7dfe1687db21ee02e2ceab43f01f07572e5fc47a.zip
sys-kernel/genkernel: backport qlist no-color fix
Signed-off-by: Ben Kohler <bkohler@gentoo.org>
Diffstat (limited to 'sys-kernel/genkernel/files')
-rw-r--r--sys-kernel/genkernel/files/genkernel-4.3.2-no-color-on-qlist.patch38
1 files changed, 38 insertions, 0 deletions
diff --git a/sys-kernel/genkernel/files/genkernel-4.3.2-no-color-on-qlist.patch b/sys-kernel/genkernel/files/genkernel-4.3.2-no-color-on-qlist.patch
new file mode 100644
index 000000000000..d87574a87c08
--- /dev/null
+++ b/sys-kernel/genkernel/files/genkernel-4.3.2-no-color-on-qlist.patch
@@ -0,0 +1,38 @@
+From 75d666895ff428ca18863674bcf7e5ebf176505b Mon Sep 17 00:00:00 2001
+From: Ben Kohler <bkohler@gentoo.org>
+Date: Wed, 24 May 2023 11:24:32 -0500
+Subject: [PATCH] gen_initramfs.sh: force no-color on qlist calls
+
+In some cases, qlist's pipe detection may not work, and this is fatal to
+our build. Let's just force -C on all qlist calls.
+
+Signed-off-by: Ben Kohler <bkohler@gentoo.org>
+---
+ gen_initramfs.sh | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gen_initramfs.sh b/gen_initramfs.sh
+index 227badd..986b3b4 100755
+--- a/gen_initramfs.sh
++++ b/gen_initramfs.sh
+@@ -801,7 +801,7 @@ append_multipath() {
+
+ local udevdir=$(get_udevdir)
+ local udevdir_initramfs="/usr/lib/udev"
+- local udev_files=( $(qlist -e sys-fs/multipath-tools:0 \
++ local udev_files=( $(qlist -eC sys-fs/multipath-tools:0 \
+ | grep -E -- "^${udevdir}")
+ )
+
+@@ -1131,7 +1131,7 @@ append_zfs() {
+
+ local udevdir=$(get_udevdir)
+ local udevdir_initramfs="/usr/lib/udev"
+- local udev_files=( $(qlist -e sys-fs/zfs:0 \
++ local udev_files=( $(qlist -eC sys-fs/zfs:0 \
+ | grep -E -- "^${udevdir}")
+ )
+
+--
+2.40.1
+