02/02: squash! system: hurd: Add hurd-grub-configuration-file.

[guix-commits]

janneke pushed a commit to branch wip-hurd-vm
in repository guix.

commit 8c13631dc245db9c8fd191d76a0c087bc4471e2d
Author: Jan (janneke) Nieuwenhuizen <address@hidden>
AuthorDate: Mon May 4 23:34:38 2020 +0200

    squash! system: hurd: Add hurd-grub-configuration-file.
    
    NOTE: this breaks
    
        ./pre-inst-env guix build -f gnu/system/hurd.scm --keep-failed 
--verbosity=1
    
    that we are moving away from anyway.
    
    XXX TODO: remove this "hack"y part of gnu/system/hurd.scm
---
 gnu/system/hurd.scm | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm
index c5ead76..1cc0af1 100644
--- a/gnu/system/hurd.scm
+++ b/gnu/system/hurd.scm
@@ -75,15 +75,10 @@
                                        #:key
                                        (system (%current-target-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 (with-parameters ((%current-system "i686-linux"))
+                -                gnumach))
+        (libc (if system (cross-libc system) 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