[sys-kernel/dracut] sync

sys-kernel/dracut/files/dracut-103-always-install-libsystemd.patch

@@ -1,21 +0,0 @@
-From 921792f201e954de461d3b551e01b5369d666db8 Mon Sep 17 00:00:00 2001
-From: Antonio Alvarez Feijoo <antonio.feijoo@suse.com>
-Date: Tue, 10 Sep 2024 15:51:46 +0200
-Subject: [PATCH] feat(systemd): always install libsystemd libraries
-
----
- modules.d/00systemd/module-setup.sh | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/modules.d/00systemd/module-setup.sh b/modules.d/00systemd/module-setup.sh
-index 498cd7edd..fb8a8200b 100755
---- a/modules.d/00systemd/module-setup.sh
-+++ b/modules.d/00systemd/module-setup.sh
-@@ -156,5 +156,6 @@ EOF
-     _arch=${DRACUT_ARCH:-$(uname -m)}
-     inst_libdir_file \
-         {"tls/$_arch/",tls/,"$_arch/",}"libgcrypt.so*" \
--        {"tls/$_arch/",tls/,"$_arch/",}"libnss_*"
-+        {"tls/$_arch/",tls/,"$_arch/",}"libnss_*" \
-+        {"tls/$_arch/",tls/,"$_arch/",}"systemd/libsystemd*.so"
- }

sys-kernel/dracut/files/dracut-103-systemd-udev-256-kmod.patch

@@ -1,41 +0,0 @@
-From e16195f28669264227c169d45107ea95b83d8f48 Mon Sep 17 00:00:00 2001
-From: Alexander Tsoy <alexander@tsoy.me>
-Date: Tue, 16 Jul 2024 08:48:54 +0300
-Subject: [PATCH] fix(systemd): move installation of libkmod to udev-rules
- module
-
-libkmod library should be installed even if systemd module is
-omitted, so move its installation to udev-rules module.
----
- modules.d/00systemd/module-setup.sh    | 1 -
- modules.d/95udev-rules/module-setup.sh | 6 +++++-
- 2 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/modules.d/00systemd/module-setup.sh b/modules.d/00systemd/module-setup.sh
-index ce7bb520c..e4fb9a586 100755
---- a/modules.d/00systemd/module-setup.sh
-+++ b/modules.d/00systemd/module-setup.sh
-@@ -171,6 +171,5 @@ EOF
-     _arch=${DRACUT_ARCH:-$(uname -m)}
-     inst_libdir_file \
-         {"tls/$_arch/",tls/,"$_arch/",}"libgcrypt.so*" \
--        {"tls/$_arch/",tls/,"$_arch/",}"libkmod.so*" \
-         {"tls/$_arch/",tls/,"$_arch/",}"libnss_*"
- }
-diff --git a/modules.d/95udev-rules/module-setup.sh b/modules.d/95udev-rules/module-setup.sh
-index d82ed5eb9..6078751f6 100755
---- a/modules.d/95udev-rules/module-setup.sh
-+++ b/modules.d/95udev-rules/module-setup.sh
-@@ -93,7 +93,11 @@ install() {
-         "${udevdir}"/usb_id \
-         "${udevdir}"/v4l_id
- 
--    inst_libdir_file "libnss_files*"
-+    # Install required libraries.
-+    _arch=${DRACUT_ARCH:-$(uname -m)}
-+    inst_libdir_file \
-+        {"tls/$_arch/",tls/,"$_arch/",}"libkmod.so*" \
-+        {"tls/$_arch/",tls/,"$_arch/",}"libnss_files*"
- 
-     # Install the hosts local user configurations if enabled.
-     if [[ $hostonly ]]; then

sys-kernel/dracut/files/dracut-105-ensure-abs-args-for-objcopy.patch

@@ -0,0 +1,48 @@
+From 1579bb0c77d9e1e4599623a165c54a0dccdaf875 Mon Sep 17 00:00:00 2001
+From: Andrew Ammerlaan <andrewammerlaan@gentoo.org>
+Date: Thu, 31 Oct 2024 11:28:37 +0100
+Subject: [PATCH] fix(dracut.sh): ensure abs path for objcopy args
+
+Closes: https://github.com/dracut-ng/dracut-ng/issues/833
+Signed-off-by: Andrew Ammerlaan <andrewammerlaan@gentoo.org>
+---
+ dracut.sh | 19 ++++++++++++++++---
+ 1 file changed, 16 insertions(+), 3 deletions(-)
+
+diff --git a/dracut.sh b/dracut.sh
+index 90927136e..8b666a1ac 100755
+--- a/dracut.sh
++++ b/dracut.sh
+@@ -35,6 +35,19 @@ readonly dracut_cmd=$(readlink -f "$0")
+ 
+ set -o pipefail
+ 
++# below we sometimes cd, which causes problems if we're building an UKI
++# and relative paths are passed on to us. Store the pwd before we do anything.
++pwd=$(pwd)
++path_rel_to_abs() {
++    for var in "$@"; do
++        if [[ $var == /* ]]; then
++            echo "$var"
++        else
++            echo "$pwd/$var"
++        fi
++    done
++}
++
+ usage() {
+     [[ $sysroot_l ]] && dracutsysrootdir="$sysroot_l"
+     [[ $dracutbasedir ]] || dracutbasedir="$dracutsysrootdir"/usr/lib/dracut
+@@ -1095,9 +1108,9 @@ drivers_dir="${drivers_dir%"${drivers_dir##*[!/]}"}"
+ [[ $reproducible_l ]] && reproducible="$reproducible_l"
+ [[ $loginstall_l ]] && loginstall="$loginstall_l"
+ [[ $uefi_l ]] && uefi=$uefi_l
+-[[ $uefi_stub_l ]] && uefi_stub="$uefi_stub_l"
+-[[ $uefi_splash_image_l ]] && uefi_splash_image="$uefi_splash_image_l"
+-[[ $kernel_image_l ]] && kernel_image="$kernel_image_l"
++[[ $uefi_stub_l ]] && uefi_stub=$(path_rel_to_abs "$uefi_stub_l")
++[[ $uefi_splash_image_l ]] && uefi_splash_image=$(path_rel_to_abs "$uefi_splash_image_l")
++[[ $kernel_image_l ]] && kernel_image=$(path_rel_to_abs "$kernel_image_l")
+ [[ $sbat_l ]] && sbat="$sbat_l"
+ [[ $machine_id_l ]] && machine_id="$machine_id_l"
+