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 AFF3415800A for ; Sat, 17 Jun 2023 18:17:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 864CEE094A; Sat, 17 Jun 2023 18:17:33 +0000 (UTC) Received: from smtp.gentoo.org (dev.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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4F26DE08C3 for ; Sat, 17 Jun 2023 18:17:33 +0000 (UTC) Message-ID: Date: Sat, 17 Jun 2023 20:17:30 +0200 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.12.0 Content-Language: en-US, nl-NL To: gentoo-dev@lists.gentoo.org From: Andrew Ammerlaan Subject: [gentoo-dev] [PATCH 1/2] dist-kernel-utils.eclass: fix extension of generated efi file Organization: Gentoo Linux Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Archives-Salt: df1a4ece-b28b-48e2-9212-833b0b56999d X-Archives-Hash: 0153dcaa186d75953c3f357b830ee52b This fixes a bug. The 90-uki-copy.install kernel-install plugin insists uki's have the .efi extension. You only hit this if you set layout=uki in /etc/kernel/install.conf. layout=uki is probably what you want if you set uefi=yes in dracut.conf because in this layout the uki's end up on the ESP. This is required to load the uki directly from efi firmware. From 1c406ada60d3493203c1fbd6333caf74e53ee8ac Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Fri, 16 Jun 2023 16:33:56 +0200 Subject: [PATCH] dist-kernel-utils.eclass: fix extension of generated efi file If kernel-install is configured to use the uki layout the extension of the efi file that we install has to be .efi otherwise kernel-install returns an error. Signed-off-by: Andrew Ammerlaan --- eclass/dist-kernel-utils.eclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eclass/dist-kernel-utils.eclass b/eclass/dist-kernel-utils.eclass index 439bdc87695df..c6892c2f01278 100644 --- a/eclass/dist-kernel-utils.eclass +++ b/eclass/dist-kernel-utils.eclass @@ -1,4 +1,4 @@ -# Copyright 2020-2022 Gentoo Authors +# Copyright 2020-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: dist-kernel-utils.eclass @@ -104,7 +104,7 @@ dist-kernel_install_kernel() { if [[ ${magic} == MZ ]]; then einfo "Combined UEFI kernel+initramfs executable found" # install the combined executable in place of kernel - image=${initrd}.uefi + image=${initrd}.efi mv "${initrd}" "${image}" || die # put an empty file in place of initrd. installing a duplicate # file would waste disk space, and removing it entirely provokes