Re: [PATCH 6/6] gnu: Add grub-efi.

[Marius Bakke <mbakke@fastmail.com>]

[-- Attachment #1.1: Type: text/plain, Size: 1269 bytes --]

Leo Famulari <leo@famulari.name> 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(+)
>> 
>> 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, 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.
>
> 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.


[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 454 bytes --]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Add-grub-efi.patch --]
[-- Type: text/x-patch, Size: 1642 bytes --]

From 940c03c7dcddec019e27f6eb1470aeab4db57799 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
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