From: "Jan (janneke) Nieuwenhuizen" <janneke@gnu.org>
To: 41350@debbugs.gnu.org, Mathieu Othacehe <othacehe@gnu.org>
Subject: [bug#41350] [PATCH v2 2/3] system: vm: Do not register-closures when cross-building to the Hurd.
Date: Tue, 19 May 2020 09:23:01 +0200 [thread overview]
Message-ID: <20200519072302.9202-2-janneke@gnu.org> (raw)
In-Reply-To: <20200519072302.9202-1-janneke@gnu.org>
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.
---
gnu/build/vm.scm | 2 +-
gnu/system/vm.scm | 9 ++++++---
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"
--
2.26.2
next prev parent reply other threads:[~2020-05-19 7:24 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-17 10:01 [bug#41350] [PATCH 0/3] Use native qemu to build vm-image Jan Nieuwenhuizen
2020-05-17 10:03 ` [bug#41350] [PATCH 1/3] utils: Move 'reset-timestamps' out of database Jan (janneke) Nieuwenhuizen
2020-05-17 10:03 ` [bug#41350] [PATCH 2/3] system: vm: Do not register-closures when cross-building Jan (janneke) Nieuwenhuizen
2020-05-17 10:03 ` [bug#41350] [PATCH 3/3] system: vm: Build vm-image using native qemu Jan (janneke) Nieuwenhuizen
2020-05-18 9:10 ` [bug#41350] [PATCH 0/3] Use native qemu to build vm-image Mathieu Othacehe
2020-05-19 7:22 ` Jan Nieuwenhuizen
2020-05-19 10:02 ` Mathieu Othacehe
2020-05-20 14:03 ` Mathieu Othacehe
2020-05-20 15:09 ` Jan Nieuwenhuizen
2020-05-19 7:23 ` [bug#41350] [PATCH v2 1/3] utils: Move 'reset-timestamps' out of database Jan (janneke) Nieuwenhuizen
2020-05-19 7:23 ` Jan (janneke) Nieuwenhuizen [this message]
2020-05-19 7:23 ` [bug#41350] [PATCH v2 3/3] system: vm: Build vm-image using native qemu, for the Hurd Jan (janneke) Nieuwenhuizen
2020-05-19 9:14 ` Mathieu Othacehe
2020-05-20 21:49 ` Ludovic Courtès
2020-05-23 9:28 ` Jan Nieuwenhuizen
2020-05-23 17:45 ` Mathieu Othacehe
2020-05-23 19:07 ` Jan Nieuwenhuizen
2020-05-24 9:18 ` Mathieu Othacehe
2020-05-27 9:30 ` Ludovic Courtès
2020-05-28 7:00 ` Mathieu Othacehe
2020-05-24 11:19 ` Jan Nieuwenhuizen
2020-05-24 12:07 ` Mathieu Othacehe
2020-05-24 14:20 ` Jan Nieuwenhuizen
2020-05-24 16:36 ` Ludovic Courtès
2020-05-20 21:58 ` Ludovic Courtès
2020-05-22 19:24 ` Mathieu Othacehe
2020-05-27 22:54 ` Ludovic Courtès
2020-05-28 6:36 ` Mathieu Othacehe
2020-05-28 12:29 ` Jan Nieuwenhuizen
2020-05-28 15:39 ` Ludovic Courtès
2020-05-28 17:07 ` Jan Nieuwenhuizen
2020-05-28 17:10 ` Mathieu Othacehe
2020-05-28 18:19 ` Jan Nieuwenhuizen
2020-05-29 8:18 ` Ludovic Courtès
2020-05-29 9:06 ` Jan Nieuwenhuizen
2020-05-30 10:08 ` Jan Nieuwenhuizen
2020-05-30 13:54 ` Ludovic Courtès
2022-09-28 20:18 ` [bug#41350] [PATCH 0/3] Use native qemu to build vm-image Maxim Cournoyer
2022-09-29 14:17 ` bug#41350: " Mathieu Othacehe
2020-05-23 9:30 ` [bug#41350] [PATCH v3 1/3] utils: Move 'reset-timestamps' out of database Jan (janneke) Nieuwenhuizen
2020-05-23 9:30 ` [bug#41350] [PATCH v3 2/3] system: vm: Do not register-closures when cross-building to the Hurd Jan (janneke) Nieuwenhuizen
2020-05-27 8:45 ` Ludovic Courtès
2020-05-27 9:13 ` Jan Nieuwenhuizen
2020-05-23 9:30 ` [bug#41350] [PATCH v3 3/3] system: vm: Build vm-image using native qemu, for " Jan (janneke) Nieuwenhuizen
2020-05-27 8:43 ` [bug#41350] [PATCH v3 1/3] utils: Move 'reset-timestamps' out of database Ludovic Courtès
2020-05-27 8:59 ` Ludovic Courtès
2020-05-27 9:10 ` Jan Nieuwenhuizen
2020-05-24 18:11 ` [bug#41350] [PATCH v2 3/3] system: vm: Build vm-image using native qemu, for the Hurd Mathieu Othacehe
2020-05-24 18:40 ` Jan Nieuwenhuizen
2020-05-25 15:46 ` Jan Nieuwenhuizen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200519072302.9202-2-janneke@gnu.org \
--to=janneke@gnu.org \
--cc=41350@debbugs.gnu.org \
--cc=othacehe@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).