[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/07: vm: Use 'let-system'.
From: |
guix-commits |
Subject: |
05/07: vm: Use 'let-system'. |
Date: |
Fri, 15 May 2020 18:34:53 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 502f609d0527d07e3289ba38a087d8fc856382fe
Author: Ludovic Courtès <address@hidden>
AuthorDate: Fri May 15 22:23:21 2020 +0200
vm: Use 'let-system'.
* gnu/system/vm.scm (expression->derivation-in-linux-vm)[check]: New macro.
[builder]: Use 'let-system' and 'check' instead of referencing
'%current-system' and '%current-target-system'.
---
gnu/system/vm.scm | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index 163e8b4..3e483fd 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -199,6 +199,10 @@ substitutable."
(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
@@ -229,7 +233,8 @@ substitutable."
(graphs '#$(match references-graphs
(((graph-files . _) ...) graph-files)
(_ #f)))
- (target #$(or (%current-target-system)
(%current-system)))
+ (target #$(let-system (system target)
+ (or target system)))
(size #$(if (eq? 'guess disk-image-size)
#~(+ (* 70 (expt 2 20)) ;ESP
(estimated-partition-size graphs))
@@ -244,12 +249,8 @@ substitutable."
#:memory-size #$memory-size
#:make-disk-image? #$make-disk-image?
#:single-file-output? #$single-file-output?
- ;; FIXME: ‘target-arm32?’ and
- ;; ‘target-aarch64?’ may not operate on the
- ;; right system/target values. Rewrite
- ;; using ‘let-system’ when available.
- #:target-arm32? #$(target-arm32?)
- #:target-aarch64? #$(target-aarch64?)
+ #:target-arm32? #$(check target-arm32?)
+ #:target-aarch64? #$(check target-aarch64?)
#:disk-image-format #$disk-image-format
#:disk-image-size size
#:references-graphs graphs))))))
- branch master updated (a7b2022 -> 408ae72), guix-commits, 2020/05/15
- 01/07: bootloader: grub: Refer to the native 'grub-mklayout' and font file., guix-commits, 2020/05/15
- 03/07: gexp: Add 'let-system'., guix-commits, 2020/05/15
- 04/07: utils: 'target-arm32?' & co. take an optional parameter., guix-commits, 2020/05/15
- 07/07: services: shepherd: Silence Guile warnings., guix-commits, 2020/05/15
- 06/07: linux-initrd: Silence Guile warnings., guix-commits, 2020/05/15
- 05/07: vm: Use 'let-system'.,
guix-commits <=
- 02/07: gexp: Compilers can now return lowerable objects., guix-commits, 2020/05/15