From: Danny Milosavljevic <dannym@scratchpost.org>
To: 27695@debbugs.gnu.org
Subject: [bug#27695] [PATCH 1/2] bootloader: Add grub-hybrid-bootloader.
Date: Fri, 14 Jul 2017 21:01:56 +0200 [thread overview]
Message-ID: <20170714190157.4529-1-dannym@scratchpost.org> (raw)
In-Reply-To: <20170714185954.4381-1-dannym@scratchpost.org>
* gnu/packages/bootloaders.scm (grub-hybrid): New variable.
* gnu/bootloader/grub.scm (grub-hybrid-bootloader): New variable.
---
gnu/bootloader/grub.scm | 7 +++++++
gnu/packages/bootloaders.scm | 20 ++++++++++++++++++++
2 files changed, 27 insertions(+)
diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm
index 880491c98..a67d914ef 100644
--- a/gnu/bootloader/grub.scm
+++ b/gnu/bootloader/grub.scm
@@ -55,6 +55,7 @@
grub-bootloader
grub-efi-bootloader
+ grub-hybrid-bootloader
grub-configuration))
@@ -413,6 +414,12 @@ submenu \"GNU system, old configurations...\" {~%")
(name 'grub-efi)
(package grub-efi)))
+(define* grub-hybrid-bootloader
+ (bootloader
+ (inherit grub-bootloader)
+ (name 'grub-hybrid)
+ (package grub-hybrid)))
+
\f
;;;
;;; Compatibility macros.
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index 9c6927f2a..946bdfd9b 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -182,6 +182,26 @@ menu to select one of the installed operating systems.")
"/bin/mcopy\"")))
#t))))))))))
+(define-public grub-hybrid
+ (package
+ (inherit grub-efi)
+ (name "grub-hybrid")
+ (synopsis "GRand Unified Boot loader (Hybrid version)")
+ (native-inputs
+ `(("grub" ,grub)
+ ,@(package-native-inputs grub-efi)))
+ (arguments
+ (substitute-keyword-arguments (package-arguments grub-efi)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ (add-after 'install 'install-non-efi
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (copy-recursively (string-append (assoc-ref inputs "grub")
+ "/lib/grub/i386-pc")
+ (string-append (assoc-ref outputs "out")
+ "/lib/grub/i386-pc"))
+ #t))))))))
+
(define-public syslinux
(let ((commit "bb41e935cc83c6242de24d2271e067d76af3585c"))
(package
next prev parent reply other threads:[~2017-07-14 19:03 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-14 18:59 [bug#27695] [PATCH 0/2] Introduce grub hybrid bootloader and use it Danny Milosavljevic
2017-07-14 19:01 ` Danny Milosavljevic [this message]
2017-07-14 19:01 ` [bug#27695] [PATCH 2/2] install: Use grub-hybrid-bootloader Danny Milosavljevic
2017-07-20 8:39 ` [bug#27695] [PATCH 1/2] bootloader: Add grub-hybrid-bootloader Ludovic Courtès
2017-07-20 11:47 ` Danny Milosavljevic
2017-07-20 18:42 ` Danny Milosavljevic
2017-07-14 19:34 ` [bug#27695] [PATCH 0/2] Introduce grub hybrid bootloader and use it 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
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170714190157.4529-1-dannym@scratchpost.org \
--to=dannym@scratchpost.org \
--cc=27695@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 public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).