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

[Andrew Ammerlaan]

commit:     52477a9c5cfaf1a05816dcb2227e66c8727e6f5c
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  2 13:09:10 2024 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Feb  2 13:11:19 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52477a9c

sys-kernel/dracut: allow building ukis in the grub layout

do not force --no-uefi just because layout is grub

Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 ...104.ebuild => dracut-060_pre20240104-r1.ebuild} |  0
 .../dracut/files/dracut-060-grub-layout.patch      | 23 +++++++++++++++-------
 2 files changed, 16 insertions(+), 7 deletions(-)

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

diff --git a/sys-kernel/dracut/files/dracut-060-grub-layout.patch 
b/sys-kernel/dracut/files/dracut-060-grub-layout.patch
index 5d8e9a9fcf9d..cf292b7168c4 100644
--- a/sys-kernel/dracut/files/dracut-060-grub-layout.patch
+++ b/sys-kernel/dracut/files/dracut-060-grub-layout.patch
@@ -8,15 +8,24 @@ kernel-install is not supported by systemd upstream and 
therefore this
 patch is unlikely to be accepted by dracut upstream.
 
 diff --git a/install.d/50-dracut.install b/install.d/50-dracut.install
-index 441414a..cfd4fe7 100755
+index 441414ac..a98449fe 100755
 --- a/install.d/50-dracut.install
 +++ b/install.d/50-dracut.install
-@@ -30,7 +30,7 @@ if [[ $KERNEL_INSTALL_LAYOUT == "uki" && -n 
$KERNEL_INSTALL_STAGING_AREA ]]; the
+@@ -38,6 +38,17 @@ elif [[ $KERNEL_INSTALL_LAYOUT == "bls" && -n 
$KERNEL_INSTALL_STAGING_AREA ]]; t
      else
          exit 0
      fi
--elif [[ $KERNEL_INSTALL_LAYOUT == "bls" && -n $KERNEL_INSTALL_STAGING_AREA 
]]; then
-+elif [[ $KERNEL_INSTALL_LAYOUT == "bls" || $KERNEL_INSTALL_LAYOUT == "grub" 
&& -n $KERNEL_INSTALL_STAGING_AREA ]]; then
-     BOOT_DIR_ABS="$KERNEL_INSTALL_STAGING_AREA"
-     if [[ -z $KERNEL_INSTALL_INITRD_GENERATOR || 
$KERNEL_INSTALL_INITRD_GENERATOR == "dracut" ]]; then
-         IMAGE="initrd"
++elif [[ $KERNEL_INSTALL_LAYOUT == "grub" && -n $KERNEL_INSTALL_STAGING_AREA 
]]; then
++    BOOT_DIR_ABS="$KERNEL_INSTALL_STAGING_AREA"
++    if [[ -z $KERNEL_INSTALL_UKI_GENERATOR || $KERNEL_INSTALL_UKI_GENERATOR 
== "dracut" ]]; then
++        IMAGE="uki.efi"
++        UEFI_OPTS="--uefi"
++    elif [[ -z $KERNEL_INSTALL_INITRD_GENERATOR || 
$KERNEL_INSTALL_INITRD_GENERATOR == "dracut" ]]; then
++        IMAGE="initrd"
++        UEFI_OPTS="--no-uefi"
++    else
++        exit 0
++    fi
+ else
+     # No layout information, use users --uefi/--no-uefi preference
+     UEFI_OPTS=""