[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: hydra: Only build the "flash image" on arm.
From: |
Danny Milosavljevic |
Subject: |
01/01: hydra: Only build the "flash image" on arm. |
Date: |
Mon, 29 Jan 2018 09:57:41 -0500 (EST) |
dannym pushed a commit to branch master
in repository guix.
commit 44b0303762f58badd9b9f8f1145e54b76b9d19d2
Author: Danny Milosavljevic <address@hidden>
Date: Mon Jan 29 15:56:51 2018 +0100
hydra: Only build the "flash image" on arm.
* build-aux/hydra/gnu-system.scm (qemu-jobs): Only build the "flash image"
on arm.
---
build-aux/hydra/gnu-system.scm | 48 +++++++++++++++++++++++-------------------
1 file changed, 26 insertions(+), 22 deletions(-)
diff --git a/build-aux/hydra/gnu-system.scm b/build-aux/hydra/gnu-system.scm
index 0886d5f..ab240cb 100644
--- a/build-aux/hydra/gnu-system.scm
+++ b/build-aux/hydra/gnu-system.scm
@@ -163,29 +163,33 @@ system.")
(define MiB
(expt 2 20))
- (define (adjust-bootloader os)
- (if (member system %u-boot-systems)
- (operating-system (inherit os)
- (bootloader ((@ (gnu bootloader) bootloader-configuration)
- (bootloader u-boot-bootloader)
- (target "/dev/null"))))
- os))
-
(if (member system %guixsd-supported-systems)
- (list (->job 'usb-image
- (run-with-store store
- (mbegin %store-monad
- (set-guile-for-build (default-guile))
- (system-disk-image (adjust-bootloader installation-os)
- #:disk-image-size
- (* 1024 MiB)))))
- (->job 'iso9660-image
- (run-with-store store
- (mbegin %store-monad
- (set-guile-for-build (default-guile))
- (system-disk-image installation-os
- #:file-system-type
- "iso9660")))))
+ (if (member system %u-boot-systems)
+ (list (->job 'flash-image
+ (run-with-store store
+ (mbegin %store-monad
+ (set-guile-for-build (default-guile))
+ (system-disk-image
+ (operating-system (inherit os)
+ (bootloader (bootloader-configuration
+ (bootloader u-boot-bootloader)
+ (target #f))))
+ #:disk-image-size
+ (* 1024 MiB))))))
+ (list (->job 'usb-image
+ (run-with-store store
+ (mbegin %store-monad
+ (set-guile-for-build (default-guile))
+ (system-disk-image installation-os
+ #:disk-image-size
+ (* 1024 MiB)))))
+ (->job 'iso9660-image
+ (run-with-store store
+ (mbegin %store-monad
+ (set-guile-for-build (default-guile))
+ (system-disk-image installation-os
+ #:file-system-type
+ "iso9660"))))))
'()))
(define (system-test-jobs store system)