From patchwork Wed Dec 19 20:42:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pkill9 X-Patchwork-Id: 492 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 66D36169A4; Wed, 19 Dec 2018 20:44:10 +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=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) by mira.cbaines.net (Postfix) with ESMTP id DA650169A2 for ; Wed, 19 Dec 2018 20:44:09 +0000 (GMT) Received: from localhost ([::1]:34062 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gZihN-0002WE-9j for patchwork@mira.cbaines.net; Wed, 19 Dec 2018 15:44:09 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35721) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gZihL-0002W9-J3 for guix-patches@gnu.org; Wed, 19 Dec 2018 15:44:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gZihG-0007F4-NX for guix-patches@gnu.org; Wed, 19 Dec 2018 15:44:07 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:50874) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gZihG-0007Er-JN for guix-patches@gnu.org; Wed, 19 Dec 2018 15:44:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gZihG-00033Y-DM for guix-patches@gnu.org; Wed, 19 Dec 2018 15:44:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#33806] [PATCH] system: 'kernel->boot-label' now accepts inferior packages. Resent-From: Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 19 Dec 2018 20:44:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 33806 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33806@debbugs.gnu.org X-Debbugs-Original-To: "guix-patches" Received: via spool by submit@debbugs.gnu.org id=B.154525219411661 (code B ref -1); Wed, 19 Dec 2018 20:44:02 +0000 Received: (at submit) by debbugs.gnu.org; 19 Dec 2018 20:43:14 +0000 Received: from localhost ([127.0.0.1]:55132 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gZigU-000320-2w for submit@debbugs.gnu.org; Wed, 19 Dec 2018 15:43:14 -0500 Received: from eggs.gnu.org ([208.118.235.92]:53997) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gZigR-00031i-OO for submit@debbugs.gnu.org; Wed, 19 Dec 2018 15:43:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gZigL-0006G1-KP for submit@debbugs.gnu.org; Wed, 19 Dec 2018 15:43:06 -0500 Received: from lists.gnu.org ([2001:4830:134:3::11]:42057) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gZigL-0006Ft-Ex for submit@debbugs.gnu.org; Wed, 19 Dec 2018 15:43:05 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35360) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gZigI-000226-Vz for guix-patches@gnu.org; Wed, 19 Dec 2018 15:43:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gZigE-00069r-F7 for guix-patches@gnu.org; Wed, 19 Dec 2018 15:43:02 -0500 Received: from aibo.runbox.com ([91.220.196.211]:60962) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gZigE-00067J-1S for guix-patches@gnu.org; Wed, 19 Dec 2018 15:42:58 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=runbox.com; s=rbselector1; h=Message-Id:Content-Type:Date:Subject:To:From:MIME-Version; bh=K8sFbmIIw/w5JnSWBHTxVeD4V0TXTQy1mlffdsFaJLI=; b=AEUZ8naetcwAJj374Jqoj/dbS nOxiA/pO3lFizvss8FblnKNAdgTJ0gJRnc3yioSzepRC4lBUFpq7S6iQS1tBNHTqznsmCxHlDG9HI J307lwz9AQMN5bHWHupqzIFpga+3yrdIV26nw0uL9u1Ydiq4HpAehjIdX1Uc8mWZmOZGWp0/QE6bP 0oe7uO12aHioWLmYSm6NMVkIIUqJ2j+PU7CBOuI5yjPNSyETTtSwgb4qVQPAPQPCmEyZLdeZiUVcH Kqo2UlXjs6V4LMcGNEfumI+iV7gX0r0LksHHMtXwxkTOJNHeKT3HxRxziv6RR+2ybWy1/ID9wqQuc ncM2NlqQw==; Received: from [10.9.9.127] (helo=rmmprod05.runbox) by mailtransmit02.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1gZig9-0007RJ-Nn for guix-patches@gnu.org; Wed, 19 Dec 2018 21:42:53 +0100 Received: from mail by rmmprod05.runbox with local (Exim 4.86_2) (envelope-from ) id 1gZig9-0005Q1-Me for guix-patches@gnu.org; Wed, 19 Dec 2018 21:42:53 +0100 MIME-Version: 1.0 Received: from [Authenticated user (850733)] by runbox.com with http (RMM6); for ; Wed, 19 Dec 2018 20:42:53 GMT From: Date: Wed, 19 Dec 2018 20:42:53 +0000 (GMT) X-Mailer: RMM6 Message-Id: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches I modified the 'kernel->boot-label' function in gnu/system.scm to check if the kernel passed to it is a regular package, and if it isn't then it will try to get the package name and version using 'inferior-package-name' and 'inferior-package-version'. Note: I wasn't sure if the hack at the beginning of this patch was neccessary and I didn't add it: http://git.savannah.gnu.org/cgit/guix.git/commit/?id=811b21fb15d36b06fde994ca7ef5916a9a19f250 ``` (define inferiors-loaded? ;; This hack allows us to provide seamless integration for inferior ;; packages while not having a hard dependency on (guix inferior). (resolve-module '(guix inferior) #f #f #:ensure #f)) (define (inferior->entry) (module-ref (resolve-interface '(guix inferior)) 'inferior-package->manifest-entry)) ``` This is the only issue preventing using an inferior package as a kernel, which is very useful as it means you can avoid recompiling a custom kernel when you reconfigure the system with a newer guix revision that changes the kernel package dependencies. From 6c0bbaa0a73f4c6043211df6af100877dc9a4094 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 not a regular package. --- gnu/system.scm | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/gnu/system.scm b/gnu/system.scm index a5a8f40d6..afe39278d 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -21,6 +21,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu system) + #:use-module (guix inferior) #:use-module (guix store) #:use-module (guix monads) #:use-module (guix gexp) @@ -905,10 +906,15 @@ listed in OS. The C library expects to find it under (define (kernel->boot-label kernel) "Return a label for the bootloader menu entry that boots KERNEL." - (string-append "GNU with " - (string-titlecase (package-name kernel)) " " - (package-version kernel) - " (beta)")) + (if (package? kernel) + (string-append "GNU with " + (string-titlecase (package-name kernel)) " " + (package-version kernel) + " (beta)") + (string-append "GNU with " + (string-titlecase (inferior-package-name kernel)) + (inferior-package-version kernel) + " (beta)"))) (define (store-file-system file-systems) "Return the file system object among FILE-SYSTEMS that contains the store." -- 2.19.2