[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/24: system: vm: Do not register-closures when cross-building.
From: |
guix-commits |
Subject: |
02/24: system: vm: Do not register-closures when cross-building. |
Date: |
Sun, 17 May 2020 06:00:48 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd-vm
in repository guix.
commit 6baf9fbcbef2c1242bedc74eae8d402852c54d63
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 3e483fd..97b0bf4 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -286,7 +286,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))
@@ -333,12 +334,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"
- branch wip-hurd-vm created (now e4e1876), guix-commits, 2020/05/17
- 01/24: utils: Move 'reset-timestamps' out of database., guix-commits, 2020/05/17
- 02/24: system: vm: Do not register-closures when cross-building.,
guix-commits <=
- 03/24: system: vm: Build vm-image using native qemu., guix-commits, 2020/05/17
- 05/24: system: hurd: Add hurd-default-essential-services., guix-commits, 2020/05/17
- 11/24: system: Use 'hurd' package in label., guix-commits, 2020/05/17
- 08/24: system: Add 'hurd' field to <boot-parameters>., guix-commits, 2020/05/17
- 16/24: gnu: hurd: Create minimal "runsystem" script to invoke "rc"., guix-commits, 2020/05/17
- 07/24: bootloader: Add `<hurd-menu-entry>'., guix-commits, 2020/05/17
- 09/24: bootloader: grub: Add support for '<hurd-menu-entry>'., guix-commits, 2020/05/17
- 13/24: services: hurd: Add `hurd-etc-service'., guix-commits, 2020/05/17
- 12/24: system: examples: Add bare-hurd.tmpl., guix-commits, 2020/05/17
- 14/24: system: Add `hurd-activation'., guix-commits, 2020/05/17