[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
17/36: system: gnu: Add %bootstrap-{gcc, binutils, glibc} for devel prof
From: |
guix-commits |
Subject: |
17/36: system: gnu: Add %bootstrap-{gcc, binutils, glibc} for devel profile. |
Date: |
Fri, 1 May 2020 11:53:59 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd-vm
in repository guix.
commit 98d2fbf31eb2d46bc6f7f2f454657e692ea1a3f5
Author: Jan (janneke) Nieuwenhuizen <address@hidden>
AuthorDate: Sun Apr 19 11:15:14 2020 +0200
system: gnu: Add %bootstrap-{gcc,binutils,glibc} for devel profile.
* gnu/system/hurd.scm (system-profile): Add them.
("/root/.gitconfig"): Add git configuration for GNU.
---
gnu/system/hurd.scm | 34 ++++++++++++++++++++++++++++++----
1 file changed, 30 insertions(+), 4 deletions(-)
diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm
index c0c8656..536ecbc 100644
--- a/gnu/system/hurd.scm
+++ b/gnu/system/hurd.scm
@@ -30,6 +30,7 @@
#:use-module (gnu packages admin)
#:use-module (gnu packages base)
#:use-module (gnu packages bash)
+ #:use-module (gnu packages bootstrap)
#:use-module (gnu packages commencement)
#:use-module (gnu packages compression)
#:use-module (gnu packages cross-base)
@@ -192,9 +193,23 @@ fi\n")))
(dependencies (map cross-built-entry
(manifest-entry-dependencies entry)))))
+ (define (cross-bootstrap thing)
+ (with-parameters ((%current-system "i586-gnu"))
+ thing))
+
+ (define (cross-bootstrap-entry entry)
+ (manifest-entry
+ (inherit entry)
+ (item (cross-bootstrap (manifest-entry-item entry)))))
+
(define system-profile
- (map-manifest-entries cross-built-entry
- (packages->manifest (operating-system-packages os))))
+ (concatenate-manifests
+ (list (map-manifest-entries cross-built-entry
+ (packages->manifest
(operating-system-packages os)))
+ (map-manifest-entries cross-bootstrap-entry
+ (packages->manifest (list %bootstrap-gcc
+ %bootstrap-binutils
+
%bootstrap-glibc))))))
(define grub.cfg
(let ((hurd (cross-built hurd))
@@ -281,6 +296,15 @@ sshd:x:2:2:sshd:/var/empty:/bin/no-sh
(with-parameters ((%current-target-system "i586-pc-gnu"))
(operating-system-activation-script os)))
+ (define root-.gitconfig
+ (plain-file "root-.gitconfig"
+ "\
+[url \"git+ssh://git.sv.gnu.org/srv/git/\"]
+ insteadof = gnu-ssh:
+[url \"git://git.savannah.gnu.org/\"]
+ insteadof = gnu:
+")) ;" help Emacs
+
(define hurd-directives
`((directory "/servers")
,@(map (lambda (server)
@@ -339,7 +363,8 @@ sshd:x:2:2:sshd:/var/empty:/bin/no-sh
("/bin/sh" -> ,(file-append (with-parameters ((%current-target-system
"i586-pc-gnu"))
bash)
- "/bin/sh"))))
+ "/bin/sh"))
+ ("/root/.gitconfig" -> ,root-.gitconfig)))
(qemu-image #:file-system-type "ext2"
#:file-system-options '("-o" "hurd")
@@ -351,7 +376,8 @@ sshd:x:2:2:sshd:/var/empty:/bin/no-sh
("group" ,group)
("shadow" ,shadow)
("shepherd.conf" ,shepherd.conf)
- ("boot-activation" ,boot-activation))
+ ("boot-activation" ,boot-activation)
+ ("root-.gitconfig" ,root-.gitconfig))
#:copy-inputs? #t
#:os system-profile
#:bootcfg-drv grub.cfg
- 09/36: Revert "squash! Use static-networking for loopback", (continued)
- 09/36: Revert "squash! Use static-networking for loopback", guix-commits, 2020/05/01
- 10/36: HACK services: Add openssh-service as a Hurd service., guix-commits, 2020/05/01
- 12/36: system: gnu: Populate "/etc" from "/boot/activation"., guix-commits, 2020/05/01
- 14/36: DRAFT: hurd: use static-networking instead of dummy loopback hack., guix-commits, 2020/05/01
- 01/36: services: Add hurd., guix-commits, 2020/05/01
- 13/36: system: hurd: Add openssh service., guix-commits, 2020/05/01
- 15/36: Revert "DRAFT: hurd: use static-networking instead of dummy loopback hack.", guix-commits, 2020/05/01
- 05/36: HACK services: Add guix-daemon-service as a Hurd service., guix-commits, 2020/05/01
- 07/36: HACK services: hurd: Add dummy loopback., guix-commits, 2020/05/01
- 16/36: system: hurd: Create system profile for guix development., guix-commits, 2020/05/01
- 17/36: system: gnu: Add %bootstrap-{gcc, binutils, glibc} for devel profile.,
guix-commits <=
- 08/36: squash! Use static-networking for loopback, guix-commits, 2020/05/01
- 24/36: services: hurd: Use hurd-file-systems-service., guix-commits, 2020/05/01
- 23/36: system: hurd: Export system variables., guix-commits, 2020/05/01
- 06/36: HACK services: hurd: Add dummy syslog., guix-commits, 2020/05/01
- 11/36: DRAFT system: hurd: Add the Shepherd., guix-commits, 2020/05/01
- 18/36: system: hurd: Add guix., guix-commits, 2020/05/01
- 21/36: services: Add hurd-file-systems-service-type., guix-commits, 2020/05/01
- 22/36: services: hurd: Move hurd-default-essential-services., guix-commits, 2020/05/01
- 20/36: services: hurd: Move hurd-etc-sevcices., guix-commits, 2020/05/01
- 25/36: system: hurd: Add hurd-grub-configuration-file., guix-commits, 2020/05/01