From mboxrd@z Thu Jan 1 00:00:00 1970 From: Danny Milosavljevic Subject: bug#30311: efi-less grub install fails Date: Mon, 26 Mar 2018 23:15:45 +0200 Message-ID: <20180326231545.32ad7d9d@scratchpost.org> References: <87tvuel15z.fsf@netris.org> <20180218174922.47f656a7@scratchpost.org> <87o9kjqqzw.fsf@elephly.net> <20180220224317.36920bcb@scratchpost.org> <87lgfnqqlc.fsf@elephly.net> <20180220230027.1884531a@scratchpost.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/.fHLr/+JjDD_Axyvhq7h9=7"; protocol="application/pgp-signature" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:36201) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f0ZUI-0000A8-Ia for bug-guix@gnu.org; Mon, 26 Mar 2018 17:17:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f0ZUE-0004TB-Jm for bug-guix@gnu.org; Mon, 26 Mar 2018 17:17:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:47000) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f0ZUE-0004SW-Ek for bug-guix@gnu.org; Mon, 26 Mar 2018 17:17:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1f0ZUD-0001D2-Vs for bug-guix@gnu.org; Mon, 26 Mar 2018 17:17:02 -0400 Sender: "Debbugs-submit" Resent-Message-ID: In-Reply-To: <20180220230027.1884531a@scratchpost.org> List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org Sender: "bug-Guix" To: Ricardo Wurmus Cc: Ricardo Wurmus , 30311@debbugs.gnu.org --Sig_/.fHLr/+JjDD_Axyvhq7h9=7 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Any news on how to proceed on this grub target thing? I think the patch below is harmless enough and makes each grub package self-consistent (the non-efi grub doesn't try to use efi, the grub-efi tries to use efi and grub-hybrid tries to use efi, then). >From 263b1dc0de9643094bc41f4be47b4b2317e95d7c Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Sun, 18 Feb 2018 17:30:48 +0100 Subject: [PATCH] gnu: grub: Make sure that non-EFI grub doesn't try to use EFI. Tags: patch * gnu/packages/bootloader.scm (grub)[arguments]<:phases> [patch-/sys/firmware/efi-out]: New phase. (grub-efi)[arguments]<:phases>[patch-/sys/firmware/efi-out]: Delete phase. Fixes . --- gnu/packages/bootloaders.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 59eb22f24..c09829e17 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -103,6 +103,11 @@ (copy-file (assoc-ref inputs "unifont") "unifont.bdf.= gz") (system* "gunzip" "unifont.bdf.gz") #t)) + (add-after 'unpack 'patch-/sys/firmware/efi-out + (lambda _ + (substitute* "grub-core/osdep/linux/platform.c" + (("/sys/firmware/efi") "/sys/firmware/non-efi")) + #t)) (add-before 'check 'disable-flaky-test (lambda _ ;; This test is unreliable. For more information, se= e: @@ -177,6 +182,7 @@ menu to select one of the installed operating systems.") `(cons "--with-platform=3Defi" ,flags)) ((#:phases phases) `(modify-phases ,phases + (delete 'patch-/sys/firmware/efi-out) (add-after 'patch-stuff 'use-absolute-efibootmgr-path (lambda* (#:key inputs #:allow-other-keys) (substitute* "grub-core/osdep/unix/platform.c" --Sig_/.fHLr/+JjDD_Axyvhq7h9=7 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAlq5YwEACgkQ5xo1VCww uqX1ewgAkeorF3oQ251U2U69xZLLzukjbYwTRFSqYLYTUCZqjGV9eiNt8+jH/XwX dO5I98hdXZR6UfxPqhBkjc8xB9f7TJxTiQaVgUDWRCDhxkAlK7LYRAK4MLxcXC/2 i0OpHuO9Gzg4eslNOh/HSlDqH88NRI+6FLKrHxYSWyGQKoCiRce1Lms2CsEf8ebj /bGqXtpvn1kMAMxKqbe/FD2hYFE39LRh41fiDlDdzmB3LhIDPIN1Tn+9VVP5bYbP nZ6UCNA3hMS3I1SS50yGg2EYLuCpVBnRPLdfgl8tMcybbGOOZcuqOx8qJ/rTE8tS LmGrq7GKoVptAgcR24bl3FsoNMRBOA== =oGOM -----END PGP SIGNATURE----- --Sig_/.fHLr/+JjDD_Axyvhq7h9=7--