[gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/, sys-kernel/dracut/files/

["Mike Gilbert" <floppym@gentoo.org>]

commit:     bf4a09fa9787fab26223f3b5bb0619219f3ec6c9
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Fri May 26 20:26:45 2023 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri May 26 20:27:39 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf4a09fa

sys-kernel/dracut: add fallback in case systemd.pc is not installed

Bug: https://bugs.gentoo.org/765208
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 .../dracut/{dracut-059-r1.ebuild => dracut-059-r2.ebuild}  |  0
 sys-kernel/dracut/files/059-uefi-split-usr.patch           | 14 ++++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/sys-kernel/dracut/dracut-059-r1.ebuild b/sys-kernel/dracut/dracut-059-r2.ebuild
similarity index 100%
rename from sys-kernel/dracut/dracut-059-r1.ebuild
rename to sys-kernel/dracut/dracut-059-r2.ebuild

diff --git a/sys-kernel/dracut/files/059-uefi-split-usr.patch b/sys-kernel/dracut/files/059-uefi-split-usr.patch
index 1b1f1348a223..8adb88076130 100644
--- a/sys-kernel/dracut/files/059-uefi-split-usr.patch
+++ b/sys-kernel/dracut/files/059-uefi-split-usr.patch
@@ -1,6 +1,6 @@
 https://github.com/dracutdevs/dracut/pull/2365
 
-From afb2019ddc6ffe6e59df3d3dc9929a840bd09bc8 Mon Sep 17 00:00:00 2001
+From 3462e0ac6f3562a5247bbeda2dc41eaf4e4ebf5e Mon Sep 17 00:00:00 2001
 From: Mike Gilbert <floppym@gentoo.org>
 Date: Fri, 26 May 2023 15:56:45 -0400
 Subject: [PATCH] Fix path to UEFI stub on split-usr systems
@@ -15,24 +15,26 @@ Instead, grab 'prefix' from systemd.pc and store it in 'systemd_prefix'.
 Bug: https://bugs.gentoo.org/765208
 Signed-off-by: Mike Gilbert <floppym@gentoo.org>
 ---
- dracut.sh | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
+ dracut.sh | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/dracut.sh b/dracut.sh
-index bbb34697..9da59561 100755
+index bbb34697..52a83061 100755
 --- a/dracut.sh
 +++ b/dracut.sh
-@@ -1389,6 +1389,9 @@ esac
+@@ -1389,6 +1389,11 @@ esac
  
  abs_outfile=$(readlink -f "$outfile") && outfile="$abs_outfile"
  
 +[[ -n $systemd_prefix ]] \
 +    || systemd_prefix=$(pkg-config systemd --variable=prefix 2> /dev/null)
++
++[[ -n $systemd_prefix ]] || systemd_prefix=/usr
 +
  [[ -d $dracutsysrootdir$systemdutildir ]] \
      || systemdutildir=$(pkg-config systemd --variable=systemdutildir 2> /dev/null)
  
-@@ -1467,7 +1470,7 @@ if [[ ! $print_cmdline ]]; then
+@@ -1467,7 +1472,7 @@ if [[ ! $print_cmdline ]]; then
          esac
  
          if ! [[ -s $uefi_stub ]]; then