all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Danny Milosavljevic <dannym@scratchpost.org>
To: 30220@debbugs.gnu.org
Subject: [bug#30220] [PATCH] hydra: Add arm image builder.
Date: Tue, 23 Jan 2018 00:50:12 +0100	[thread overview]
Message-ID: <20180122235012.22981-1-dannym@scratchpost.org> (raw)

* 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

             reply	other threads:[~2018-01-22 23:52 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-01-22 23:50 Danny Milosavljevic [this message]
2018-01-28 22:47 ` [bug#30220] [PATCH] hydra: Add arm image builder Ludovic Courtès
2018-01-28 23:12   ` bug#30220: " Danny Milosavljevic

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180122235012.22981-1-dannym@scratchpost.org \
    --to=dannym@scratchpost.org \
    --cc=30220@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.