summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan (janneke) Nieuwenhuizen <janneke@gnu.org>2020-05-19 09:23:01 +0200
committerGuix Patches Tester <>2020-05-24 21:34:16 +0100
commit5025d08fa7aac2e9d9522f28bd89ee50ee78c6ab (patch)
treefe7747d1e48b38a39a884b8999e5a1f451237276
parent047a76eb0892f2f7f7c96bb7aae9e72bea47c5af (diff)
downloadpatches-series-4026.tar
patches-series-4026.tar.gz
system: vm: Do not register-closures when cross-building to the Hurd.series-4026
This supports cross-building building a vm-image for the Hurd, running a native qemu. * gnu/system/vm.scm (qemu-image)[register-closures?]: Default to #f when cross-compiling to the Hurd. Only create sql-schema when actually registering closures.
-rw-r--r--gnu/build/vm.scm2
-rw-r--r--gnu/system/vm.scm9
2 files changed, 7 insertions, 4 deletions
diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm
index c751e6b0e2..2b36dd29ce 100644
--- a/gnu/build/vm.scm
+++ b/gnu/build/vm.scm
@@ -27,7 +27,7 @@
#:use-module (guix build store-copy)
#:use-module (guix build syscalls)
#:use-module ((guix utils) #:select (reset-timestamps))
- #:use-module (guix store database)
+ #:autoload (guix store database) (%epoch register-items sql-schema)
#:use-module (gnu build bootloader)
#:use-module (gnu build linux-boot)
#:use-module (gnu build install)
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index 3e483fd86c..b343141c18 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -51,6 +51,7 @@
#:use-module (gnu packages zile)
#:use-module (gnu packages linux)
#:use-module (gnu packages admin)
+ #:use-module (gnu packages hurd)
#:use-module (gnu bootloader)
#:use-module (gnu bootloader grub)
@@ -286,7 +287,8 @@ substitutable."
os
bootcfg-drv
bootloader
- (register-closures? (has-guix-service-type? os))
+ (register-closures? (and (has-guix-service-type? os)
+ (not (hurd-target?))))
(inputs '())
copy-inputs?
(substitutable? #t))
@@ -333,12 +335,13 @@ system that is passed to 'populate-root-file-system'."
((gnu build linux-boot)
#:select (make-essential-device-nodes
make-hurd-device-nodes))
- (guix store database)
(guix build utils)
(srfi srfi-26)
(ice-9 binary-ports))
- (sql-schema #$schema)
+ (when #$register-closures?
+ (use-modules (guix store database))
+ (sql-schema #$schema))
;; Allow non-ASCII file names--e.g., 'nss-certs'--to be decoded.
(setenv "GUIX_LOCPATH"