GNU bug report logs - #30220
[PATCH] hydra: Add arm image builder.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 30220 in the body.
You can then email your comments to 30220 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: guix-patches <at> gnu.org
Cc: Danny Milosavljevic <dannym <at> scratchpost.org>
Subject: [PATCH] hydra: Add arm image builder.
Date: Tue, 23 Jan 2018 00:50:12 +0100

* 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

Message #8 received at 30220 <at> debbugs.gnu.org (full text, mbox):

From: ludo <at> gnu.org (Ludovic Courtès)
To: Danny Milosavljevic <dannym <at> scratchpost.org>
Cc: 30220 <at> debbugs.gnu.org
Subject: Re: [bug#30220] [PATCH] hydra: Add arm image builder.
Date: Sun, 28 Jan 2018 23:47:24 +0100

Danny Milosavljevic <dannym <at> scratchpost.org> skribis:

> * 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.

LGTM, thanks!

Ludo'.

Message #13 received at 30220-done <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: ludo <at> gnu.org (Ludovic Courtès)
Cc: 30220-done <at> debbugs.gnu.org
Subject: Re: [bug#30220] [PATCH] hydra: Add arm image builder.
Date: Mon, 29 Jan 2018 00:12:29 +0100

On Sun, 28 Jan 2018 23:47:24 +0100
ludo <at> gnu.org (Ludovic Courtès) wrote:

> Danny Milosavljevic <dannym <at> scratchpost.org> skribis:
> 
> > * 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.  
> 
> LGTM, thanks!

Pushed as de2bc8d6da0ba4e74ed083af66a22cf96f74e67f.

I think the ISO image will be useless because mkrescue
doesn't support u-boot - and the u-boot config file will be
ignored by it, too.

It might make sense to make the ISO image conditional later...

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.