From: "Miguel Ángel Arruga Vivas" <rosen644835@gmail.com>
To: 44196@debbugs.gnu.org
Subject: bug#44196: [PATCH 4/3] system: Fix dependency for grub.cfg generation.
Date: Mon, 26 Oct 2020 23:29:29 +0100 [thread overview]
Message-ID: <87mu08oc3a.fsf@gmail.com> (raw)
In-Reply-To: <878sbvh5j4.fsf@gmail.com> ("Miguel Ángel Arruga Vivas"'s message of "Sat, 24 Oct 2020 19:56:15 +0200")
[-- Attachment #1: Type: text/plain, Size: 250 bytes --]
One extra bit :-)
* The keymap was depending on the exported package grub, not on the one
provided by the bootloader configuration, so e.g. systems that use
grub-efi also ended up with grub in their dependency graph. This patch
solves that issue.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0004-system-Fix-dependency-for-grub.cfg-generation.patch --]
[-- Type: text/x-patch, Size: 1252 bytes --]
From ae2d83f91d522b5b0edfe1abbe88dec0a797235c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miguel=20=C3=81ngel=20Arruga=20Vivas?=
<rosen644835@gmail.com>
Date: Sun, 25 Oct 2020 10:13:46 +0100
Subject: [PATCH v3 4/5] system: Fix dependency for grub.cfg generation.
* gnu/bootloader/grub.scm (eye-candy)[font-file]: Use the bootloader
package provided with the configuration.
---
gnu/bootloader/grub.scm | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm
index b610ecbfe5..8636e9c690 100644
--- a/gnu/bootloader/grub.scm
+++ b/gnu/bootloader/grub.scm
@@ -191,9 +191,11 @@ fi~%"
(symbol->string (assoc-ref colors 'bg)))))
(define font-file
- (normalize-file (file-append grub "/share/grub/unicode.pf2")
- store-mount-point
- store-directory-prefix))
+ (let* ((bootloader (bootloader-configuration-bootloader config))
+ (grub (bootloader-package bootloader)))
+ (normalize-file (file-append grub "/share/grub/unicode.pf2")
+ store-mount-point
+ store-directory-prefix)))
(define image
(normalize-file (grub-background-image config)
--
2.28.0
next prev parent reply other threads:[~2020-10-26 22:30 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-24 17:56 bug#44196: Problems with /gnu/store in a different btrfs subvolume Miguel Ángel Arruga Vivas
2020-10-24 18:01 ` bug#44196: [PATCH 1/3] system: Fix grub keymap with store in " Miguel Ángel Arruga Vivas
2020-10-30 19:36 ` Danny Milosavljevic
2020-10-30 21:38 ` Miguel Ángel Arruga Vivas
2020-10-24 18:02 ` bug#44196: [PATCH 2/3] system: Add store-directory-prefix to boot-parameters Miguel Ángel Arruga Vivas
2020-10-31 21:39 ` Ludovic Courtès
2020-10-31 23:02 ` Miguel Ángel Arruga Vivas
2020-11-01 0:01 ` Miguel Ángel Arruga Vivas
2020-11-01 1:44 ` Miguel Ángel Arruga Vivas
2020-11-02 16:06 ` Ludovic Courtès
2020-11-02 18:52 ` Miguel Ángel Arruga Vivas
2020-11-03 9:26 ` Ludovic Courtès
2020-10-24 21:13 ` bug#44196: [PATCH 3/3] gnu: grub: Add output locale Miguel Ángel Arruga Vivas
2020-10-25 10:04 ` bug#44196: [PATCH 3/3 v2] gnu: grub: Add locale output Miguel Ángel Arruga Vivas
2020-10-26 22:04 ` bug#44196: [PATCH 3/3 v3] system: Do not depend on locale folder generated by grub-install Miguel Ángel Arruga Vivas
2020-10-28 21:34 ` bug#44196: [PATCH v4 3/4] system: Do not depend on locale folder generated by Miguel Ángel Arruga Vivas
2020-10-30 18:13 ` bug#44196: [PATCH v5 " Miguel Ángel Arruga Vivas
2020-10-30 21:45 ` bug#44196: [PATCH v6 " Miguel Ángel Arruga Vivas
2020-10-31 21:44 ` Ludovic Courtès
2020-11-01 0:36 ` Miguel Ángel Arruga Vivas
2020-10-26 22:29 ` Miguel Ángel Arruga Vivas [this message]
2020-10-30 19:35 ` bug#44196: [PATCH 4/3] system: Fix dependency for grub.cfg generation Danny Milosavljevic
2020-10-30 21:38 ` Miguel Ángel Arruga Vivas
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
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87mu08oc3a.fsf@gmail.com \
--to=rosen644835@gmail.com \
--cc=44196@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 public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).