From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53138) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1efwF5-0005up-Lu for guix-patches@gnu.org; Sun, 28 Jan 2018 18:20:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1efwF0-0003pA-Ec for guix-patches@gnu.org; Sun, 28 Jan 2018 18:20:07 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:39007) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1efwF0-0003ot-B0 for guix-patches@gnu.org; Sun, 28 Jan 2018 18:20:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1efwF0-0004aW-1m for guix-patches@gnu.org; Sun, 28 Jan 2018 18:20:02 -0500 Subject: [bug#30278] [PATCH] hydra: Only build the "flash image" on arm. Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:52959) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1efwDw-00050U-Ir for guix-patches@gnu.org; Sun, 28 Jan 2018 18:18:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1efwDq-0002v4-9Q for guix-patches@gnu.org; Sun, 28 Jan 2018 18:18:55 -0500 Received: from dd26836.kasserver.com ([85.13.145.193]:58386) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1efwDq-0002u6-1T for guix-patches@gnu.org; Sun, 28 Jan 2018 18:18:50 -0500 From: Danny Milosavljevic Date: Mon, 29 Jan 2018 00:18:45 +0100 Message-Id: <20180128231845.11006-1-dannym@scratchpost.org> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 30278@debbugs.gnu.org * 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)