nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

hydra: Only build the "flash image" on arm. 

* build-aux/hydra/gnu-system.scm (qemu-jobs): Only build the "flash image"
on arm.
This commit is contained in:
Danny Milosavljevic 2018-01-29 15:56:51 +01:00
parent ebd6a6445f
commit 44b0303762
No known key found for this signature in database
GPG Key ID: E71A35542C30BAA5
1 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
build-aux/hydra/gnu-system.scm
View File

@ -163,29 +163,33 @@ system.")
(define MiB (define MiB
(expt 2 20)) (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) (if (member system %guixsd-supported-systems)
(list (->job 'usb-image (if (member system %u-boot-systems)
(run-with-store store (list (->job 'flash-image
(mbegin %store-monad (run-with-store store
(set-guile-for-build (default-guile)) (mbegin %store-monad
(system-disk-image (adjust-bootloader installation-os) (set-guile-for-build (default-guile))
#:disk-image-size (system-disk-image
(* 1024 MiB))))) (operating-system (inherit os)
(->job 'iso9660-image (bootloader (bootloader-configuration
(run-with-store store (bootloader u-boot-bootloader)
(mbegin %store-monad (target #f))))
(set-guile-for-build (default-guile)) #:disk-image-size
(system-disk-image installation-os (* 1024 MiB))))))
#:file-system-type (list (->job 'usb-image
"iso9660"))))) (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) (define (system-test-jobs store system)