From 59743aeaef2a1c163ba2150208995055964091d4 Mon Sep 17 00:00:00 2001
From: Andrew Ammerlaan <
andrewammerlaan@gentoo.org>
Date: Thu, 31 Aug 2023 11:03:03 +0200
Subject: [PATCH] dist-kernel-utils.eclass: support CONFIG_EFI_ZBOOT with
USE=secureboot
This config options changes the name of the final image
Closes:
https://bugs.gentoo.org/897684
Signed-off-by: Andrew Ammerlaan <
andrewammerlaan@gentoo.org>
---
eclass/dist-kernel-utils.eclass | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/eclass/dist-kernel-utils.eclass
b/eclass/dist-kernel-utils.eclass
index b2e9df6746e35..1a55424a97efd 100644
--- a/eclass/dist-kernel-utils.eclass
+++ b/eclass/dist-kernel-utils.eclass
@@ -71,8 +71,12 @@ dist-kernel_get_image_path() {
amd64|x86)
echo arch/x86/boot/bzImage
;;
- arm64)
- echo arch/arm64/boot/Image.gz
+ arm64|riscv)
+ if [[ ${KERNEL_IUSE_SECUREBOOT} ]] && use secureboot; then
+ echo arch/${ARCH}/boot/vmlinuz.efi
+ else
+ echo arch/${ARCH}/boot/Image.gz
+ fi
;;
arm)
echo arch/arm/boot/zImage
@@ -83,9 +87,6 @@ dist-kernel_get_image_path() {
# substitutions in the code
echo ./vmlinux
;;
- riscv)
- echo arch/riscv/boot/Image.gz
- ;;
*)
die "${FUNCNAME}: unsupported ARCH=${ARCH}"
;;
--- SoupGate-Win32 v1.05
* Origin: fsxNet Usenet Gateway (21:1/5)