summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorAndrew Ammerlaan <andrewammerlaan@gentoo.org>2023-08-31 11:03:03 +0200
committerMichał Górny <mgorny@gentoo.org>2023-09-02 19:34:35 +0200
commit661829cb3563d6fde27ac540fc1b42d64ef02541 (patch)
tree17a51c4a230285e372b207d7e749d3cf8b8ac96f /eclass
parentkernel-build.eclass: fix kernel image signing on arm64 and riscv (diff)
downloadgentoo-661829cb3563d6fde27ac540fc1b42d64ef02541.tar.gz
gentoo-661829cb3563d6fde27ac540fc1b42d64ef02541.tar.bz2
gentoo-661829cb3563d6fde27ac540fc1b42d64ef02541.zip
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> Closes: https://github.com/gentoo/gentoo/pull/32532 Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'eclass')
-rw-r--r--eclass/dist-kernel-utils.eclass11
1 files changed, 6 insertions, 5 deletions
diff --git a/eclass/dist-kernel-utils.eclass b/eclass/dist-kernel-utils.eclass
index b2e9df6746e3..1a55424a97ef 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}"
;;