From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A6F3D15815E for ; Fri, 2 Feb 2024 13:11:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B32E6E29AF; Fri, 2 Feb 2024 13:11:32 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9C794E29AF for ; Fri, 2 Feb 2024 13:11:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D3C8F3431CF for ; Fri, 2 Feb 2024 13:11:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0916914B5 for ; Fri, 2 Feb 2024 13:11:30 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1706879479.52477a9c5cfaf1a05816dcb2227e66c8727e6f5c.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/, sys-kernel/dracut/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-kernel/dracut/dracut-060_pre20240104-r1.ebuild sys-kernel/dracut/dracut-060_pre20240104.ebuild sys-kernel/dracut/files/dracut-060-grub-layout.patch X-VCS-Directories: sys-kernel/dracut/files/ sys-kernel/dracut/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 52477a9c5cfaf1a05816dcb2227e66c8727e6f5c X-VCS-Branch: master Date: Fri, 2 Feb 2024 13:11:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5b9d1041-2fcc-43cf-a7aa-dbc4f4e4e9f8 X-Archives-Hash: 14150c3755f7bd6ee6a1abce8397be63 commit: 52477a9c5cfaf1a05816dcb2227e66c8727e6f5c Author: Andrew Ammerlaan gentoo org> AuthorDate: Fri Feb 2 13:09:10 2024 +0000 Commit: Andrew Ammerlaan gentoo 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 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=""