From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marius Bakke Subject: Re: [PATCH 6/6] gnu: Add grub-efi. Date: Sat, 05 Nov 2016 19:38:04 +0000 Message-ID: <87h97l67kz.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> References: <20161105125511.29383-1-mbakke@fastmail.com> <20161105125511.29383-7-mbakke@fastmail.com> <20161105185803.GA11667@jasmine> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:50702) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c36n4-0002BA-Qy for guix-devel@gnu.org; Sat, 05 Nov 2016 15:38:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c36n1-0000m5-LH for guix-devel@gnu.org; Sat, 05 Nov 2016 15:38:10 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:53051) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1c36n1-0000lK-Gl for guix-devel@gnu.org; Sat, 05 Nov 2016 15:38:07 -0400 In-Reply-To: <20161105185803.GA11667@jasmine> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: Leo Famulari Cc: guix-devel@gnu.org --=-=-= Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" --==-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Leo Famulari writes: > On Sat, Nov 05, 2016 at 12:55:11PM +0000, Marius Bakke wrote: >> * gnu/packages/grub.scm (grub-efi): New variable. >> --- >> gnu/packages/grub.scm | 21 +++++++++++++++++++++ >> 1 file changed, 21 insertions(+) >>=20 >> diff --git a/gnu/packages/grub.scm b/gnu/packages/grub.scm >> index ffce1bf..e06216f 100644 >> --- a/gnu/packages/grub.scm >> +++ b/gnu/packages/grub.scm >> @@ -157,3 +157,24 @@ on the same computer; upon booting the computer, th= e user is presented with a >> menu to select one of the installed operating systems.") >> (license gpl3+) >> (properties '((cpe-name . "grub2"))))) >> + >> +(define-public grub-efi >> + (package >> + (inherit grub) >> + (name "grub-efi") >> + (synopsis (string-append (package-synopsis grub) " (UEFI version)")) >> + (inputs >> + `(("efibootmgr" ,efibootmgr) >> + ,@(package-inputs grub))) >> + (arguments >> + #:tests? #f ; FIXME: 40 failures, 24 skipped, 17 passed. > > Does this package work for you? Oops, not sure what went wrong when fixing up this package for publishing. Updated patch attached. The tests are the same as the original grub package, so I don't get why they are failing now. --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEcBAEBCgAGBQJYHjUcAAoJEKKgbfKjOlT6HzAH/1I57BgHRfC29aCPUQJcG8n6 yihjt38yVL2Diq2EoCJd3hKKfbh/lDnRsxdbXesRfIrpXuJYIsnyul2cx8sNlQ0g v1cr6C52fO2lff5YqlLlMcChAScDQhgwkwu1joGi0i9qrM84nYBAKdiMGuNpiNc4 Boi+SARK4wdkjBhRvAujBSiUSTr6M6aWMMdnfcQwt2UnXMyvFopOkK/GoaCxZAr0 zxoK9ouHVuIWEXeEeeP7NNDJiTJW4DkVUsHkiVgqKXxmGcuoA3eP6oXxXdx8Wf8C rsVAXcaF6hUodC6LI44LE5TUp2VTM0SocRIv4TLNJJDhKAjLEVFEs9OyqAVfgc4= =ZT8e -----END PGP SIGNATURE----- --==-=-=-- --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-gnu-Add-grub-efi.patch >From 940c03c7dcddec019e27f6eb1470aeab4db57799 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 20 Oct 2016 17:26:52 +0100 Subject: [PATCH] gnu: Add grub-efi. * gnu/packages/grub.scm (grub-efi): New variable. --- gnu/packages/grub.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/grub.scm b/gnu/packages/grub.scm index ffce1bf..7dcfc47 100644 --- a/gnu/packages/grub.scm +++ b/gnu/packages/grub.scm @@ -157,3 +157,24 @@ on the same computer; upon booting the computer, the user is presented with a menu to select one of the installed operating systems.") (license gpl3+) (properties '((cpe-name . "grub2"))))) + +(define-public grub-efi + (package + (inherit grub) + (name "grub-efi") + (synopsis (string-append (package-synopsis grub) " (UEFI version)")) + (inputs + `(("efibootmgr" ,efibootmgr) + ,@(package-inputs grub))) + (arguments + `(#:tests? #f ; FIXME: 40 failures, 24 skipped, 17 passed. + ,@(substitute-keyword-arguments (package-arguments grub) + ((#:configure-flags flags) `(cons* "--with-platform=efi" + ,flags)) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'patch-stuff 'patch-efibootmgr-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "grub-core/osdep/unix/platform.c" + (("efibootmgr") (string-append (assoc-ref inputs "efibootmgr") + "/sbin/efibootmgr")))))))))))) -- 2.10.2 --=-=-=--