me
/
guix
Archived
1
0
Fork 0
Code

system: Do not use "hurd-target?". 

Fix the following issue, that happens during CI evaluation:

In guix/gexp.scm:
    782:4 19 (_ _)
In guix/store.scm:
  1907:12 18 (_ #<store-connection 256.99 7f3727b6de10>)
   1340:2 17 (map/accumulate-builds #<store-connection 256.99 7f372…> …)
In srfi/srfi-1.scm:
   586:29 16 (map1 ((#<file-append #<package hurd@0.9-1.91a516…> …) …))
   586:29 15 (map1 ((#<file-append #<<parameterized> bindings:…> …) …))
   586:29 14 (map1 ((#<file-append #<package hurd@0.9-1.91a516…> …) …))
   586:17 13 (map1 ((#<<operating-system> kernel: #<<parameter…> …) …))
In guix/store.scm:
   1299:8 12 (call-with-build-handler #<procedure build-accumulator…> …)
  2025:24 11 (run-with-store #<store-connection 256.99 7f3727b6de10> …)
In guix/gexp.scm:
   785:13 10 (_ _)
In guix/store.scm:
   1859:8  9 (_ _)
In guix/gexp.scm:
   243:18  8 (_ _)
In guix/store.scm:
  1894:38  7 (_ #<store-connection 256.99 7f3727b6de10>)
In gnu/system.scm:
  1012:19  6 (_ #<store-connection 256.99 7f3727b6de10>)
   634:11  5 (operating-system-services #<<operating-system> kernel:…>)
   611:17  4 (hurd-default-essential-services #<<operating-system> k…>)
   555:18  3 (operating-system-directory-base-entries #<<operating-s…>)
  1270:18  2 (operating-system-boot-parameters-file #<<operating-sy…> …)
  1225:35  1 (operating-system-boot-parameters #<<operating-system>…> …)
  1225:35  0 (operating-system-boot-parameters (#<<file-system> de…>) …)

gnu/system.scm:1225:35: In procedure operating-system-boot-parameters:
Wrong type to apply: #f

"hurd-target?" is returning false when it should return true in that context.

* gnu/system.scm (operating-system-boot-parameters): Check for "hurd" target
field of "os" instead of using the "hurd-target?" procedure.
Mathieu Othacehe 2020-07-05 09:40:34 +02:00
parent 5733ba7dd8
commit 395782f235
No known key found for this signature in database
GPG Key ID: 8354763531769CA6
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gnu/system.scm
View File

@ -1221,7 +1221,7 @@ a list of <menu-entry>, to populate the \"old entries\" menu."
"Return a monadic <boot-parameters> record that describes the boot
parameters of OS. When SYSTEM-KERNEL-ARGUMENTS? is true, add kernel arguments
such as '--root' and '--load' to <boot-parameters>."
(let* ((initrd (and (not (hurd-target?))
(let* ((initrd (and (not (operating-system-hurd os))
(operating-system-initrd-file os)))
(store (operating-system-store-file-system os))
(bootloader (bootloader-configuration-bootloader