From patchwork Mon Dec 24 20:04:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: pkill9 X-Patchwork-Id: 536 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 4F431169D9; Mon, 24 Dec 2018 20:05:14 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,UNPARSEABLE_RELAY,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mira.cbaines.net (Postfix) with ESMTP id C500A169D8 for ; Mon, 24 Dec 2018 20:05:12 +0000 (GMT) Received: from localhost ([127.0.0.1]:38704 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gbWTQ-0003zb-AQ for patchwork@mira.cbaines.net; Mon, 24 Dec 2018 15:05:12 -0500 Received: from eggs.gnu.org ([208.118.235.92]:42773) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gbWTK-0003v4-KJ for guix-patches@gnu.org; Mon, 24 Dec 2018 15:05:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gbWTG-0007qc-45 for guix-patches@gnu.org; Mon, 24 Dec 2018 15:05:06 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:40385) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gbWTG-0007qK-0v for guix-patches@gnu.org; Mon, 24 Dec 2018 15:05:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gbWTF-000598-Oj for guix-patches@gnu.org; Mon, 24 Dec 2018 15:05:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#33806] [PATCH] system: 'kernel->boot-label' now accepts inferior packages. References: Resent-From: Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 24 Dec 2018 20:05:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33806 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "Ludovic =?utf-8?q?Court=C3=A8s?= " Received: via spool by 33806-done@debbugs.gnu.org id=D33806.154568185619720 (code D ref 33806); Mon, 24 Dec 2018 20:05:01 +0000 Received: (at 33806-done) by debbugs.gnu.org; 24 Dec 2018 20:04:16 +0000 Received: from localhost ([127.0.0.1]:35631 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gbWSV-00057y-RT for submit@debbugs.gnu.org; Mon, 24 Dec 2018 15:04:16 -0500 Received: from aibo.runbox.com ([91.220.196.211]:38264) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gbWSU-00057q-FN for 33806-done@debbugs.gnu.org; Mon, 24 Dec 2018 15:04:15 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=runbox.com; s=rbselector1; h=Message-Id:Content-Type:In-Reply-To:Date:Subject:CC:To:From :MIME-Version; bh=OdeNrtUk8f5333jE07vMtyOis0R19oD6BsR3kS8PaIg=; b=JfyK4LA/HqQ JiO0UAFGtk/yAOWS3MrrflTeoKYPAgZrfdZrF7B9+i8/XIbOGMbeuhZndHrJGUSrhzh3HduKm4wHy 7Nfvmto5c4xLNTY1Rd7MGnJBs/zudhRHniHojq6cnEPtlcQNtrC1G3kqHepc3wWKyIR/p+jL+1PiH MilBEByca7822PDiGrYvtrZw/tYdEz8F48V5ce7ZqcO+1ZD2+OAPnd2BL1A6dtYYZLvHHrkraUqgc lvP62iF+lRghXAKty/rheuoQCWq4kqYl64PQdA2nGSVDoGUaFyKdxo1jI+LPovQOxXmjHDyOjNFAi XN4WNCkXziKpXzPDt48C/Cw==; Received: from [10.9.9.129] (helo=rmmprod07.runbox) by mailtransmit03.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1gbWST-0005Cn-1e; Mon, 24 Dec 2018 21:04:13 +0100 Received: from mail by rmmprod07.runbox with local (Exim 4.86_2) (envelope-from ) id 1gbWST-0005LO-0u; Mon, 24 Dec 2018 21:04:13 +0100 MIME-Version: 1.0 Received: from [Authenticated user (850733)] by runbox.com with http (RMM6); Mon, 24 Dec 2018 20:04:12 GMT From: Date: Mon, 24 Dec 2018 20:04:12 +0000 (GMT) X-Mailer: RMM6 In-Reply-To: <8736qqq53p.fsf@gnu.org> Message-Id: X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: 33806 <33806-done@debbugs.gnu.org> Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches I forgot to add a space between the inferior's package name and package version, I've attached a patch that fixes this. On Fri, 21 Dec 2018 16:20:10 +0100, Ludovic Courtès wrote: > Hi, > > skribis: > > > From 0e86c0708f3aa0eb35a9fc3c9ef89dcb210bac3f Mon Sep 17 00:00:00 2001 > > From: Pkill -9 > > Date: Wed, 19 Dec 2018 20:22:20 +0000 > > Subject: [PATCH] system: 'kernel->boot-label' now accepts inferior packages. > > > > * gnu/system.scm (kernel->boot-label): Get package name and version > > using the functions for inferior packages if the kernel is an > > inferior package. Return "GNU" if the kernel is not a package. > > I adjusted the indentation and applied. Thank you! > > Ludo’. From c1525fa51129f00133f108c020cc27af34f08d0e Mon Sep 17 00:00:00 2001 From: Pkill -9 Date: Mon, 24 Dec 2018 19:52:59 +0000 Subject: [PATCH] system: Fix missing space in boot labels for kernels that are inferior packages * gnu/system.scm (kernel->boot-label): Add a missing space between the kernel's package name and package version for inferior packages. --- gnu/system.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/system.scm b/gnu/system.scm index 146af7cf0..ee48f4826 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -913,7 +913,7 @@ listed in OS. The C library expects to find it under " (beta)")) ((inferior-package? kernel) (string-append "GNU with " - (string-titlecase (inferior-package-name kernel)) + (string-titlecase (inferior-package-name kernel)) " " (inferior-package-version kernel) " (beta)")) (else "GNU"))) -- 2.20.1