From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48712) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1edlsj-0007fz-9o for guix-patches@gnu.org; Mon, 22 Jan 2018 18:52:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1edlsg-0001UY-7W for guix-patches@gnu.org; Mon, 22 Jan 2018 18:52:05 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:59071) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1edlsg-0001UN-42 for guix-patches@gnu.org; Mon, 22 Jan 2018 18:52:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1edlsf-0003gy-SP for guix-patches@gnu.org; Mon, 22 Jan 2018 18:52:01 -0500 Subject: [bug#30220] [PATCH] hydra: Add arm image builder. Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:48519) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1edlrz-0007VR-LX for guix-patches@gnu.org; Mon, 22 Jan 2018 18:51:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1edlrw-0000s2-Iy for guix-patches@gnu.org; Mon, 22 Jan 2018 18:51:19 -0500 Received: from dd26836.kasserver.com ([85.13.145.193]:51560) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1edlrw-0000r2-CB for guix-patches@gnu.org; Mon, 22 Jan 2018 18:51:16 -0500 From: Danny Milosavljevic Date: Tue, 23 Jan 2018 00:50:12 +0100 Message-Id: <20180122235012.22981-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: 30220@debbugs.gnu.org * 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. --- build-aux/hydra/gnu-system.scm | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/build-aux/hydra/gnu-system.scm b/build-aux/hydra/gnu-system.scm index 04845a3e1..c9aa59775 100644 --- a/build-aux/hydra/gnu-system.scm +++ b/build-aux/hydra/gnu-system.scm @@ -51,6 +51,7 @@ ((guix scripts system) #:select (read-operating-system)) ((guix scripts pack) #:select (lookup-compressor self-contained-tarball)) + (gnu bootloader u-boot) (gnu packages) (gnu packages gcc) (gnu packages base) @@ -135,7 +136,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." @@ -158,12 +162,20 @@ 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 (run-with-store store (mbegin %store-monad (set-guile-for-build (default-guile)) - (system-disk-image installation-os + (system-disk-image (adjust-bootloader installation-os) #:disk-image-size (* 1024 MiB))))) (->job 'iso9660-image