[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/35: vm: 'expression->derivation-in-linux-vm' always returns a native
|
From: |
guix-commits |
|
Subject: |
02/35: vm: 'expression->derivation-in-linux-vm' always returns a native build. |
|
Date: |
Thu, 28 May 2020 13:03:28 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd-vm
in repository guix.
commit 02671bdfdc0ccd1663a3a71fbadfa76088c8851a
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Wed May 27 23:04:48 2020 +0200
vm: 'expression->derivation-in-linux-vm' always returns a native build.
* gnu/system/vm.scm (expression->derivation-in-linux-vm): Remove #:target.
[builder]: Use #+. Don't pass #:target-arm32? and #:target-aarch64? to
'load-in-linux-vm'.
Pass #:target #f to 'gexp->derivation'.
(qemu-image): Adjust accordingly.
* gnu/build/vm.scm (load-in-linux-vm): Remove #:target-aarch64?
and #:target-arm32?. Define them as local variables.
---
gnu/build/vm.scm | 11 ++++++++---
gnu/system/vm.scm | 16 +++++++---------
2 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm
index 433b5a7..0f0ceae 100644
--- a/gnu/build/vm.scm
+++ b/gnu/build/vm.scm
@@ -84,8 +84,6 @@
linux initrd
make-disk-image?
single-file-output?
- target-arm32?
- target-aarch64?
(disk-image-size (* 100 (expt 2 20)))
(disk-image-format "qcow2")
(references-graphs '()))
@@ -101,7 +99,14 @@ access it via /dev/hda.
REFERENCES-GRAPHS can specify a list of reference-graph files as produced by
the #:references-graphs parameter of 'derivation'."
- (define target-arm? (or target-arm32? target-aarch64?))
+ (define target-arm32?
+ (string-prefix? "arm-" %host-type))
+
+ (define target-aarch64?
+ (string-prefix? "aarch64-" %host-type))
+
+ (define target-arm?
+ (or target-arm32? target-aarch64?))
(define arch-specific-flags
`(;; On ARM, a machine has to be specified. Use "virt" machine to avoid
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index 3e483fd..d737a5e 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -141,7 +141,7 @@
(define* (expression->derivation-in-linux-vm name exp
#:key
- (system (%current-system)) target
+ (system (%current-system))
(linux linux-libre)
initrd
(qemu qemu-minimal)
@@ -226,10 +226,11 @@ 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 system)))
+ (initrd #+initrd)
+ (loader #+loader)
(graphs '#$(match references-graphs
(((graph-files . _) ...) graph-files)
(_ #f)))
@@ -249,8 +250,6 @@ substitutable."
#:memory-size #$memory-size
#:make-disk-image? #$make-disk-image?
#:single-file-output? #$single-file-output?
- #:target-arm32? #$(check target-arm32?)
- #:target-aarch64? #$(check target-aarch64?)
#:disk-image-format #$disk-image-format
#:disk-image-size size
#:references-graphs graphs))))))
@@ -258,7 +257,7 @@ substitutable."
(gexp->derivation name builder
;; TODO: Require the "kvm" feature.
#:system system
- #:target target
+ #:target #f ;EXP is always executed natively
#:env-vars env-vars
#:guile-for-build guile-for-build
#:references-graphs references-graphs
@@ -430,7 +429,6 @@ system that is passed to 'populate-root-file-system'."
#:bootloader-installer
#$(bootloader-installer bootloader)))))))
#:system system
- #:target target
#:make-disk-image? #t
#:disk-image-size disk-image-size
#:disk-image-format disk-image-format
- branch wip-hurd-vm created (now dbdce6e), guix-commits, 2020/05/28
- 01/35: system: 'system-linux-image-file-name' takes an optional parameter., guix-commits, 2020/05/28
- 02/35: vm: 'expression->derivation-in-linux-vm' always returns a native build.,
guix-commits <=
- 07/35: gnu: guile-static: Disable JIT on ARMv7., guix-commits, 2020/05/28
- 05/35: vm: <virtual-machine> compiler honors system and target., guix-commits, 2020/05/28
- 06/35: vm: Shared-store script runs that native QEMU and Bash., guix-commits, 2020/05/28
- 13/35: system: image: Correct genimage configuration file indentation., guix-commits, 2020/05/28
- 14/35: image: Use grub-efi to install the EFI bootloader., guix-commits, 2020/05/28
- 17/35: image: Add Hurd support., guix-commits, 2020/05/28
- 15/35: system: image: Fix image-with-os., guix-commits, 2020/05/28
- 18/35: linux-boot: Update 'make-hurd-device-nodes'., guix-commits, 2020/05/28
- 03/35: vm: 'qemu-image' uses the native partitioning tools and bootloader., guix-commits, 2020/05/28
- 08/35: gnu: hurd: Update to upstream Hurd-reserved xattr index., guix-commits, 2020/05/28