[gentoo-commits] repo/gentoo:master commit in: sys-kernel/gentoo-kernel-bin/

[Nowa Ammerlaan]

commit:     c805eeb53d6a7f8e4bb38921426cf45afe732f93
Author:     Nowa Ammerlaan <nowa <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 24 13:15:57 2025 +0000
Commit:     Nowa Ammerlaan <nowa <AT> gentoo <DOT> org>
CommitDate: Wed Sep 24 13:15:57 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c805eeb5

sys-kernel/gentoo-kernel-bin: fix ordering in 6.12.{47,48}

Signed-off-by: Nowa Ammerlaan <nowa <AT> gentoo.org>

 sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.47.ebuild | 5 +++--
 sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.48.ebuild | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.47.ebuild 
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.47.ebuild
index 7a3f3c256bf9..a40bffa9a916 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.47.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.47.ebuild
@@ -155,6 +155,9 @@ src_configure() {
                die "USE=generic-uki requires a CONFIG_EFI_ZBOOT enabled build"
        fi
 
+       local image="${kernel_dir}/$(dist-kernel_get_image_path)"
+       local uki="${image%/*}/uki.efi"
+
        # Override user variable with the cert used during build
        openssl x509 \
                -inform DER -in "${kernel_dir}/certs/signing_key.x509" \
@@ -162,8 +165,6 @@ src_configure() {
                        die "Failed to convert pcrpkey to PEM format"
        export SECUREBOOT_SIGN_CERT=${T}/cert.pem
 
-       local image="${kernel_dir}/$(dist-kernel_get_image_path)"
-       local uki="${image%/*}/uki.efi"
        if [[ -s ${uki} ]]; then
                # We need to extract the plain image for the test phase
                # and USE=-generic-uki.

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.48.ebuild 
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.48.ebuild
index f27b76b50f36..4c114ed3f971 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.48.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.48.ebuild
@@ -155,6 +155,9 @@ src_configure() {
                die "USE=generic-uki requires a CONFIG_EFI_ZBOOT enabled build"
        fi
 
+       local image="${kernel_dir}/$(dist-kernel_get_image_path)"
+       local uki="${image%/*}/uki.efi"
+
        # Override user variable with the cert used during build
        openssl x509 \
                -inform DER -in "${kernel_dir}/certs/signing_key.x509" \
@@ -162,8 +165,6 @@ src_configure() {
                        die "Failed to convert pcrpkey to PEM format"
        export SECUREBOOT_SIGN_CERT=${T}/cert.pem
 
-       local image="${kernel_dir}/$(dist-kernel_get_image_path)"
-       local uki="${image%/*}/uki.efi"
        if [[ -s ${uki} ]]; then
                # We need to extract the plain image for the test phase
                # and USE=-generic-uki.