all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Danny Milosavljevic <dannym@scratchpost.org>
To: 27705@debbugs.gnu.org
Subject: [bug#27705] [PATCH v2 1/4] gnu: grub-efi: Add mtools input.
Date: Thu, 20 Jul 2017 21:12:20 +0200	[thread overview]
Message-ID: <20170720191223.17189-2-dannym@scratchpost.org> (raw)
In-Reply-To: <20170720191223.17189-1-dannym@scratchpost.org>

* gnu/packages/bootloaders.scm: Add (gnu packages mtools).
(grub-efi)[inputs]: Add mtools.
[arguments]: Add phase "use-absolute-mtools-path".
---
 gnu/packages/bootloaders.scm | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index 802e8ab8d..7a91e32d9 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -37,6 +37,7 @@
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages man)
+  #:use-module (gnu packages mtools)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages python)
@@ -149,6 +150,7 @@ menu to select one of the installed operating systems.")
     (synopsis "GRand Unified Boot loader (UEFI version)")
     (inputs
      `(("efibootmgr" ,efibootmgr)
+       ("mtools", mtools)
        ,@(package-inputs grub)))
     (arguments
      `(;; TODO: Tests need a UEFI firmware for qemu. There is one at
@@ -166,7 +168,19 @@ menu to select one of the installed operating systems.")
                      (("efibootmgr")
                       (string-append (assoc-ref inputs "efibootmgr")
                                      "/sbin/efibootmgr")))
-                   #t)))))))))
+                   #t))
+               (add-after 'patch-stuff 'use-absolute-mtools-path
+                 (lambda* (#:key inputs #:allow-other-keys)
+                   (let ((mtools (assoc-ref inputs "mtools")))
+                     (substitute* "util/grub-mkrescue.c"
+                       (("\"mformat\"")
+                        (string-append "\"" mtools
+                                       "/bin/mformat\"")))
+                     (substitute* "util/grub-mkrescue.c"
+                       (("\"mcopy\"")
+                        (string-append "\"" mtools
+                                       "/bin/mcopy\"")))
+                     #t))))))))))
 
 (define-public syslinux
   (let ((commit "bb41e935cc83c6242de24d2271e067d76af3585c"))

  reply	other threads:[~2017-07-20 19:13 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-07-15 13:35 [bug#27705] [PATCH 0/4] Make both EFI and non-EFI systems boot our disk images Danny Milosavljevic
2017-07-15 13:37 ` [bug#27705] [PATCH 1/4] gnu: grub-efi: Add mtools input Danny Milosavljevic
2017-07-15 13:37 ` [bug#27705] [PATCH 2/4] build: Allow mounting of entire disks Danny Milosavljevic
2017-07-15 13:37   ` [bug#27705] [PATCH 3/4] gnu: grub-efi: Add grub Danny Milosavljevic
2017-07-17 18:00     ` Danny Milosavljevic
2017-07-17 21:26     ` Marius Bakke
2017-07-19 20:48       ` Danny Milosavljevic
2017-07-15 13:37   ` [bug#27705] [PATCH 4/4] install: Use grub-efi Danny Milosavljevic
2017-07-17 21:42     ` Danny Milosavljevic
2017-07-20 19:12 ` [bug#27705] [PATCH v2 0/4] Make both EFI and non-EFI systems boot our ISO9660 disk images Danny Milosavljevic
2017-07-20 19:12   ` Danny Milosavljevic [this message]
2017-07-20 19:12   ` [bug#27705] [PATCH v2 2/4] build: Allow mounting of entire disks Danny Milosavljevic
2017-07-20 19:12   ` [bug#27705] [PATCH v2 3/4] gnu: Add grub-hybrid Danny Milosavljevic
2017-07-20 19:12   ` [bug#27705] [PATCH v2 4/4] vm: Use grub-hybrid's grub-mkrescue Danny Milosavljevic
2017-07-20 19:44 ` [bug#27705] [PATCH v3 0/4] Make both EFI and non-EFI systems boot our ISO9660 disk images Danny Milosavljevic
2017-07-20 19:44   ` [bug#27705] [PATCH v3 1/4] gnu: grub-efi: Add mtools input Danny Milosavljevic
2017-07-20 19:44   ` [bug#27705] [PATCH v3 2/4] build: Allow mounting of entire disks Danny Milosavljevic
2017-07-20 19:44   ` [bug#27705] [PATCH v3 3/4] gnu: Add grub-hybrid Danny Milosavljevic
2017-07-20 19:44   ` [bug#27705] [PATCH v3 4/4] vm: Use grub-hybrid's grub-mkrescue Danny Milosavljevic
2017-07-20 23:06 ` [bug#27705] [PATCH v4 0/4] Make both EFI and non-EFI systems boot our ISO9660 disk images Danny Milosavljevic
2017-07-20 23:06   ` [bug#27705] [PATCH v4 1/4] gnu: grub-efi: Add mtools input Danny Milosavljevic
2017-07-29 17:59     ` Danny Milosavljevic
2017-07-20 23:06   ` [bug#27705] [PATCH v4 2/4] build: Allow mounting of entire disks Danny Milosavljevic
2017-08-05 17:34     ` Danny Milosavljevic
2017-08-05 21:25       ` Ludovic Courtès
2017-07-20 23:06   ` [bug#27705] [PATCH v4 3/4] gnu: Add grub-hybrid Danny Milosavljevic
2017-08-03 14:36     ` Danny Milosavljevic
2017-07-20 23:06   ` [bug#27705] [PATCH v4 4/4] vm: Use grub-hybrid's grub-mkrescue Danny Milosavljevic
2017-08-03 16:12     ` Danny Milosavljevic

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170720191223.17189-2-dannym@scratchpost.org \
    --to=dannym@scratchpost.org \
    --cc=27705@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.