From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id kPekLbMx0F6hJwAA0tVLHw (envelope-from ) for ; Thu, 28 May 2020 21:48:35 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id MMKJKbMx0F5YfwAAB5/wlQ (envelope-from ) for ; Thu, 28 May 2020 21:48:35 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 5541A940367 for ; Thu, 28 May 2020 21:48:35 +0000 (UTC) Received: from localhost ([::1]:37468 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jeQOA-0006S1-8R for larch@yhetil.org; Thu, 28 May 2020 17:48:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37248) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jeQKk-0000kZ-Dt for guix-patches@gnu.org; Thu, 28 May 2020 17:45:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41666) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jeQKk-0004MZ-12 for guix-patches@gnu.org; Thu, 28 May 2020 17:45:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jeQKj-0004ga-RW for guix-patches@gnu.org; Thu, 28 May 2020 17:45:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41560] [PATCH 6/8] image: Use grub-efi to install the EFI bootloader. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 28 May 2020 21:45:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41560 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Mathieu Othacehe Cc: Mathieu Othacehe , 41560@debbugs.gnu.org Received: via spool by 41560-submit@debbugs.gnu.org id=B41560.159070228017972 (code B ref 41560); Thu, 28 May 2020 21:45:01 +0000 Received: (at 41560) by debbugs.gnu.org; 28 May 2020 21:44:40 +0000 Received: from localhost ([127.0.0.1]:53212 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jeQKO-0004fn-CH for submit@debbugs.gnu.org; Thu, 28 May 2020 17:44:40 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57646) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jeQKN-0004fb-75 for 41560@debbugs.gnu.org; Thu, 28 May 2020 17:44:39 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:41925) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jeQKH-00045H-PI; Thu, 28 May 2020 17:44:33 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=39908 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jeQKG-0003OW-Vm; Thu, 28 May 2020 17:44:33 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <20200527072420.26140-1-othacehe@gnu.org> <20200527072420.26140-6-othacehe@gnu.org> Date: Thu, 28 May 2020 23:44:30 +0200 In-Reply-To: <20200527072420.26140-6-othacehe@gnu.org> (Mathieu Othacehe's message of "Wed, 27 May 2020 09:24:18 +0200") Message-ID: <87d06n91kx.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -3.3 (---) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: -1.01 X-TUID: fL7Mwru2v7/U Mathieu Othacehe skribis: > * guix/utils.scm (target-intel?): New exported procedure. > * gnu/build/image.scm (initialize-efi-partition): Rename bootloader-packa= ge > argument to grub-efi. > * gnu/system/image.scm (system-disk-image): Adapt accordingly to pass > grub-efi package. Make sure that grub-efi is not built if we are not targ= eting > an Intel system. [...] > +++ b/gnu/build/image.scm > @@ -146,10 +146,10 @@ deduplicates files common to CLOSURE and the rest o= f PREFIX." >=20=20 > (define* (initialize-efi-partition root > #:key > - bootloader-package > + grub-efi > #:allow-other-keys) > "Install in ROOT directory, an EFI loader using BOOTLOADER-PACKAGE." > - (install-efi-loader bootloader-package root)) > + (install-efi-loader grub-efi root)) Does it have to be GRUB? > +++ b/gnu/system/image.scm > @@ -235,6 +235,10 @@ used in the image." > #:references-graphs '#$graph > #:deduplicate? #f > #:system-directory #$os > + #:grub-efi #$(let-system (system target) > + (and (target-intel? > + (or target system)) > + grub-efi)) Some AArch64 systems such as the SoftIron OverDrive 1000 use EFI too. So I don=E2=80=99t think the above is correct. > +(define* (target-intel? #:optional (target (or (%current-target-system) > + (%current-system)))) > + (any (cut string-prefix? <> target) '("x86_64" "i686"))) Shouldn=E2=80=99t it include i[345]6 as well? Also, I think no 32-bit Intel systems use EFI. Actually, why do we need to guess, can=E2=80=99t we just use the bootloader specified in the record? (Na=C3=AFve question, I haven= =E2=80=99t checked=E2=80=A6)