From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EC3B115808A for ; Sat, 2 Sep 2023 17:34:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D7C7A2BC020; Sat, 2 Sep 2023 17:34:56 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C35F82BC020 for ; Sat, 2 Sep 2023 17:34:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C8446335CB9 for ; Sat, 2 Sep 2023 17:34:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 73ACC1104 for ; Sat, 2 Sep 2023 17:34:54 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1693676075.661829cb3563d6fde27ac540fc1b42d64ef02541.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/dist-kernel-utils.eclass X-VCS-Directories: eclass/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 661829cb3563d6fde27ac540fc1b42d64ef02541 X-VCS-Branch: master Date: Sat, 2 Sep 2023 17:34:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4e37c71c-09a5-49a1-83ca-c4cc0a87dd78 X-Archives-Hash: f84fe1466b594e96247dcdfba1075b5e commit: 661829cb3563d6fde27ac540fc1b42d64ef02541 Author: Andrew Ammerlaan gentoo org> AuthorDate: Thu Aug 31 09:03:03 2023 +0000 Commit: Michał Górny gentoo 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 gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/32532 Signed-off-by: Michał Górny 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}" ;;