From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 6HOCAz3bnV9FNwAA0tVLHw (envelope-from ) for ; Sat, 31 Oct 2020 21:46:37 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id 0JjoOjzbnV+PWwAAbx9fmQ (envelope-from ) for ; Sat, 31 Oct 2020 21:46:36 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 3C5879403CC for ; Sat, 31 Oct 2020 21:46:36 +0000 (UTC) Received: from localhost ([::1]:39500 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kYyhl-0001B1-Vh for larch@yhetil.org; Sat, 31 Oct 2020 17:46:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41980) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kYyhG-0001AU-CN for bug-guix@gnu.org; Sat, 31 Oct 2020 17:46:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51437) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kYyhG-0000bT-3U for bug-guix@gnu.org; Sat, 31 Oct 2020 17:46:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kYyhG-0005XH-2B for bug-guix@gnu.org; Sat, 31 Oct 2020 17:46:02 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#44196: [PATCH v6 3/4] system: Do not depend on locale folder generated by Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Sat, 31 Oct 2020 21:46:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44196 X-GNU-PR-Package: guix X-GNU-PR-Keywords: patch To: Miguel =?UTF-8?Q?=C3=81ngel?= Arruga Vivas Received: via spool by 44196-submit@debbugs.gnu.org id=B44196.160418070521182 (code B ref 44196); Sat, 31 Oct 2020 21:46:02 +0000 Received: (at 44196) by debbugs.gnu.org; 31 Oct 2020 21:45:05 +0000 Received: from localhost ([127.0.0.1]:34744 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kYygK-0005Va-Qd for submit@debbugs.gnu.org; Sat, 31 Oct 2020 17:45:05 -0400 Received: from eggs.gnu.org ([209.51.188.92]:41496) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kYygJ-0005Ul-6A for 44196@debbugs.gnu.org; Sat, 31 Oct 2020 17:45:03 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:44034) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kYygD-0000J4-S3; Sat, 31 Oct 2020 17:44:57 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=46210 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kYygA-0007aT-Jf; Sat, 31 Oct 2020 17:44:57 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <878sbvh5j4.fsf@gmail.com> <87tuujfhum.fsf@gmail.com> <87imay7hax.fsf_-_@gmail.com> <87y2jsod97.fsf_-_@gmail.com> <87v9eum3w2.fsf_-_@gmail.com> <87mu0360qt.fsf_-_@gmail.com> <87a6w35qx2.fsf_-_@gmail.com> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 10 Brumaire an 229 de la =?UTF-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Sat, 31 Oct 2020 22:44:53 +0100 In-Reply-To: <87a6w35qx2.fsf_-_@gmail.com> ("Miguel =?UTF-8?Q?=C3=81ngel?= Arruga Vivas"'s message of "Fri, 30 Oct 2020 22:45:29 +0100") Message-ID: <875z6qt6i2.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -3.3 (---) X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: 44196@debbugs.gnu.org Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Scanner: ns3122888.ip-94-23-21.eu Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Spam-Score: -1.51 X-TUID: Cle7EhiVra9t =C2=A1Hola! Miguel =C3=81ngel Arruga Vivas skribis: > From 5886bdf74bda59649b3d17b691132d9d030e0fb4 Mon Sep 17 00:00:00 2001 > From: =3D?UTF-8?q?Miguel=3D20=3DC3=3D81ngel=3D20Arruga=3D20Vivas?=3D > > Date: Sat, 24 Oct 2020 20:36:21 +0200 > Subject: [PATCH] system: Do not depend on locale folder generated by > grub-install. > > * gnu/bootloader/grub.scm (define-module): Use (guix packages). > (grub-locale-folder): New computed folder. > (grub-configuration-file)[locale-config]: Use grub-locale-folder only whe= n a > locale is needed. [...] > +(define (grub-locale-folder grub) > + "Generate a folder with the locales from GRUB." s/folder/directory/ :-) > + (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 =E2=80=9Cgrub-locales=E2=80=9D? > + (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/ > + #~(let ((locale #$(and locale > + (locale-definition-source > + (locale-name->definition locale)))) > + (locale-dir #$(and locale locale-dir))) > + (when locale > + (format port "\ > # Localization configuration. > -if search --file --set boot_partition /grub/grub.cfg; then > - set locale_dir=3D(${boot_partition})/grub/locale > -else > - set locale_dir=3D/boot/grub/locale > -fi > -set lang=3D~a~%" locale)))) > +~asearch --file --set ~a/en@quot.mo > +set locale_dir=3D~a > +set lang=3D~a~%" Otherwise LGTM, thanks! Ludo=E2=80=99.