From c0fda0b0df1bbbf90368bd8333f0f5f8cda195c1 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 21 Jan 2018 01:42:59 +0100 Subject: hydra: Make the list of target systems a parameter. * build-aux/hydra/gnu-system.scm (hydra-jobs): Define 'systems' and use it. --- build-aux/hydra/gnu-system.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'build-aux') diff --git a/build-aux/hydra/gnu-system.scm b/build-aux/hydra/gnu-system.scm index 19371be3e9..6162d09c1f 100644 --- a/build-aux/hydra/gnu-system.scm +++ b/build-aux/hydra/gnu-system.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès ;;; Copyright © 2017 Jan Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. @@ -297,6 +297,12 @@ valid." (((? string?) (? string?) ...) 'list) ; only build selected list of packages (_ 'all))) ; build everything + (define systems + (match (assoc-ref arguments 'systems) + (#f %hydra-supported-systems) + ((lst ...) lst) + ((? string? str) (call-with-input-string str read)))) + (define (cross-jobs system) (define (from-32-to-64? target) ;; Return true if SYSTEM is 32-bit and TARGET is 64-bit. This hack @@ -387,4 +393,4 @@ valid." '())) (else (error "unknown subset" subset)))) - %hydra-supported-systems))) + systems))) -- cgit 1.4.1 From de2bc8d6da0ba4e74ed083af66a22cf96f74e67f Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Tue, 23 Jan 2018 00:50:12 +0100 Subject: hydra: Add arm image builder. * 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(-) (limited to 'build-aux') diff --git a/build-aux/hydra/gnu-system.scm b/build-aux/hydra/gnu-system.scm index 04845a3e1f..c9aa597752 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 -- cgit 1.4.1 From 1fe805b290f26db477bcd49be91af54f6c5d061f Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Mon, 29 Jan 2018 10:04:41 +0100 Subject: hydra: Add (gnu bootloader) import. * build-aux/hydra/gnu-system.scm: Add (gnu bootloader) import. Follow-up to de2bc8d6da0ba4e74ed083af66a22cf96f74e67f. --- build-aux/hydra/gnu-system.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'build-aux') diff --git a/build-aux/hydra/gnu-system.scm b/build-aux/hydra/gnu-system.scm index c9aa597752..46f09d14e5 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) (gnu bootloader u-boot) (gnu packages) (gnu packages gcc) -- cgit 1.4.1 From ebd6a6445fa7d3db64795840a607815abbd56880 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Mon, 29 Jan 2018 13:23:07 +0100 Subject: hydra: Work around import problem. * build-aux/hydra/gnu-system.scm: qemu-jobs: Work around import problem. Follow-up to 1fe805b290f26db477bcd49be91af54f6c5d061f. --- build-aux/hydra/gnu-system.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build-aux') diff --git a/build-aux/hydra/gnu-system.scm b/build-aux/hydra/gnu-system.scm index 46f09d14e5..0886d5f3db 100644 --- a/build-aux/hydra/gnu-system.scm +++ b/build-aux/hydra/gnu-system.scm @@ -166,7 +166,7 @@ system.") (define (adjust-bootloader os) (if (member system %u-boot-systems) (operating-system (inherit os) - (bootloader (bootloader-configuration + (bootloader ((@ (gnu bootloader) bootloader-configuration) (bootloader u-boot-bootloader) (target "/dev/null")))) os)) -- cgit 1.4.1 From 44b0303762f58badd9b9f8f1145e54b76b9d19d2 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Mon, 29 Jan 2018 15:56:51 +0100 Subject: hydra: Only build the "flash image" on arm. * build-aux/hydra/gnu-system.scm (qemu-jobs): Only build the "flash image" on arm. --- build-aux/hydra/gnu-system.scm | 48 +++++++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 22 deletions(-) (limited to 'build-aux') diff --git a/build-aux/hydra/gnu-system.scm b/build-aux/hydra/gnu-system.scm index 0886d5f3db..ab240cbc5c 100644 --- a/build-aux/hydra/gnu-system.scm +++ b/build-aux/hydra/gnu-system.scm @@ -163,29 +163,33 @@ system.") (define MiB (expt 2 20)) - (define (adjust-bootloader os) - (if (member system %u-boot-systems) - (operating-system (inherit os) - (bootloader ((@ (gnu 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 (adjust-bootloader installation-os) - #:disk-image-size - (* 1024 MiB))))) - (->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"))))) + (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 + (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 + (run-with-store store + (mbegin %store-monad + (set-guile-for-build (default-guile)) + (system-disk-image installation-os + #:file-system-type + "iso9660")))))) '())) (define (system-test-jobs store system) -- cgit 1.4.1 From 2a49a18e8b60a03d85b7ad8b02a3730fa003eb69 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Mon, 29 Jan 2018 16:02:25 +0100 Subject: hydra: Fix up arm qemu job. * build-aux/hydra/gnu-system.scm (qemu-jobs): Fix up arm qemu job. Follow-up to 44b0303762f58badd9b9f8f1145e54b76b9d19d2. --- build-aux/hydra/gnu-system.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build-aux') diff --git a/build-aux/hydra/gnu-system.scm b/build-aux/hydra/gnu-system.scm index ab240cbc5c..e77604109e 100644 --- a/build-aux/hydra/gnu-system.scm +++ b/build-aux/hydra/gnu-system.scm @@ -170,7 +170,7 @@ system.") (mbegin %store-monad (set-guile-for-build (default-guile)) (system-disk-image - (operating-system (inherit os) + (operating-system (inherit installation-os) (bootloader (bootloader-configuration (bootloader u-boot-bootloader) (target #f)))) -- cgit 1.4.1 From 47551a761bb110e0ae2402eaf014076fbe67af0f Mon Sep 17 00:00:00 2001 From: Diego Nicola Barbato Date: Tue, 13 Feb 2018 01:36:40 +0100 Subject: pull: Update the %sbindir variable in (guix config) when building. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes . * build-aux/build-self.scm (guix): New variable. (builder): Use it. Signed-off-by: Ludovic Courtès --- build-aux/build-self.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'build-aux') diff --git a/build-aux/build-self.scm b/build-aux/build-self.scm index 17d947bec1..4c85c09df6 100644 --- a/build-aux/build-self.scm +++ b/build-aux/build-self.scm @@ -44,6 +44,9 @@ ;; could be renamed or shuffled around in modules over time. Conversely, ;; 'find-best-packages-by-name' is expected to always have the same semantics. +(define guix + (first (find-best-packages-by-name "guix" #f))) + (define libgcrypt (first (find-best-packages-by-name "libgcrypt" #f))) @@ -165,8 +168,6 @@ files." (if (defined? '%localstatedir) %localstatedir (dirname %state-directory))) (define sysconfdir (if (defined? '%sysconfdir) %sysconfdir (dirname %config-directory))) - (define sbindir - (if (defined? '%sbindir) %sbindir (dirname %guix-register-program))) (define builder #~(begin @@ -222,7 +223,7 @@ files." #:storedir #$storedir #:localstatedir #$localstatedir #:sysconfdir #$sysconfdir - #:sbindir #$sbindir + #:sbindir (string-append #$guix "/sbin") #:package-name #$%guix-package-name #:package-version #$version -- cgit 1.4.1