[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
14/35: image: Use grub-efi to install the EFI bootloader.
From: |
guix-commits |
Subject: |
14/35: image: Use grub-efi to install the EFI bootloader. |
Date: |
Thu, 28 May 2020 13:03:31 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd-vm
in repository guix.
commit 62ce0d57dfede910d1ca81056a1bd61e8290be1c
Author: Mathieu Othacehe <othacehe@gnu.org>
AuthorDate: Sat May 23 19:10:04 2020 +0200
image: Use grub-efi to install the EFI bootloader.
* guix/utils.scm (target-intel?): New exported procedure.
* gnu/build/image.scm (initialize-efi-partition): Rename bootloader-package
argument to grub-efi.
* gnu/system/image.scm (system-disk-image): Adapt accordingly to pass
grub-efi package. Make sure that grub-efi is not built if we are not
targeting
an Intel system.
---
gnu/build/image.scm | 4 ++--
gnu/system/image.scm | 4 ++++
guix/utils.scm | 5 +++++
3 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/gnu/build/image.scm b/gnu/build/image.scm
index 49faeab..a8594e2 100644
--- a/gnu/build/image.scm
+++ b/gnu/build/image.scm
@@ -146,10 +146,10 @@ deduplicates files common to CLOSURE and the rest of
PREFIX."
(define* (initialize-efi-partition root
#:key
- bootloader-package
+ grub-efi
#:allow-other-keys)
"Install in ROOT directory, an EFI loader using BOOTLOADER-PACKAGE."
- (install-efi-loader bootloader-package root))
+ (install-efi-loader grub-efi root))
(define* (initialize-root-partition root
#:key
diff --git a/gnu/system/image.scm b/gnu/system/image.scm
index 7ac998d..a706f87 100644
--- a/gnu/system/image.scm
+++ b/gnu/system/image.scm
@@ -235,6 +235,10 @@ used in the image."
#:references-graphs '#$graph
#:deduplicate? #f
#:system-directory #$os
+ #:grub-efi #$(let-system (system target)
+ (and (target-intel?
+ (or target system))
+ grub-efi))
#:bootloader-package
#+(bootloader-package bootloader)
#:bootloader-installer
diff --git a/guix/utils.scm b/guix/utils.scm
index d7b197f..fb3b233 100644
--- a/guix/utils.scm
+++ b/guix/utils.scm
@@ -74,6 +74,7 @@
%current-target-system
package-name->name+version
target-mingw?
+ target-intel?
target-arm32?
target-aarch64?
target-arm?
@@ -490,6 +491,10 @@ a character other than '@'."
(and target
(string-suffix? "-mingw32" target)))
+(define* (target-intel? #:optional (target (or (%current-target-system)
+ (%current-system))))
+ (any (cut string-prefix? <> target) '("x86_64" "i686")))
+
(define* (target-arm32? #:optional (target (or (%current-target-system)
(%current-system))))
(string-prefix? "arm" target))
- branch wip-hurd-vm created (now dbdce6e), guix-commits, 2020/05/28
- 01/35: system: 'system-linux-image-file-name' takes an optional parameter., guix-commits, 2020/05/28
- 02/35: vm: 'expression->derivation-in-linux-vm' always returns a native build., guix-commits, 2020/05/28
- 07/35: gnu: guile-static: Disable JIT on ARMv7., guix-commits, 2020/05/28
- 05/35: vm: <virtual-machine> compiler honors system and target., guix-commits, 2020/05/28
- 06/35: vm: Shared-store script runs that native QEMU and Bash., guix-commits, 2020/05/28
- 13/35: system: image: Correct genimage configuration file indentation., guix-commits, 2020/05/28
- 14/35: image: Use grub-efi to install the EFI bootloader.,
guix-commits <=
- 17/35: image: Add Hurd support., guix-commits, 2020/05/28
- 15/35: system: image: Fix image-with-os., guix-commits, 2020/05/28
- 18/35: linux-boot: Update 'make-hurd-device-nodes'., guix-commits, 2020/05/28
- 03/35: vm: 'qemu-image' uses the native partitioning tools and bootloader., guix-commits, 2020/05/28
- 08/35: gnu: hurd: Update to upstream Hurd-reserved xattr index., guix-commits, 2020/05/28
- 09/35: bootloader: Add 'disk-image-installer'., guix-commits, 2020/05/28
- 16/35: image: Do not use VM to create disk-images., guix-commits, 2020/05/28
- 21/35: system: Add 'hurd' field to <operating-system>., guix-commits, 2020/05/28
- 23/35: system: Add 'multiboot-modules' field to <boot-parameters>., guix-commits, 2020/05/28
- 25/35: system: Use 'hurd' package in label., guix-commits, 2020/05/28