summaryrefslogtreecommitdiff
path: root/sys-kernel/dracut/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-07-19 20:39:44 +0100
committerV3n3RiX <venerix@koprulu.sector>2022-07-19 20:39:44 +0100
commit54eca75a4e3e380e1d386f4d235baeb7d4ff332e (patch)
tree5f59a3e7b9069e5ab5ae4c5b46184560dc318692 /sys-kernel/dracut/files
parentfc7e841956ae3cc385629bf33433de23a6d04db6 (diff)
gentoo auto-resync : 19:07:2022 - 20:39:44
Diffstat (limited to 'sys-kernel/dracut/files')
-rw-r--r--sys-kernel/dracut/files/053-network-manager.patch24
-rw-r--r--sys-kernel/dracut/files/gentoo-ldconfig-paths.patch39
2 files changed, 0 insertions, 63 deletions
diff --git a/sys-kernel/dracut/files/053-network-manager.patch b/sys-kernel/dracut/files/053-network-manager.patch
deleted file mode 100644
index c3b337733b7f..000000000000
--- a/sys-kernel/dracut/files/053-network-manager.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From ba4bcf5f4f11ad624c647ddf4f566997186135e7 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Wed, 31 Mar 2021 16:11:41 +0200
-Subject: [PATCH] fix(network-manager): no default deps for nm-run.service
-
-Otherwise nm-run.service will run only in basic.target, which is too
-late in the initramfs.
----
- modules.d/35network-manager/nm-run.service | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/modules.d/35network-manager/nm-run.service b/modules.d/35network-manager/nm-run.service
-index 63fe7564d0..f3493c41a3 100644
---- a/modules.d/35network-manager/nm-run.service
-+++ b/modules.d/35network-manager/nm-run.service
-@@ -2,6 +2,8 @@
- # SPDX-License-Identifier: GPL-2.0-or-later
-
- [Unit]
-+DefaultDependencies=no
-+
- #make sure all devices showed up
- Wants=systemd-udev-settle.service
- After=systemd-udev-settle.service
diff --git a/sys-kernel/dracut/files/gentoo-ldconfig-paths.patch b/sys-kernel/dracut/files/gentoo-ldconfig-paths.patch
deleted file mode 100644
index 15522ef4fc1e..000000000000
--- a/sys-kernel/dracut/files/gentoo-ldconfig-paths.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 0674b9136831b1beb6a7ec91147fd5c280c693a3 Mon Sep 17 00:00:00 2001
-From: Alexander Tsoy <alexander@tsoy.me>
-Date: Mon, 9 Mar 2020 02:47:07 +0300
-Subject: [PATCH] Remove redundant gcc paths in ldconfig_paths()
-
-Bug: https://bugs.gentoo.org/705728
----
- dracut-functions.sh | 15 ++++++++++++++-
- 1 file changed, 14 insertions(+), 1 deletion(-)
-
-diff --git a/dracut-functions.sh b/dracut-functions.sh
-index 3cb9c7af..5337ff6c 100755
---- a/dracut-functions.sh
-+++ b/dracut-functions.sh
-@@ -76,7 +76,20 @@ find_binary() {
-
- ldconfig_paths()
- {
-- $DRACUT_LDCONFIG ${dracutsysrootdir:+-r ${dracutsysrootdir} -f /etc/ld.so.conf} -pN 2>/dev/null | grep -E -v '/(lib|lib64|usr/lib|usr/lib64)/[^/]*$' | sed -n 's,.* => \(.*\)/.*,\1,p' | sort | uniq
-+ local gccpath
-+
-+ if type -P gcc-config &>/dev/null; then
-+ gccpath=$(gcc-config -c)
-+ gccpath=/usr/lib/gcc/${gccpath%-*}/${gccpath##*-}
-+ fi
-+
-+ while read -r line; do
-+ if [[ ${line} != /usr/lib/gcc/* || -z ${gccpath} ]]; then
-+ echo ${line}
-+ elif [[ ${line} == ${gccpath} ]]; then
-+ echo ${line}
-+ fi
-+ done < <($DRACUT_LDCONFIG ${dracutsysrootdir:+-r ${dracutsysrootdir} -f /etc/ld.so.conf} -pN 2>/dev/null | grep -E -v '/(lib|lib64|usr/lib|usr/lib64)/[^/]*$' | sed -n 's,.* => \(.*\)/.*,\1,p' | sort | uniq)
- }
-
- # Version comparision function. Assumes Linux style version scheme.
---
-2.24.1
-