From: Andrew Ammerlaan <andrewammerlaan@gentoo.org>
To: gentoo-dev@lists.gentoo.org
Subject: Re: [gentoo-dev] [PATCH 2/2] dist-kernel-utils.eclass: support CONFIG_EFI_ZBOOT with, USE=secureboot
Date: Sat, 2 Sep 2023 12:27:43 +0200 [thread overview]
Message-ID: <c036f1de-5064-4748-8a5f-5d5e8152d649@gentoo.org> (raw)
In-Reply-To: <c35f99e3-6fec-4628-a5b4-05924f5c68fa@gentoo.org>
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}"
;;
prev parent reply other threads:[~2023-09-02 10:27 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-02 10:26 [gentoo-dev] [PATCH 1/2] kernel-build.eclass: fix kernel image signing on arm64 and, riscv Andrew Ammerlaan
2023-09-02 10:27 ` Andrew Ammerlaan [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c036f1de-5064-4748-8a5f-5d5e8152d649@gentoo.org \
--to=andrewammerlaan@gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox