From: "Miguel Ángel Arruga Vivas" <rosen644835@gmail.com>
To: "Ludovic Courtès" <ludo@gnu.org>
Cc: 44196@debbugs.gnu.org
Subject: bug#44196: [PATCH v6 3/4] system: Do not depend on locale folder generated by
Date: Sun, 01 Nov 2020 01:36:38 +0100 [thread overview]
Message-ID: <87tuu93obt.fsf@gmail.com> (raw)
In-Reply-To: <875z6qt6i2.fsf@gnu.org> ("Ludovic Courtès"'s message of "Sat, 31 Oct 2020 22:44:53 +0100")
¡Hola, Ludo!
Thanks for your comments. Reviewing them I found some more issues that
I address inline:
Ludovic Courtès <ludo@gnu.org> writes:
> Miguel Ángel Arruga Vivas <rosen644835@gmail.com> skribis:
>
>> From 5886bdf74bda59649b3d17b691132d9d030e0fb4 Mon Sep 17 00:00:00 2001
>> From: =?UTF-8?q?Miguel=20=C3=81ngel=20Arruga=20Vivas?=
>> <rosen644835@gmail.com>
>> Date: Sat, 24 Oct 2020 20:36:21 +0200
>> Subject: [PATCH] system: Do not depend on locale folder generated by
>> grub-install.
I've changed the title to "system: Generate grub locale directory for
grub.cfg.", which is positive, shorter and more descriptive. I have to
work on my communicative skills a lot...
>>
>> * gnu/bootloader/grub.scm (define-module): Use (guix packages).
This was a leftover from the modification of Grub itself instead of
using computed-file and not needed anymore, removed.
>> (grub-locale-folder): New computed folder.
>> (grub-configuration-file)[locale-config]: Use grub-locale-folder only when a
>> locale is needed.
Changed with the new names and added an explanation about the search.
>
> [...]
>
>> +(define (grub-locale-folder grub)
>> + "Generate a folder with the locales from GRUB."
>
> s/folder/directory/ :-)
Applied, both in the function name and the documentation string.
>> + (define builder
>> + #~(begin
>> + (use-modules (ice-9 ftw))
>> + (let ((locale (string-append #$grub "/share/locale"))
>> + (out #$output))
>> + (mkdir out)
>> + (chdir out)
>> + (for-each (lambda (lang)
>> + (let ((file (string-append locale "/" lang
>> + "/LC_MESSAGES/grub.mo"))
>> + (dest (string-append lang ".mo")))
>> + (when (file-exists? file)
>> + (copy-file file dest))))
>> + (scandir locale)))))
>> + (computed-file "grub-boot-locale" builder))
>
> Maybe just “grub-locales”?
This name sounds right, applied too. :-)
>> + (let* ((entry (first all-entries))
>> + (device (menu-entry-device entry))
>> + (mount-point (menu-entry-device-mount-point entry))
>> + (bootloader (bootloader-configuration-bootloader config))
>> + (grub (bootloader-package bootloader))
>> + (locale-dir (normalize-file (grub-locale-folder grub)
>> + mount-point
>> + store-directory-prefix)))
>
> Nitpick: maybe s/locale-dir/locales/
Applied too, but I moved this call from the let* to ...
>> + #~(let ((locale #$(and locale
>> + (locale-definition-source
>> + (locale-name->definition locale))))
>> + (locale-dir #$(and locale locale-dir)))
... here, to avoid the generation when there is no locale, which
shouldn't be a common use case, but it shouldn't depend on the
generation of that directory because it won't be used.
>> + (when locale
>> + (format port "\
>> # Localization configuration.
>> -if search --file --set boot_partition /grub/grub.cfg; then
>> - set locale_dir=(${boot_partition})/grub/locale
>> -else
>> - set locale_dir=/boot/grub/locale
>> -fi
>> -set lang=~a~%" locale))))
>> +~asearch --file --set ~a/en@quot.mo
>> +set locale_dir=~a
>> +set lang=~a~%"
>
> Otherwise LGTM, thanks!
Thank you again for the review. Pushed as
f445bc65764ffad2ae9f3b382ddb8feb4eeea2fb with these fixes, after running
again make check and a subset of make check-system.
Happy hacking!
Miguel
next prev parent reply other threads:[~2020-11-01 0:37 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 [this message]
2020-10-26 22:29 ` bug#44196: [PATCH 4/3] system: Fix dependency for grub.cfg generation Miguel Ángel Arruga Vivas
2020-10-30 19:35 ` 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=87tuu93obt.fsf@gmail.com \
--to=rosen644835@gmail.com \
--cc=44196@debbugs.gnu.org \
--cc=ludo@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).