From patchwork Sat May 23 09:30:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 22308 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 685FE27BBE3; Sat, 23 May 2020 10:31:19 +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, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,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 F06CB27BBE1 for ; Sat, 23 May 2020 10:31:18 +0100 (BST) Received: from localhost ([::1]:47492 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jcQUw-0002KC-Hp for patchwork@mira.cbaines.net; Sat, 23 May 2020 05:31:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40622) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jcQUh-00027x-Ay for guix-patches@gnu.org; Sat, 23 May 2020 05:31:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50130) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jcQUh-0000on-1c for guix-patches@gnu.org; Sat, 23 May 2020 05:31:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jcQUg-0004jy-VU for guix-patches@gnu.org; Sat, 23 May 2020 05:31:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41350] [PATCH v3 3/3] system: vm: Build vm-image using native qemu, for the Hurd. Resent-From: "Jan (janneke) Nieuwenhuizen" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 23 May 2020 09:31: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.159022623318159 (code B ref 41350); Sat, 23 May 2020 09:31:02 +0000 Received: (at 41350) by debbugs.gnu.org; 23 May 2020 09:30:33 +0000 Received: from localhost ([127.0.0.1]:33441 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jcQUD-0004in-AA for submit@debbugs.gnu.org; Sat, 23 May 2020 05:30:33 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33188) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jcQUA-0004iA-El for 41350@debbugs.gnu.org; Sat, 23 May 2020 05:30:30 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:41079) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jcQU5-0000fM-6x; Sat, 23 May 2020 05:30:25 -0400 Received: from [2001:980:1b4f:1:42d2:832d:bb59:862] (port=51074 helo=dundal.fritz.box) by fencepost.gnu.org with esmtpa (Exim 4.82) (envelope-from ) id 1jcQU3-0000Rw-Pk; Sat, 23 May 2020 05:30:24 -0400 From: "Jan (janneke) Nieuwenhuizen" Date: Sat, 23 May 2020 11:30:17 +0200 Message-Id: <20200523093017.12149-3-janneke@gnu.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200523093017.12149-1-janneke@gnu.org> References: <20200523093017.12149-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 is usually done using a cross-qemu, e.g, qemu-ARM, because, e.g., a native, x86_64 Grub cannot install an armhf-Grub. That solution does not work for the Hurd, as there is no qemu-HURD. This patch enables cross building vm-images for the Hurd 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, for the Hurd. [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 | 81 +++++++++++++++++++++++++++++------------ 2 files changed, 60 insertions(+), 25 deletions(-) diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm index bb40c551a7..ccf70b3785 100644 --- a/gnu/bootloader/grub.scm +++ b/gnu/bootloader/grub.scm @@ -207,8 +207,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) #$image diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index b343141c18..245ecc73b3 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. ;;; @@ -181,29 +182,46 @@ 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-syntax-rule (check predicate) + (let-system (system target) + (predicate (or target system)))) (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* ((guile #$(if (check hurd-triplet?) + #~#+(file-append (default-guile) + "/bin/guile") + (file-append (default-guile) + "/bin/guile"))) + (status (system* guile "--no-auto-compile" + #$(if (check hurd-triplet?) + (preserve-target user-builder) + 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))) (sync) (reboot)))) - (define-syntax-rule (check predicate) - (let-system (system target) - (predicate (or target system)))) - (let ((initrd (or initrd (base-initrd file-systems #:on-error 'backtrace @@ -227,10 +245,16 @@ substitutable." (let* ((native-inputs '#+(list qemu (canonical-package coreutils))) - (linux (string-append #$linux "/" - #$(system-linux-image-file-name))) - (initrd #$initrd) - (loader #$loader) + + (loader #$(if (check hurd-triplet?) #~#+loader loader)) + (linux #$(if (check hurd-triplet?) + #~(string-append + #+linux "/" + #+(system-linux-image-file-name)) + #~(string-append + #$linux "/" + #$(system-linux-image-file-name)))) + (initrd #$(if (check hurd-triplet?) #~#+initrd initrd)) (graphs '#$(match references-graphs (((graph-files . _) ...) graph-files) (_ #f))) @@ -246,7 +270,10 @@ substitutable." (load-in-linux-vm loader #:output #$output #:linux linux #:initrd initrd - #:qemu (qemu-command target) + #:qemu #$(if (or (not target) + (check hurd-triplet?)) + (qemu-command) + (qemu-command target)) #:memory-size #$memory-size #:make-disk-image? #$make-disk-image? #:single-file-output? #$single-file-output? @@ -349,9 +376,13 @@ system that is passed to 'populate-root-file-system'." (setlocale LC_ALL "en_US.utf8") (let ((inputs - '#$(append (list parted e2fsprogs dosfstools) - (map canonical-package - (list sed grep coreutils findutils gawk)))) + '#$(if (hurd-target?) + #~#+(append (list parted e2fsprogs dosfstools) + (map canonical-package + (list sed grep coreutils findutils gawk))) + (append (list parted e2fsprogs dosfstools) + (map canonical-package + (list sed grep coreutils findutils gawk))))) ;; This variable is unused but allows us to add INPUTS-TO-COPY ;; as inputs. @@ -426,12 +457,16 @@ system that is passed to 'populate-root-file-system'." #:partitions partitions #:grub-efi grub-efi #:bootloader-package - #$(bootloader-package bootloader) + #$(if (hurd-target?) + #~#+(bootloader-package bootloader) + (bootloader-package bootloader)) #:bootcfg #$bootcfg-drv #:bootcfg-location #$(bootloader-configuration-file bootloader) #:bootloader-installer - #$(bootloader-installer bootloader))))))) + #$(if (hurd-target?) + #~#+(bootloader-installer bootloader) + (bootloader-installer bootloader)))))))) #:system system #:target target #:make-disk-image? #t