[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/22: HACK build.sh, 2GiB disk.
From: |
guix-commits |
Subject: |
03/22: HACK build.sh, 2GiB disk. |
Date: |
Mon, 13 Apr 2020 09:20:46 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd-vm
in repository guix.
commit 6c1768ab094a2dfcd8b66aedff4ed81570577665
Author: Jan (janneke) Nieuwenhuizen <address@hidden>
AuthorDate: Fri Apr 10 18:06:46 2020 +0200
HACK build.sh, 2GiB disk.
---
gnu/system/hurd.scm | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm
index 28a88c1..c1807a7 100644
--- a/gnu/system/hurd.scm
+++ b/gnu/system/hurd.scm
@@ -136,6 +136,16 @@ if [ -f \"$GUIX_PROFILE/etc/profile\" ]; then
. \"$GUIX_PROFILE/etc/profile\"
fi\n"))
+ (define build.sh
+ (plain-file "build.sh"
+ "#! /bin/sh
+set -ex
+
+guix-daemon --build-users-group=guixbuild --disable-chroot --max-jobs=1 &
+guix archive --authorize <
/run/current-system/profile/share/guix/ci.guix.gnu.org.pub
+guix build -e '(@@ (gnu packages commencement) gnu-make-boot0)' --fallback
--no-offload
+"))
+
(define hurd-directives
`((directory "/servers")
,@(map (lambda (server)
@@ -165,6 +175,7 @@ fi\n"))
'(begin
(use-modules (ice-9 readline) (ice-9 colorized))
(activate-readline) (activate-colorized))))
+ ("/root/build.sh" -> ,build.sh)
(directory "/run")
(directory "/run/current-system")
("/run/current-system/profile" -> ,system-profile)
@@ -213,13 +224,15 @@ fi\n"))
("passwd" ,passwd)
("group" ,group)
("etc-profile" ,etc-profile)
- ("shadow" ,shadow))
+ ("shadow" ,shadow)
+ ("build.sh" ,build.sh))
#:copy-inputs? #t
#:os system-profile
#:bootcfg-drv grub.cfg
#:bootloader grub-bootloader
#:register-closures? #f
#:device-nodes 'hurd
+ #:disk-image-size (* 2 (expt 2 30)) ;2GiB
#:extra-directives hurd-directives))
;; Return this thunk so one can type "guix build -f gnu/system/hurd.scm".
- branch wip-hurd-vm updated (784ba72 -> ef33718), guix-commits, 2020/04/13
- 01/22: gnu: guix: Avoid loading (gnu installer) when cross compiling., guix-commits, 2020/04/13
- 07/22: gnu: guix: Run `make update-guix-package'., guix-commits, 2020/04/13
- 10/22: gnu: hurd: Use default Qemu guest ip: 10.0.2.15., guix-commits, 2020/04/13
- 03/22: HACK build.sh, 2GiB disk.,
guix-commits <=
- 05/22: Revert "records: Have ABI check work well for cross-compilation.", guix-commits, 2020/04/13
- 02/22: system: hurd: Add guix., guix-commits, 2020/04/13
- 06/22: REMOVEME gnu: guix: Bugfix for cross compiling to the Hurd., guix-commits, 2020/04/13
- 04/22: Revert "compile: Run the load phase within 'with-target'.", guix-commits, 2020/04/13
- 08/22: build.sh: Disable daemon deduplication; builds gnu-make-boot0!, guix-commits, 2020/04/13
- 09/22: system: hurd: Bump image size to 10GiB., guix-commits, 2020/04/13
- 12/22: system: hurd: Add the Shepherd., guix-commits, 2020/04/13
- 11/22: system: hurd: Add openssh., guix-commits, 2020/04/13
- 15/22: DRAFT system: hurd: Start the Shepherd., guix-commits, 2020/04/13
- 18/22: services: Add hurd-ttys-service-type., guix-commits, 2020/04/13