From: <pkill9@runbox.com>
To: 33806@debbugs.gnu.org
Subject: [bug#33806] [PATCH] system: 'kernel->boot-label' now accepts inferior packages.
Date: Wed, 19 Dec 2018 20:42:53 +0000 (GMT) [thread overview]
Message-ID: <E1gZig9-0005Q1-Me@rmmprod05.runbox> (raw)
[-- Attachment #1: Type: text/plain, Size: 1083 bytes --]
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.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-system-kernel-boot-label-now-accepts-inferior-packag.patch --]
[-- Type: text/x-patch; name="0001-system-kernel-boot-label-now-accepts-inferior-packag.patch", Size: 1711 bytes --]
From 6c0bbaa0a73f4c6043211df6af100877dc9a4094 Mon Sep 17 00:00:00 2001
From: Pkill -9 <pkill9@runbox.com>
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 <http://www.gnu.org/licenses/>.
(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
next reply other threads:[~2018-12-19 20:44 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-19 20:42 pkill9 [this message]
2018-12-19 21:56 ` [bug#33806] [PATCH] system: 'kernel->boot-label' now accepts inferior packages Ludovic Courtès
2018-12-20 14:44 ` pkill9
2018-12-21 15:20 ` bug#33806: " Ludovic Courtès
2018-12-24 20:04 ` [bug#33806] " pkill9
2018-12-26 16:22 ` Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E1gZig9-0005Q1-Me@rmmprod05.runbox \
--to=pkill9@runbox.com \
--cc=33806@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.