From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id CEQYLZX+2F6iPQAA0tVLHw (envelope-from ) for ; Thu, 04 Jun 2020 14:00:53 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id UPTnKJX+2F7JHAAAbx9fmQ (envelope-from ) for ; Thu, 04 Jun 2020 14:00:53 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id BBD639411E9 for ; Thu, 4 Jun 2020 14:00:28 +0000 (UTC) Received: from localhost ([::1]:42496 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jgqPz-0001qN-E3 for larch@yhetil.org; Thu, 04 Jun 2020 10:00:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35262) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jgqPc-0001P0-Pu for bug-guix@gnu.org; Thu, 04 Jun 2020 10:00:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35604) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jgqPc-00026S-F4 for bug-guix@gnu.org; Thu, 04 Jun 2020 10:00:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jgqPc-0004Yt-Em for bug-guix@gnu.org; Thu, 04 Jun 2020 10:00:04 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#41541: [PATCH 5/8] system: Use 'hurd' package in label. Resent-From: "Jan (janneke) Nieuwenhuizen" Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Thu, 04 Jun 2020 14:00:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41541 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 41541@debbugs.gnu.org Received: via spool by 41541-submit@debbugs.gnu.org id=B41541.159127917417397 (code B ref 41541); Thu, 04 Jun 2020 14:00:04 +0000 Received: (at 41541) by debbugs.gnu.org; 4 Jun 2020 13:59:34 +0000 Received: from localhost ([127.0.0.1]:47139 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jgqP7-0004WP-Uf for submit@debbugs.gnu.org; Thu, 04 Jun 2020 09:59:34 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50572) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jgqP4-0004VD-IZ for 41541@debbugs.gnu.org; Thu, 04 Jun 2020 09:59:30 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:33096) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jgqOz-0001vO-9B; Thu, 04 Jun 2020 09:59:25 -0400 Received: from [2001:980:1b4f:1:42d2:832d:bb59:862] (port=43728 helo=dundal.fritz.box) by fencepost.gnu.org with esmtpa (Exim 4.82) (envelope-from ) id 1jgqOy-0000GG-Mn; Thu, 04 Jun 2020 09:59:25 -0400 From: "Jan (janneke) Nieuwenhuizen" Date: Thu, 4 Jun 2020 15:59:11 +0200 Message-Id: <20200604135914.4499-6-janneke@gnu.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200604135914.4499-1-janneke@gnu.org> References: <20200604135914.4499-1-janneke@gnu.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -3.3 (---) X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Spam-Score: 3.99 X-TUID: +9iuBV+8WkhG * 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 a96a6e6f2c..b814181c69 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -1098,9 +1098,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))) @@ -1113,7 +1117,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." -- 2.26.2