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

hydra: Add arm image builder. 

* build-aux/hydra/gnu-system.scm (%u-boot-systems): New
variable.
(%guixsd-supported-systems): Add armhf-linux.
(qemu-jobs): Use u-boot if system in %u-boot-systems.
This commit is contained in:
Danny Milosavljevic 2018-01-23 00:50:12 +01:00
parent d2a7170def
commit de2bc8d6da
No known key found for this signature in database
GPG Key ID: E71A35542C30BAA5
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,6 +51,7 @@
((guix scripts system) #:select (read-operating-system)) ((guix scripts system) #:select (read-operating-system))
((guix scripts pack) ((guix scripts pack)
#:select (lookup-compressor self-contained-tarball)) #:select (lookup-compressor self-contained-tarball))
(gnu bootloader u-boot)
(gnu packages) (gnu packages)
(gnu packages gcc) (gnu packages gcc)
(gnu packages base) (gnu packages base)
@ -135,7 +136,10 @@ SYSTEM."
"i686-w64-mingw32")) "i686-w64-mingw32"))
(define %guixsd-supported-systems (define %guixsd-supported-systems
'("x86_64-linux" "i686-linux")) '("x86_64-linux" "i686-linux" "armhf-linux"))
(define %u-boot-systems
'("armhf-linux"))
(define (qemu-jobs store system) (define (qemu-jobs store system)
"Return a list of jobs that build QEMU images for SYSTEM." "Return a list of jobs that build QEMU images for SYSTEM."
@ -158,12 +162,20 @@ 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 (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 (list (->job 'usb-image
(run-with-store store (run-with-store store
(mbegin %store-monad (mbegin %store-monad
(set-guile-for-build (default-guile)) (set-guile-for-build (default-guile))
(system-disk-image installation-os (system-disk-image (adjust-bootloader installation-os)
#:disk-image-size #:disk-image-size
(* 1024 MiB))))) (* 1024 MiB)))))
(->job 'iso9660-image (->job 'iso9660-image