[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
58/62: HACK build.sh, 2GiB disk.
From: |
guix-commits |
Subject: |
58/62: HACK build.sh, 2GiB disk. |
Date: |
Sat, 11 Apr 2020 11:35:58 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd-vm
in repository guix.
commit 2fe595c8b5371f627c156c33b0a0a9f0018d571d
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 65b8c07..148975a 100644
--- a/gnu/system/hurd.scm
+++ b/gnu/system/hurd.scm
@@ -137,6 +137,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&
+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)
@@ -166,6 +176,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".
- 22/62: system: hurd: Create /etc/{hostname,motd,login} and /root., (continued)
- 22/62: system: hurd: Create /etc/{hostname,motd,login} and /root., guix-commits, 2020/04/11
- 30/62: vm: Make the device node procedure a parameter., guix-commits, 2020/04/11
- 32/62: system: hurd: Add guix., guix-commits, 2020/04/11
- 38/62: system: hurd: Add openssh, shepherd., guix-commits, 2020/04/11
- 36/62: gnu: hurd: Install a BDF font., guix-commits, 2020/04/11
- 46/62: system: hurd: Add guile-candy., guix-commits, 2020/04/11
- 47/62: system: hurd: Ensure propagated inputs are also cross-built., guix-commits, 2020/04/11
- 51/62: gnu: guix: Cross-build fixup for wrap-program., guix-commits, 2020/04/11
- 52/62: gnu: guix: Add dependency on `hurd' when building for the Hurd., guix-commits, 2020/04/11
- 50/62: gnu: Fix typo., guix-commits, 2020/04/11
- 58/62: HACK build.sh, 2GiB disk.,
guix-commits <=
- 59/62: Revert "compile: Run the load phase within 'with-target'.", guix-commits, 2020/04/11
- 24/62: vm: Preserve file permissions on /dev., guix-commits, 2020/04/11
- 29/62: linux-boot: Add 'make-hurd-device-nodes'., guix-commits, 2020/04/11
- 31/62: gnu: guix: Fix cross-compilation., guix-commits, 2020/04/11
- 37/62: gnu: openssh: Build fix for the Hurd., guix-commits, 2020/04/11
- 33/62: gnu: libdaemon: Allow cross-compilation., guix-commits, 2020/04/11
- 43/62: gnu: hurd: "/libexec/rc" spawns the console client., guix-commits, 2020/04/11
- 44/62: system: hurd: Create a proper profile., guix-commits, 2020/04/11
- 45/62: system: hurd: Add net-base and inetutils., guix-commits, 2020/04/11
- 61/62: REMOVEME gnu: guix: Bugfix for cross compiling to the Hurd., guix-commits, 2020/04/11