From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52511) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dW5rm-0007no-35 for guix-patches@gnu.org; Fri, 14 Jul 2017 15:03:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dW5rj-00005g-05 for guix-patches@gnu.org; Fri, 14 Jul 2017 15:03:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:36634) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dW5ri-00005Z-Tf for guix-patches@gnu.org; Fri, 14 Jul 2017 15:03:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dW5ri-0005oN-LD for guix-patches@gnu.org; Fri, 14 Jul 2017 15:03:02 -0400 Subject: [bug#27695] [PATCH 1/2] bootloader: Add grub-hybrid-bootloader. Resent-Message-ID: From: Danny Milosavljevic Date: Fri, 14 Jul 2017 21:01:56 +0200 Message-Id: <20170714190157.4529-1-dannym@scratchpost.org> In-Reply-To: <20170714185954.4381-1-dannym@scratchpost.org> References: <20170714185954.4381-1-dannym@scratchpost.org> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 27695@debbugs.gnu.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))) + ;;; ;;; 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