[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
16/18: system: vm: Do not register-closures when cross-building.
From: |
guix-commits |
Subject: |
16/18: system: vm: Do not register-closures when cross-building. |
Date: |
Sat, 16 May 2020 08:00:55 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd-vm
in repository guix.
commit f28f29e0da431e6c40e94c31bd9c83eb019112f3
Author: Jan (janneke) Nieuwenhuizen <address@hidden>
AuthorDate: Sat May 16 11:54:29 2020 +0200
system: vm: Do not register-closures when cross-building.
This supports cross-building building a vm-image, running a native qemu.
* gnu/system/vm.scm (qemu-image)[register-closures?]: Default to #f when
cross-compiling. Only create sql-schema when actually registering closures.
---
gnu/build/vm.scm | 2 +-
gnu/system/vm.scm | 8 +++++---
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm
index c751e6b..2b36dd2 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 c386283..e7e2e6b 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -288,7 +288,8 @@ substitutable."
os
bootcfg-drv
bootloader
- (register-closures? (has-guix-service-type? os))
+ (register-closures? (and (has-guix-service-type? os)
+ (not target)))
(inputs '())
copy-inputs?
(substitutable? #t))
@@ -335,12 +336,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"
- 03/18: system: vm: Add defaults for the Hurd., (continued)
- 03/18: system: vm: Add defaults for the Hurd., guix-commits, 2020/05/16
- 06/18: bootloader: Add `<hurd-menu-entry>'., guix-commits, 2020/05/16
- 07/18: system: Add 'hurd' field to <boot-parameters>., guix-commits, 2020/05/16
- 08/18: bootloader: grub: Add support for '<hurd-menu-entry>'., guix-commits, 2020/05/16
- 09/18: system: vm: Initial vm-image support for the Hurd., guix-commits, 2020/05/16
- 10/18: system: Use 'hurd' package in label., guix-commits, 2020/05/16
- 12/18: services: hurd: Add `hurd-etc-service'., guix-commits, 2020/05/16
- 05/18: system: Add 'hurd' field to <operating-system>., guix-commits, 2020/05/16
- 11/18: system: examples: Add bare-hurd.tmpl., guix-commits, 2020/05/16
- 15/18: utils: Move 'reset-timestamps' out of database., guix-commits, 2020/05/16
- 16/18: system: vm: Do not register-closures when cross-building.,
guix-commits <=
- 13/18: system: Add `hurd-activation'., guix-commits, 2020/05/16
- 14/18: services: hurd: Use activation-service, hurd-etc-service., guix-commits, 2020/05/16
- 17/18: system: vm: Fix for cross-build to the Hurd., guix-commits, 2020/05/16
- 18/18: DRAFT system: vm: More cross-build fixes via IRC, guix-commits, 2020/05/16