[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
07/12: system: Add 'hurd' field to <operating-system>.
From: |
guix-commits |
Subject: |
07/12: system: Add 'hurd' field to <operating-system>. |
Date: |
Sun, 3 May 2020 17:13:39 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd-vm
in repository guix.
commit cc13d462dd3de7306deb50fd4ea22a0280fc5292
Author: Jan (janneke) Nieuwenhuizen <address@hidden>
AuthorDate: Sun May 3 15:09:15 2020 +0200
system: Add 'hurd' field to <operating-system>.
* gnu/system.scm (<operating-system>)[hurd]: New field.
* doc/guix.texi (operating-system Reference): Document 'hurd'.
---
doc/guix.texi | 9 +++++++--
gnu/system.scm | 3 +++
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index 472b70e..7314bf8 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -35,7 +35,7 @@ Copyright @copyright{} 2016, 2017, 2018 Chris Marusich@*
Copyright @copyright{} 2016, 2017, 2018, 2019, 2020 Efraim Flashner@*
Copyright @copyright{} 2016 John Darrington@*
Copyright @copyright{} 2016, 2017 ng0@*
-Copyright @copyright{} 2016, 2017, 2018, 2019 Jan Nieuwenhuizen@*
+Copyright @copyright{} 2016, 2017, 2018, 2019, 2020 Jan Nieuwenhuizen@*
Copyright @copyright{} 2016 Julien Lepiller@*
Copyright @copyright{} 2016 Alex ter Weele@*
Copyright @copyright{} 2016, 2017, 2018, 2019 Christopher Baines@*
@@ -11269,7 +11269,12 @@ configuration (@pxref{Using the Configuration System}).
@item @code{kernel} (default: @code{linux-libre})
The package object of the operating system kernel to use@footnote{Currently
only the Linux-libre kernel is supported. In the future, it will be
-possible to use the GNU@tie{}Hurd.}.
+possible to use the GNU@tie{}mach.}.
+
+@cindex hurd
+@item @code{hurd} (default: @code{#f})
+The hurd to be started by the kernel. This only makes sence, really
+when using @code{kernel} @code{gnumach}.
@item @code{kernel-loadable-modules} (default: '())
A list of objects (usually packages) to collect loadable kernel modules
diff --git a/gnu/system.scm b/gnu/system.scm
index e3ec9b0..bbf2d72 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -82,6 +82,7 @@
operating-system-packages
operating-system-host-name
operating-system-hosts-file
+ operating-system-hurd
operating-system-kernel
operating-system-kernel-file
operating-system-kernel-arguments
@@ -185,6 +186,8 @@
(default '())) ; list of packages
(kernel-arguments operating-system-user-kernel-arguments
(default %default-kernel-arguments)) ; list of
gexps/strings
+ (hurd operating-system-hurd
+ (default #f)) ; package
(bootloader operating-system-bootloader) ; <bootloader-configuration>
(label operating-system-label ; string
(thunked)
- branch wip-hurd-vm created (now 9b25e0e), guix-commits, 2020/05/03
- 04/12: system: hurd: Add hurd-default-essential-services., guix-commits, 2020/05/03
- 01/12: gnu: glibc/hurd-headers: Cross-build fix for the Hurd., guix-commits, 2020/05/03
- 02/12: system: vm: Fix for cross-build to the Hurd., guix-commits, 2020/05/03
- 03/12: system: vm: Add defaults for the Hurd., guix-commits, 2020/05/03
- 07/12: system: Add 'hurd' field to <operating-system>.,
guix-commits <=
- 05/12: system: hurd: Add hurd-grub-configuration-file., guix-commits, 2020/05/03
- 06/12: system: hurd: Add hurd-grub-minimal-bootloader., guix-commits, 2020/05/03
- 10/12: services: hurd: Add hurd-etc-sevcices., guix-commits, 2020/05/03
- 11/12: system: Add hurd activation., guix-commits, 2020/05/03
- 12/12: DRAFT services: hurd: Use activation-service, hurd-etc-service., guix-commits, 2020/05/03
- 09/12: system: examples: Add bare-hurd.tmpl., guix-commits, 2020/05/03
- 08/12: system: vm: Initial vm-image support for the Hurd., guix-commits, 2020/05/03