diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-02-01 13:18:47 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-02-01 13:18:47 +0100 |
| commit | bee7bb315cd0b4529a4117b6220c29ca297fc023 (patch) | |
| tree | fe4741f257e50782e51bc2955ad4480cd2ba6396 /build-aux | |
| parent | c2f0e5a44b537632c2655f97a2539c3bf02c8a63 (diff) | |
| parent | 8a4644336d5063fd0bf43e90e3c0823c76e82e4e (diff) | |
| download | patches-bee7bb315cd0b4529a4117b6220c29ca297fc023.tar patches-bee7bb315cd0b4529a4117b6220c29ca297fc023.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'build-aux')
| -rw-r--r-- | build-aux/hydra/gnu-system.scm | 47 |
1 files changed, 32 insertions, 15 deletions
diff --git a/build-aux/hydra/gnu-system.scm b/build-aux/hydra/gnu-system.scm index 6162d09c1f..8178871747 100644 --- a/build-aux/hydra/gnu-system.scm +++ b/build-aux/hydra/gnu-system.scm @@ -51,6 +51,8 @@ ((guix scripts system) #:select (read-operating-system)) ((guix scripts pack) #:select (lookup-compressor self-contained-tarball)) + (gnu bootloader) + (gnu bootloader u-boot) (gnu packages) (gnu packages gcc) (gnu packages base) @@ -135,7 +137,10 @@ SYSTEM." "i686-w64-mingw32")) (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) "Return a list of jobs that build QEMU images for SYSTEM." @@ -159,20 +164,32 @@ system.") (expt 2 20)) (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 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 installation-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) |