commit: 661829cb3563d6fde27ac540fc1b42d64ef02541 Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> AuthorDate: Thu Aug 31 09:03:03 2023 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sat Sep 2 17:34:35 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=661829cb
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 <AT> gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/32532 Signed-off-by: Michał Górny <mgorny <AT> 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 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}" ;;
