* [bug#30278] [PATCH] hydra: Only build the "flash image" on arm.
@ 2018-01-28 23:18 Danny Milosavljevic
2018-01-29 14:22 ` Ludovic Courtès
0 siblings, 1 reply; 3+ messages in thread
From: Danny Milosavljevic @ 2018-01-28 23:18 UTC (permalink / raw)
To: 30278
* build-aux/hydra/gnu-system.scm (qemu-jobs): Only build the "flash image"
on arm.
---
build-aux/hydra/gnu-system.scm | 28 ++++++++++++++++------------
1 file changed, 16 insertions(+), 12 deletions(-)
diff --git a/build-aux/hydra/gnu-system.scm b/build-aux/hydra/gnu-system.scm
index c9aa59775..29e3268a2 100644
--- a/build-aux/hydra/gnu-system.scm
+++ b/build-aux/hydra/gnu-system.scm
@@ -162,29 +162,33 @@ system.")
(define MiB
(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)
- (list (->job 'usb-image
+ (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 (adjust-bootloader installation-os)
+ (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
+ (->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")))))
+ "iso9660"))))))
'()))
(define (system-test-jobs store system)
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [bug#30278] [PATCH] hydra: Only build the "flash image" on arm.
2018-01-28 23:18 [bug#30278] [PATCH] hydra: Only build the "flash image" on arm Danny Milosavljevic
@ 2018-01-29 14:22 ` Ludovic Courtès
2018-01-29 15:31 ` Danny Milosavljevic
0 siblings, 1 reply; 3+ messages in thread
From: Ludovic Courtès @ 2018-01-29 14:22 UTC (permalink / raw)
To: Danny Milosavljevic; +Cc: 30278
Danny Milosavljevic <dannym@scratchpost.org> skribis:
> * build-aux/hydra/gnu-system.scm (qemu-jobs): Only build the "flash image"
> on arm.
Looks good. Please run “make hydra-jobs.scm” before pushing to make
sure that evaluation still works.
Thanks!
Ludo’.
^ permalink raw reply [flat|nested] 3+ messages in thread
* [bug#30278] [PATCH] hydra: Only build the "flash image" on arm.
2018-01-29 14:22 ` Ludovic Courtès
@ 2018-01-29 15:31 ` Danny Milosavljevic
0 siblings, 0 replies; 3+ messages in thread
From: Danny Milosavljevic @ 2018-01-29 15:31 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: 30278-done
Hi Ludo,
On Mon, 29 Jan 2018 15:22:54 +0100
ludo@gnu.org (Ludovic Courtès) wrote:
> Danny Milosavljevic <dannym@scratchpost.org> skribis:
>
> > * build-aux/hydra/gnu-system.scm (qemu-jobs): Only build the "flash image"
> > on arm.
>
> Looks good. Please run “make hydra-jobs.scm” before pushing to make
> sure that evaluation still works.
Aha! Good idea.
Committed as 2a49a18e8b60a03d85b7ad8b02a3730fa003eb69.
Let's see what Hydra says...
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-01-29 15:32 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-01-28 23:18 [bug#30278] [PATCH] hydra: Only build the "flash image" on arm Danny Milosavljevic
2018-01-29 14:22 ` Ludovic Courtès
2018-01-29 15:31 ` Danny Milosavljevic
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).