gentoo auto-resync : 27:05:2023 - 03:10:45

3 files changed, 51 insertions, 1 deletions

diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest
index 01c8d3954df5..6b7a52709fc9 100644
--- a/sys-kernel/dracut/Manifest
+++ b/sys-kernel/dracut/Manifest
@@ -1,10 +1,11 @@
 AUX 057-i18n-keymaps.patch 1364 BLAKE2B 6805d459d7c6327b8f421a6853c6d1d91d29729231ff60a8dfc9a4fae1860cb385aec3c860079ad2e53af6c8d773be2e152422b1883a1e6be574c580cc9733e5 SHA512 818e59e7d2173b63c0b30eeeadcfb3f92409c8697d5581c77b9e5ba9669b585fc0cdad416dcc511da52ca0149a3abe7763d2654198763a6d08a1fbfce38295a9
 AUX 057-virtiofs-split-usr.patch 1556 BLAKE2B 292293bce43e899491001664c21d9fc2795d8e8221187c557fb9d74ab3fb7f91aa72d1bcd7c6750a834e7d8ebace27483f2c799353c9857adef2144fe7a5384a SHA512 a61cdfebcfaa9320af669c20589bb5c260c31c8d1cfd330751dbad6bea8e5b07f384ae43b4b9ab3390d233091872f38bbb11f23ec44e2c3fc6b263268d2ae56a
+AUX 059-uefi-split-usr.patch 1567 BLAKE2B 6abde1671c49e6314e181747ff504f50b7d6d1c9268f5f93a859edfdbbe823f48e33287dfa426b33f2dc967f1895d5499460e9bb865731e784a658d350ba7a3f SHA512 d1b27993003e5da1634a7e287a42ee0c4b8789a411024472e1b8b5a9923d94788dfe0bc4b48da9071bf62bb857aedbb18a5be7324e6d4c0919b329d85cc6b160
 AUX gentoo-ldconfig-paths-r1.patch 1423 BLAKE2B e8bce9ee4b1b2546d4dbaa22a6167f9e3520df4f5f3b67509e430e4a6dd89d9fd18e53328c4bd6ee817e6b27ffcccf29fbdd922707c98f4fe67f6d44d76de2ff SHA512 fd44643e671d59ca51822d0f68b7ce7756035faca780ec784e64950770944f0aefd00a1dd2424f07568d5d97d46c0080c8e740856e0bff79bcf6a7e14b08ab8f
 AUX gentoo-network-r1.patch 1002 BLAKE2B 719ff76c315e29c2a40f0a485e315622d6678ef0a325681af22ca060189649119ce08024b1b81be02b28cf532d33165918f5707742bb9927abd08ce49ee0565d SHA512 694f493384e2c0b6a46508f2290efca78d1b6f742fe8441f970837280558d160a711e36ba835ca767cfd158bf191856017af146ae19c5aa1aecbd10a69be38a1
 DIST dracut-057.tar.gz 481345 BLAKE2B dcf663a1955753256866e9dfa318b0b46a132ea39223ab634d72af1611f7db394c23c1bb4326979a5ee919df6ce3b107c955c9c77ce1ec4f99de835352932901 SHA512 8acdc8db2233a9abbaeea218cc5b1be68c4985088995f42624750783f8d40ecbb7fa97ab4f6468f67c079c8418590ace317c143a92d9305640b48c7c0edd4089
 DIST dracut-059.tar.gz 486487 BLAKE2B 86bbe18875cd3507e187b724cab212dc82e1daca7cedf79aeef13c34601adfff72bf2c0ba4c652e715b43c9a16f7be6a4a2b29dc75bef014640e1ec07c8d455b SHA512 196bc8bf18703c72bffb51a7e0493719c58173ad2da7d121eb42f9a8de47e953af36d109214dc4a10b2dc2d3bd19e844f7f51c2bdec087e064ea11f75124032d
 EBUILD dracut-057-r3.ebuild 4863 BLAKE2B 095196aecc908a321c6291bc7898bdc4b5993bc5cf3db95b8e9a86f395ee4ebc873abedb46fcc8fe77787355d0b5fe6009dab4e59a9f8f339b527c7e84c7fcf0 SHA512 819e9becd4ad8f4128c2f610371cbb2115f106ce2df8ee3bf31a60a35b47e1195c781f0820f759f8495002fa3ba857528955dfd3c7e96524440be60162c7e7ef
-EBUILD dracut-059.ebuild 4789 BLAKE2B a29c539dde182df4fc4204400e773bdc7046ecd5dc175bf9fa237e188908b397e82e1c73e09796b9e10478a34099b89b6354757c76c94e0f54f8d56508747c37 SHA512 6329df92dc60294c899ad3bc6da4cd4465b157d134e93727374491f7dc2142944716f376877955438fe72c61358ca999ab1b3ea07a48c1ca46a0db059b974af7
+EBUILD dracut-059-r2.ebuild 4829 BLAKE2B d460d9062bdac79713150247725e27ac302c7e81c031502e6dc608f9c0c0b69d2e2fe18d4da06e42c54b5fe43d96ca4e11304214d706e58fd7a7d529ba904050 SHA512 534cfcbe015fec474b43a06f0834a9a321b78a665b78d0c4710b05d39def094b14ef38f72ffbead442d238ac4feb27cd46516a160b5723d91bd83a5631c6ee24
 EBUILD dracut-9999.ebuild 4778 BLAKE2B 605ba325c9c2d412c50bd24695887aa59f910691eb0d6ade5aec722a7499c6d3fb817bd4f66ceb52631a88072f73f8ccdeed0954f6c4ea5c52ae7a910460746f SHA512 564eb5be7cef6847380883ac1c9940e91ba6cd8401af69495ea93212031acc986101a6cfecb31fb255e4e6bbc954f09eedaf9f4a096fed613ff6042a3f60c5c1
 MISC metadata.xml 561 BLAKE2B da4ebae5f448d555a01dde8ca36f029ac41f2e740fc7872faa1f0c1dc5a7b13ee989533667c8f4fecbdb324a01a73970790c6f040dbb28a5f13e3a68e1fbfe7a SHA512 c228259a0235119d69c437caa4209598d1e40c8e4974de5a66f272c48acc049d7f24f3f38fc7498aa0b21c7b417253f2a5b649daf0d01543e950a027d2e3cf9b
diff --git a/sys-kernel/dracut/dracut-059.ebuild b/sys-kernel/dracut/dracut-059-r2.ebuild
index 20f297121ad8..5aa6cfb4a241 100644
--- a/sys-kernel/dracut/dracut-059.ebuild
+++ b/sys-kernel/dracut/dracut-059-r2.ebuild
@@ -64,6 +64,7 @@ QA_MULTILIB_PATHS="usr/lib/dracut/.*"
 PATCHES=(
 	"${FILESDIR}"/gentoo-ldconfig-paths-r1.patch
 	"${FILESDIR}"/gentoo-network-r1.patch
+	"${FILESDIR}"/059-uefi-split-usr.patch
 )
 
 src_configure() {
diff --git a/sys-kernel/dracut/files/059-uefi-split-usr.patch b/sys-kernel/dracut/files/059-uefi-split-usr.patch
new file mode 100644
index 000000000000..8adb88076130
--- /dev/null
+++ b/sys-kernel/dracut/files/059-uefi-split-usr.patch
@@ -0,0 +1,48 @@
+https://github.com/dracutdevs/dracut/pull/2365
+
+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
+
+systemd always installs the UEFI stub in ${prefix}/lib/systemd/boot/efi.
+
+On split-usr systems, systemdutildir is ${rootprefix}/lib/systemd, which
+makes dracut look in the wrong place.
+
+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 | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/dracut.sh b/dracut.sh
+index bbb34697..52a83061 100755
+--- a/dracut.sh
++++ b/dracut.sh
+@@ -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 +1472,7 @@ if [[ ! $print_cmdline ]]; then
+         esac
+ 
+         if ! [[ -s $uefi_stub ]]; then
+-            uefi_stub="$dracutsysrootdir${systemdutildir}/boot/efi/linux${EFI_MACHINE_TYPE_NAME}.efi.stub"
++            uefi_stub="$dracutsysrootdir${systemd_prefix}/lib/systemd/boot/efi/linux${EFI_MACHINE_TYPE_NAME}.efi.stub"
+         fi
+ 
+         if ! [[ -s $uefi_stub ]]; then
+-- 
+2.40.1
+