[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch wip-hurd-vm updated: squash! system: hurd: Add hurd-grub-configur
From: |
guix-commits |
Subject: |
branch wip-hurd-vm updated: squash! system: hurd: Add hurd-grub-configuration-file. |
Date: |
Mon, 04 May 2020 13:51:31 -0400 |
This is an automated email from the git hooks/post-receive script.
janneke pushed a commit to branch wip-hurd-vm
in repository guix.
The following commit(s) were added to refs/heads/wip-hurd-vm by this push:
new 78a568c squash! system: hurd: Add hurd-grub-configuration-file.
78a568c is described below
commit 78a568c9b669a1e95ab09357e042690621322a3d
Author: Jan (janneke) Nieuwenhuizen <address@hidden>
AuthorDate: Mon May 4 17:34:44 2020 +0200
squash! system: hurd: Add hurd-grub-configuration-file.
---
gnu/system/hurd.scm | 21 ++++++++-------------
1 file changed, 8 insertions(+), 13 deletions(-)
diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm
index c5ead76..beeee7a 100644
--- a/gnu/system/hurd.scm
+++ b/gnu/system/hurd.scm
@@ -73,17 +73,12 @@
(define* (hurd-grub-configuration-file config entries
#:key
- (system (%current-target-system))
+ (system (%current-system))
(old-entries '()))
- (let ((hurd (if (equal? system (%current-system))
- hurd
- (with-parameters ((%current-target-system system))
- hurd)))
- (mach (with-parameters ((%current-system "i686-linux"))
- gnumach))
- (libc (if (equal? system (%current-system))
- glibc
- (cross-libc system))))
+ ;; XXX Get from a hurd'ified config+entries
+ (let ((mach gnumach)
+ (hurd hurd)
+ (libc glibc))
(computed-file "grub.cfg"
#~(call-with-output-file #$output
(lambda (port)
@@ -101,8 +96,8 @@ menuentry \"GNU\" {
'$(task-create)' '$(task-resume)'
module ~a/lib/ld.so.1 exec ~a/hurd/exec '$(exec-task=task-create)'
}\n"
- #+mach #+mach #+hurd
- #+libc #+hurd))))))
+ #$mach #$mach #$hurd
+ #$libc #$hurd))))))
(define hurd-grub-minimal-bootloader
(bootloader
@@ -161,7 +156,7 @@ menuentry \"GNU\" {
(packages->manifest %base-packages/hurd)))
(define grub.cfg
- (hurd-grub-configuration-file #f '() #:system "i586-pc-gnu"))
+ (cross-built (hurd-grub-configuration-file #f '())))
(define fstab
(plain-file "fstab"
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch wip-hurd-vm updated: squash! system: hurd: Add hurd-grub-configuration-file.,
guix-commits <=