[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
10/18: system: Use 'hurd' package in label.
From: |
guix-commits |
Subject: |
10/18: system: Use 'hurd' package in label. |
Date: |
Sat, 16 May 2020 08:00:52 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd-vm
in repository guix.
commit 3bc4a8f25e6c9688c9110cb101f007e19c8e4025
Author: Jan (janneke) Nieuwenhuizen <address@hidden>
AuthorDate: Sun May 10 15:31:45 2020 +0200
system: Use 'hurd' package in label.
* gnu/system.scm (kernel->boot-label): Add keyword parameter 'hurd'. If
set,
use it for label.
(operating-system-default-label): Call with it with operating-system-hurd.
---
gnu/system.scm | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/gnu/system.scm b/gnu/system.scm
index 76bddf0..bc6a1eb 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -1084,9 +1084,13 @@ listed in OS. The C library expects to find it under
(locale-directory definitions
#:libcs (operating-system-locale-libcs os)))
-(define (kernel->boot-label kernel)
+(define* (kernel->boot-label kernel #:key hurd)
"Return a label for the bootloader menu entry that boots KERNEL."
- (cond ((package? kernel)
+ (cond ((package? hurd)
+ (string-append "GNU with the "
+ (string-titlecase (package-name hurd)) " "
+ (package-version hurd)))
+ ((package? kernel)
(string-append "GNU with "
(string-titlecase (package-name kernel)) " "
(package-version kernel)))
@@ -1099,7 +1103,8 @@ listed in OS. The C library expects to find it under
(define (operating-system-default-label os)
"Return the default label for OS, as it will appear in the bootloader menu
entry."
- (kernel->boot-label (operating-system-kernel os)))
+ (kernel->boot-label (operating-system-kernel os)
+ #:hurd (operating-system-hurd os)))
(define (store-file-system file-systems)
"Return the file system object among FILE-SYSTEMS that contains the store."
- branch wip-hurd-vm created (now 9d9195d), guix-commits, 2020/05/16
- 01/18: gnu: linux-libre: Add support for gnu.* namespace., guix-commits, 2020/05/16
- 04/18: system: hurd: Add hurd-default-essential-services., guix-commits, 2020/05/16
- 02/18: gnu: hurd: Update to upstream Hurd-reserved xattr index., guix-commits, 2020/05/16
- 03/18: system: vm: Add defaults for the Hurd., guix-commits, 2020/05/16
- 06/18: bootloader: Add `<hurd-menu-entry>'., guix-commits, 2020/05/16
- 07/18: system: Add 'hurd' field to <boot-parameters>., guix-commits, 2020/05/16
- 08/18: bootloader: grub: Add support for '<hurd-menu-entry>'., guix-commits, 2020/05/16
- 09/18: system: vm: Initial vm-image support for the Hurd., guix-commits, 2020/05/16
- 10/18: system: Use 'hurd' package in label.,
guix-commits <=
- 12/18: services: hurd: Add `hurd-etc-service'., guix-commits, 2020/05/16
- 05/18: system: Add 'hurd' field to <operating-system>., guix-commits, 2020/05/16
- 11/18: system: examples: Add bare-hurd.tmpl., guix-commits, 2020/05/16
- 15/18: utils: Move 'reset-timestamps' out of database., guix-commits, 2020/05/16
- 16/18: system: vm: Do not register-closures when cross-building., guix-commits, 2020/05/16
- 13/18: system: Add `hurd-activation'., guix-commits, 2020/05/16
- 14/18: services: hurd: Use activation-service, hurd-etc-service., guix-commits, 2020/05/16
- 17/18: system: vm: Fix for cross-build to the Hurd., guix-commits, 2020/05/16
- 18/18: DRAFT system: vm: More cross-build fixes via IRC, guix-commits, 2020/05/16