From patchwork Sun May 17 10:03:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 22119 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 1B71727BBE3; Sun, 17 May 2020 11:04:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 5D40A27BBE1 for ; Sun, 17 May 2020 11:04:09 +0100 (BST) Received: from localhost ([::1]:43412 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jaG9Q-0004OW-TJ for patchwork@mira.cbaines.net; Sun, 17 May 2020 06:04:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39884) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jaG9K-0004OJ-U4 for guix-patches@gnu.org; Sun, 17 May 2020 06:04:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59014) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jaG9K-0003vG-LO for guix-patches@gnu.org; Sun, 17 May 2020 06:04:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jaG9K-0000Oa-H3 for guix-patches@gnu.org; Sun, 17 May 2020 06:04:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41350] [PATCH 1/3] utils: Move 'reset-timestamps' out of database. References: <87mu66q3rt.fsf@gnu.org> In-Reply-To: <87mu66q3rt.fsf@gnu.org> Resent-From: "Jan (janneke) Nieuwenhuizen" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 May 2020 10:04:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41350 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41350@debbugs.gnu.org Received: via spool by 41350-submit@debbugs.gnu.org id=B41350.15897098321495 (code B ref 41350); Sun, 17 May 2020 10:04:02 +0000 Received: (at 41350) by debbugs.gnu.org; 17 May 2020 10:03:52 +0000 Received: from localhost ([127.0.0.1]:42324 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaG99-0000Ny-Dt for submit@debbugs.gnu.org; Sun, 17 May 2020 06:03:51 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60674) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaG98-0000Nj-D2 for 41350@debbugs.gnu.org; Sun, 17 May 2020 06:03:50 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:56769) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jaG93-0003uR-5u; Sun, 17 May 2020 06:03:45 -0400 Received: from [2001:980:1b4f:1:42d2:832d:bb59:862] (port=59140 helo=dundal.fritz.box) by fencepost.gnu.org with esmtpa (Exim 4.82) (envelope-from ) id 1jaG92-0002ct-Mc; Sun, 17 May 2020 06:03:44 -0400 From: "Jan (janneke) Nieuwenhuizen" Date: Sun, 17 May 2020 12:03:41 +0200 Message-Id: <20200517100343.26361-1-janneke@gnu.org> X-Mailer: git-send-email 2.26.0 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches This supports calling reset-timestamps without loading sqlite3. * guix/store/database.scm (reset-timestamps): Move to... * guix/utils.scm (reset-timestamps): ... here. * gnu/build/vm.scm: Include it. --- gnu/build/vm.scm | 1 + guix/store/database.scm | 41 +++-------------------------------------- guix/utils.scm | 41 ++++++++++++++++++++++++++++++++++++++--- 3 files changed, 42 insertions(+), 41 deletions(-) diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm index 433b5a7e8d..c751e6b0e2 100644 --- a/gnu/build/vm.scm +++ b/gnu/build/vm.scm @@ -26,6 +26,7 @@ #:use-module (guix build utils) #:use-module (guix build store-copy) #:use-module (guix build syscalls) + #:use-module ((guix utils) #:select (reset-timestamps)) #:use-module (guix store database) #:use-module (gnu build bootloader) #:use-module (gnu build linux-boot) diff --git a/guix/store/database.scm b/guix/store/database.scm index ef52036ede..b8fe313c3d 100644 --- a/guix/store/database.scm +++ b/guix/store/database.scm @@ -24,9 +24,8 @@ #:use-module (guix store deduplication) #:use-module (guix base16) #:use-module (guix progress) - #:use-module (guix build syscalls) - #:use-module ((guix build utils) - #:select (mkdir-p executable-file?)) + #:use-module ((guix build utils) #:select (mkdir-p)) + #:use-module ((guix utils) #:select (reset-timestamps)) #:use-module (guix build store-copy) #:use-module (srfi srfi-1) #:use-module (srfi srfi-11) @@ -42,8 +41,7 @@ sqlite-register register-path register-items - %epoch - reset-timestamps)) + %epoch)) ;;; Code for working with the store database directly. @@ -227,39 +225,6 @@ Every store item in REFERENCES must already be registered." ;;; ;;; High-level interface. ;;; - -(define* (reset-timestamps file #:key preserve-permissions?) - "Reset the modification time on FILE and on all the files it contains, if -it's a directory. Canonicalize file permissions unless PRESERVE-PERMISSIONS? -is true." - ;; Note: We're resetting to one second after the Epoch like 'guix-daemon' - ;; has always done. - (let loop ((file file) - (type (stat:type (lstat file)))) - (case type - ((directory) - (unless preserve-permissions? - (chmod file #o555)) - (utime file 1 1 0 0) - (let ((parent file)) - (for-each (match-lambda - (("." . _) #f) - ((".." . _) #f) - ((file . properties) - (let ((file (string-append parent "/" file))) - (loop file - (match (assoc-ref properties 'type) - ((or 'unknown #f) - (stat:type (lstat file))) - (type type)))))) - (scandir* parent)))) - ((symlink) - (utime file 1 1 0 0 AT_SYMLINK_NOFOLLOW)) - (else - (unless preserve-permissions? - (chmod file (if (executable-file? file) #o555 #o444))) - (utime file 1 1 0 0))))) - (define* (register-path path #:key (references '()) deriver prefix state-directory (deduplicate? #t) diff --git a/guix/utils.scm b/guix/utils.scm index d7b197fa44..812617dd61 100644 --- a/guix/utils.scm +++ b/guix/utils.scm @@ -35,8 +35,10 @@ #:use-module (rnrs io ports) ;need 'port-position' etc. #:use-module ((rnrs bytevectors) #:select (bytevector-u8-set!)) #:use-module (guix memoization) - #:use-module ((guix build utils) #:select (dump-port mkdir-p delete-file-recursively)) - #:use-module ((guix build syscalls) #:select (mkdtemp! fdatasync)) + #:use-module ((guix build utils) + #:select (dump-port mkdir-p delete-file-recursively + executable-file?)) + #:use-module ((guix build syscalls) #:select (mkdtemp! fdatasync scandir*)) #:use-module (ice-9 format) #:use-module (ice-9 regex) #:use-module (ice-9 match) @@ -109,7 +111,8 @@ call-with-decompressed-port compressed-output-port call-with-compressed-output-port - canonical-newline-port)) + canonical-newline-port + reset-timestamps)) ;;; @@ -843,6 +846,38 @@ a location object." fix-hint? (hint condition-fix-hint)) ;string +(define* (reset-timestamps file #:key preserve-permissions?) + "Reset the modification time on FILE and on all the files it contains, if +it's a directory. Canonicalize file permissions unless PRESERVE-PERMISSIONS? +is true." + ;; Note: We're resetting to one second after the Epoch like 'guix-daemon' + ;; has always done. + (let loop ((file file) + (type (stat:type (lstat file)))) + (case type + ((directory) + (unless preserve-permissions? + (chmod file #o555)) + (utime file 1 1 0 0) + (let ((parent file)) + (for-each (match-lambda + (("." . _) #f) + ((".." . _) #f) + ((file . properties) + (let ((file (string-append parent "/" file))) + (loop file + (match (assoc-ref properties 'type) + ((or 'unknown #f) + (stat:type (lstat file))) + (type type)))))) + (scandir* parent)))) + ((symlink) + (utime file 1 1 0 0 AT_SYMLINK_NOFOLLOW)) + (else + (unless preserve-permissions? + (chmod file (if (executable-file? file) #o555 #o444))) + (utime file 1 1 0 0))))) + ;;; Local Variables: ;;; eval: (put 'call-with-progress-reporter 'scheme-indent-function 1) ;;; End: From patchwork Sun May 17 10:03:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 22121 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 2463F27BBE1; Sun, 17 May 2020 11:05:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 4AFD027BBE3 for ; Sun, 17 May 2020 11:05:09 +0100 (BST) Received: from localhost ([::1]:43802 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jaGAO-0004dU-RO for patchwork@mira.cbaines.net; Sun, 17 May 2020 06:05:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39974) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jaGAJ-0004cY-9R for guix-patches@gnu.org; Sun, 17 May 2020 06:05:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59017) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jaGAI-00041G-Vm for guix-patches@gnu.org; Sun, 17 May 2020 06:05:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jaGAH-0000QD-R6 for guix-patches@gnu.org; Sun, 17 May 2020 06:05:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41350] [PATCH 2/3] system: vm: Do not register-closures when cross-building. Resent-From: "Jan (janneke) Nieuwenhuizen" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 May 2020 10:05:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41350 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41350@debbugs.gnu.org Received: via spool by 41350-submit@debbugs.gnu.org id=B41350.15897098481550 (code B ref 41350); Sun, 17 May 2020 10:05:01 +0000 Received: (at 41350) by debbugs.gnu.org; 17 May 2020 10:04:08 +0000 Received: from localhost ([127.0.0.1]:42327 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaG9B-0000OH-V4 for submit@debbugs.gnu.org; Sun, 17 May 2020 06:04:08 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60680) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaG99-0000Nl-9Y for 41350@debbugs.gnu.org; Sun, 17 May 2020 06:03:51 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:56770) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jaG94-0003uZ-2u; Sun, 17 May 2020 06:03:46 -0400 Received: from [2001:980:1b4f:1:42d2:832d:bb59:862] (port=59140 helo=dundal.fritz.box) by fencepost.gnu.org with esmtpa (Exim 4.82) (envelope-from ) id 1jaG93-0002ct-Gv; Sun, 17 May 2020 06:03:45 -0400 From: "Jan (janneke) Nieuwenhuizen" Date: Sun, 17 May 2020 12:03:42 +0200 Message-Id: <20200517100343.26361-2-janneke@gnu.org> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200517100343.26361-1-janneke@gnu.org> References: <20200517100343.26361-1-janneke@gnu.org> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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 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..97b0bf461b 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" From patchwork Sun May 17 10:03:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 22120 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id EC16027BBE4; Sun, 17 May 2020 11:05:09 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id C9E8627BBE1 for ; Sun, 17 May 2020 11:05:08 +0100 (BST) Received: from localhost ([::1]:43780 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jaGAO-0004cx-CZ for patchwork@mira.cbaines.net; Sun, 17 May 2020 06:05:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39972) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jaGAI-0004bj-Ko for guix-patches@gnu.org; Sun, 17 May 2020 06:05:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59018) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jaGAI-00041Q-Bf for guix-patches@gnu.org; Sun, 17 May 2020 06:05:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jaGAI-0000QK-7C for guix-patches@gnu.org; Sun, 17 May 2020 06:05:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41350] [PATCH 3/3] system: vm: Build vm-image using native qemu. Resent-From: "Jan (janneke) Nieuwenhuizen" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 May 2020 10:05:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41350 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41350@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 41350-submit@debbugs.gnu.org id=B41350.15897098491557 (code B ref 41350); Sun, 17 May 2020 10:05:02 +0000 Received: (at 41350) by debbugs.gnu.org; 17 May 2020 10:04:09 +0000 Received: from localhost ([127.0.0.1]:42330 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaG9Q-0000Ox-Pz for submit@debbugs.gnu.org; Sun, 17 May 2020 06:04:09 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60686) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaG9A-0000Nn-7z for 41350@debbugs.gnu.org; Sun, 17 May 2020 06:03:52 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:56771) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jaG95-0003ug-0W; Sun, 17 May 2020 06:03:47 -0400 Received: from [2001:980:1b4f:1:42d2:832d:bb59:862] (port=59140 helo=dundal.fritz.box) by fencepost.gnu.org with esmtpa (Exim 4.82) (envelope-from ) id 1jaG94-0002ct-HK; Sun, 17 May 2020 06:03:46 -0400 From: "Jan (janneke) Nieuwenhuizen" Date: Sun, 17 May 2020 12:03:43 +0200 Message-Id: <20200517100343.26361-3-janneke@gnu.org> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200517100343.26361-1-janneke@gnu.org> References: <20200517100343.26361-1-janneke@gnu.org> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Cross-building a vm-image used to be done using a cross-qemu, e.g, qemu-ARM. That does not work for the Hurd, as there is no qemu-HURD. This patch switches to cross building vm-images using a native qemu vm. * gnu/system/vm.scm (expression->derivation-in-linux-vm): Run native qemu-command; use native linux, initrd, bootloader-package and bootloader-installer. [preserve-target]: New helper to install cross-packages into the native vm. * gnu/bootloader/grub.scm (eye-candy): Use native font. Co-authored-by: Ludovic Courtès --- gnu/bootloader/grub.scm | 4 ++-- gnu/system/vm.scm | 46 ++++++++++++++++++++++++++--------------- 2 files changed, 31 insertions(+), 19 deletions(-) diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm index 8c5b5eac0c..842592ccc9 100644 --- a/gnu/bootloader/grub.scm +++ b/gnu/bootloader/grub.scm @@ -211,8 +211,8 @@ else set menu_color_highlight=white/blue fi~%" #$setup-gfxterm-body - #$(grub-root-search store-device font-file) - #$(setup-gfxterm config font-file) + #+(grub-root-search store-device font-file) + #+(setup-gfxterm config font-file) #$(grub-setup-io config) #$(strip-mount-point store-mount-point image) diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 97b0bf461b..aa094b0a06 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2017 Marius Bakke ;;; Copyright © 2018 Chris Marusich +;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -180,19 +181,30 @@ made available under the /xchg CIFS share. SUBSTITUTABLE? determines whether the returned derivation should be marked as substitutable." (define user-builder - (program-file "builder-in-linux-vm" exp)) + (scheme-file "builder-in-linux-vm" exp)) + + (define (preserve-target obj) + (if target + (with-parameters ((%current-target-system target)) + obj) + obj)) (define loader - ;; Invoke USER-BUILDER instead using 'primitive-load'. The reason for - ;; this is to allow USER-BUILDER to dlopen stuff by using a full-featured - ;; Guile, which it couldn't do using the statically-linked guile used in - ;; the initrd. See example at + ;; Instead of using 'primitive-load', evaluate USER-BUILDER in a + ;; full-featured Guile so it can use dlopen stuff, which it couldn't do + ;; using the statically-linked guile used in the initrd. See example at ;; . (program-file "linux-vm-loader" - ;; Communicate USER-BUILDER's exit status via /xchg so that - ;; the host can distinguish between success, failure, and - ;; kernel panic. - #~(let ((status (system* #$user-builder))) + ;; When cross-compiling, USER-BUILDER refers to the target + ;; (cross-compiled) system. Preserve that, even though + ;; LOADER itself is executed as a native program. + #~(let ((status (system* #+(file-append (default-guile) + "/bin/guile") + "--no-auto-compile" + #$(preserve-target user-builder)))) + ;; Communicate USER-BUILDER's exit status via /xchg so + ;; that the host can distinguish between success, + ;; failure, and kernel panic. (call-with-output-file "/xchg/.exit-status" (lambda (port) (write status port))) @@ -226,10 +238,10 @@ substitutable." (let* ((native-inputs '#+(list qemu (canonical-package coreutils))) - (linux (string-append #$linux "/" - #$(system-linux-image-file-name))) - (initrd #$initrd) - (loader #$loader) + (linux (string-append #+linux "/" + #+(system-linux-image-file-name))) + (initrd #+initrd) + (loader #+loader) (graphs '#$(match references-graphs (((graph-files . _) ...) graph-files) (_ #f))) @@ -245,7 +257,7 @@ substitutable." (load-in-linux-vm loader #:output #$output #:linux linux #:initrd initrd - #:qemu (qemu-command target) + #:qemu (qemu-command) #:memory-size #$memory-size #:make-disk-image? #$make-disk-image? #:single-file-output? #$single-file-output? @@ -348,7 +360,7 @@ system that is passed to 'populate-root-file-system'." (setlocale LC_ALL "en_US.utf8") (let ((inputs - '#$(append (list parted e2fsprogs dosfstools) + '#+(append (list parted e2fsprogs dosfstools) (map canonical-package (list sed grep coreutils findutils gawk)))) @@ -425,12 +437,12 @@ system that is passed to 'populate-root-file-system'." #:partitions partitions #:grub-efi grub-efi #:bootloader-package - #$(bootloader-package bootloader) + #+(bootloader-package bootloader) #:bootcfg #$bootcfg-drv #:bootcfg-location #$(bootloader-configuration-file bootloader) #:bootloader-installer - #$(bootloader-installer bootloader))))))) + #+(bootloader-installer bootloader))))))) #:system system #:target target #:make-disk-image? #t