[sys-kernel/dracut] bump, with rusty bits
This commit is contained in:
33
sys-kernel/dracut/files/056-musl.patch
Normal file
33
sys-kernel/dracut/files/056-musl.patch
Normal file
@@ -0,0 +1,33 @@
|
||||
From ce55a85ed5d902c19d75895508856f96ec2ceb1a Mon Sep 17 00:00:00 2001
|
||||
From: Laszlo Gombos <laszlo.gombos@gmail.com>
|
||||
Date: Sun, 20 Feb 2022 22:23:49 -0500
|
||||
Subject: [PATCH] fix(install): restore musl support
|
||||
|
||||
__GLIBC_PREREQ is only defined in glibc.
|
||||
---
|
||||
src/install/util.c | 4 +---
|
||||
1 file changed, 1 insertion(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/install/util.c b/src/install/util.c
|
||||
index 5721de89e..0af387c27 100644
|
||||
--- a/src/install/util.c
|
||||
+++ b/src/install/util.c
|
||||
@@ -24,17 +24,15 @@
|
||||
#include <errno.h>
|
||||
#include <fcntl.h>
|
||||
#include <sys/types.h>
|
||||
+#include <sys/syscall.h>
|
||||
|
||||
#include "util.h"
|
||||
|
||||
-#if __GLIBC_PREREQ(2, 30) == 0
|
||||
-#include <sys/syscall.h>
|
||||
#ifndef SYS_gettid
|
||||
#error "SYS_gettid unavailable on this system"
|
||||
#endif
|
||||
|
||||
#define gettid() ((pid_t) syscall(SYS_gettid))
|
||||
-#endif /*__GLIBC_PREREQ */
|
||||
|
||||
size_t page_size(void)
|
||||
{
|
||||
39
sys-kernel/dracut/files/056-sysctl-vars.patch
Normal file
39
sys-kernel/dracut/files/056-sysctl-vars.patch
Normal file
@@ -0,0 +1,39 @@
|
||||
From 4c355d05587b0432a6dc551b8693dbdc51a07962 Mon Sep 17 00:00:00 2001
|
||||
From: Antonio Alvarez Feijoo <antonio.feijoo@suse.com>
|
||||
Date: Thu, 24 Feb 2022 09:36:02 +0100
|
||||
Subject: [PATCH] fix(dracut.sh): error exporting sysctl variables
|
||||
|
||||
- Typo assigning depmodd and depmodconfdir.
|
||||
- Typo exporting a variable called sysctl instead of sysctld.
|
||||
---
|
||||
dracut.sh | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/dracut.sh b/dracut.sh
|
||||
index 0a3f59741..afc6fd04c 100755
|
||||
--- a/dracut.sh
|
||||
+++ b/dracut.sh
|
||||
@@ -1798,12 +1798,12 @@ fi
|
||||
[[ -d $dracutsysrootdir$tmpfilesconfdir ]] || tmpfilesconfdir=/etc/tmpfiles.d
|
||||
|
||||
[[ -d $dracutsysrootdir$depmodd ]] \
|
||||
- || sysctld=$(pkg-config libkmod --variable=depmodd 2> /dev/null)
|
||||
+ || depmodd=$(pkg-config libkmod --variable=depmodd 2> /dev/null)
|
||||
|
||||
[[ -d $dracutsysrootdir$depmodd ]] || depmodd=/usr/lib/depmod.d
|
||||
|
||||
[[ -d $dracutsysrootdir$depmodconfdir ]] \
|
||||
- || sysctlconfdir=$(pkg-config libkmod --variable=depmodconfdir 2> /dev/null)
|
||||
+ || depmodconfdir=$(pkg-config libkmod --variable=depmodconfdir 2> /dev/null)
|
||||
|
||||
[[ -d $dracutsysrootdir$depmodconfdir ]] || depmodconfdir=/etc/depmod.d
|
||||
|
||||
@@ -1820,7 +1820,7 @@ export initdir dracutbasedir \
|
||||
dbusinterfacesconfdir dbusservices dbusservicesconfdir dbussession \
|
||||
dbussessionconfdir dbussystem dbussystemconfdir dbussystemservices \
|
||||
dbussystemservicesconfdir environment environmentconfdir modulesload \
|
||||
- modulesloadconfdir sysctl sysctlconfdir sysusers sysusersconfdir \
|
||||
+ modulesloadconfdir sysctld sysctlconfdir sysusers sysusersconfdir \
|
||||
systemdutildir systemdutilconfdir systemdcatalog systemdntpunits \
|
||||
systemdntpunitsconfdir systemdsystemunitdir systemdsystemconfdir \
|
||||
hostonly_cmdline loginstall tmpfilesdir tmpfilesconfdir depmodd \
|
||||
39
sys-kernel/dracut/files/gentoo-ldconfig-paths-r1.patch
Normal file
39
sys-kernel/dracut/files/gentoo-ldconfig-paths-r1.patch
Normal file
@@ -0,0 +1,39 @@
|
||||
From e6a5f02038954ede223cc75901386acf43ec4264 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 5206bd21..a119fb15 100755
|
||||
--- a/dracut-functions.sh
|
||||
+++ b/dracut-functions.sh
|
||||
@@ -81,7 +81,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.32.0
|
||||
|
||||
Reference in New Issue
Block a user