From patchwork Fri May 3 12:27:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miguel Arruga Vivas X-Patchwork-Id: 13844 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 DE31216F8D; Fri, 3 May 2019 13:30:44 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 19CF416F8B for ; Fri, 3 May 2019 13:30:41 +0100 (BST) Received: from localhost ([127.0.0.1]:39934 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMXKq-0000VU-NB for patchwork@mira.cbaines.net; Fri, 03 May 2019 08:30:40 -0400 Received: from eggs.gnu.org ([209.51.188.92]:48943) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMXKM-0000Df-K8 for guix-patches@gnu.org; Fri, 03 May 2019 08:30:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMXKG-0004bp-Vy for guix-patches@gnu.org; Fri, 03 May 2019 08:30:10 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34446) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hMXKF-0004a9-4d for guix-patches@gnu.org; Fri, 03 May 2019 08:30:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hMXKE-00054t-Vs for guix-patches@gnu.org; Fri, 03 May 2019 08:30:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35394] [PATCH 3/4] gnu: grub: Add locale output for bootloading. Resent-From: Miguel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 May 2019 12:30:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35394 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35394@debbugs.gnu.org Received: via spool by 35394-submit@debbugs.gnu.org id=B35394.155688657119431 (code B ref 35394); Fri, 03 May 2019 12:30:02 +0000 Received: (at 35394) by debbugs.gnu.org; 3 May 2019 12:29:31 +0000 Received: from localhost ([127.0.0.1]:47984 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMXJj-00053L-65 for submit@debbugs.gnu.org; Fri, 03 May 2019 08:29:31 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:35218) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMXJh-000532-Fj for 35394@debbugs.gnu.org; Fri, 03 May 2019 08:29:30 -0400 Received: by mail-wr1-f66.google.com with SMTP id h15so1955886wrb.2 for <35394@debbugs.gnu.org>; Fri, 03 May 2019 05:29:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:subject:message-id:in-reply-to:references:mime-version; bh=fq6V3O3sEgZXS4Rb4uJ25ds2dhN36wdjT1SN6+VqbJM=; b=Y60M4R1NN42z0b1nOt5fWaT3Wae3v1TyS0FKR8yM2dn09HdpWjcO0DTbNEy/ouL0VC ZQaPuXl0qxQzqYGO/EgSECqoznuCrUzTv6BdGvaui0Yo1dkpV3IOa7cSXgv4Md2AGY/M 3HQbvpCDegGOXicevDP5ttrHlqvPz8rToT68DKBrlW6adWcPgKQ9Vm8XykOw2wESuidR YLcJHcsvYWwCN9TBlcj4XcEKSBpU4EJyehoR0OBOYBD0Ss94Qo70D4l5UsrxUQ/ncoih KXcF/Mdgqs37864bn6G4wnuIsPDaMhhTBaMzXBxCJFv1uiEFfq2+AvjZLWhVq4OK3Z8I +tYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:subject:message-id:in-reply-to :references:mime-version; bh=fq6V3O3sEgZXS4Rb4uJ25ds2dhN36wdjT1SN6+VqbJM=; b=j5jMbq/5yHH3544zgM8vm2NaXEB2dHY0GNzQryGYlDAL3BZ1MCdchteQxly9fb96Y7 oiOmdAndxfB6gz1cBVAkzoSoz24kxRX252UTDjf+ZzRh1bZkx65/1RwnyWvs15PGlSuB bZR+STtxaSHu1xR9OUbSt20DFNFqM6giqI1T6c9PwLoU7Vp+Zbp3AYtWergOgvm5bkEu tS30afpiCLEzcgs3M8vApK7iWRsSOsFZmtwB/RWZvDgdCJFIdXTyEm4Qw25sKma9bXJ2 vnf57NqquLc0urtLgCd1vozB3QdLPlEXpz2Vn9HZ4mZd/wLHYZ7hevXNHCRmvndHPZEO d0kQ== X-Gm-Message-State: APjAAAVqje0VMHrFeP/MlZhhWF8SCAb1mk1QhvH70NDmmUVJeGvB0yoa FYCT2VlFuT8lRwK8iEBxjJ2gJjLzQ04= X-Google-Smtp-Source: APXvYqz/FDCEUkThDcoy+V3N5Pb2S3I50+Urmwok24arhSUB3zP5C9vgetkSd7rBiKOZA9nzUSVL+w== X-Received: by 2002:adf:eb0c:: with SMTP id s12mr6459744wrn.229.1556886563797; Fri, 03 May 2019 05:29:23 -0700 (PDT) Received: from localhost (19.49.134.37.dynamic.jazztel.es. [37.134.49.19]) by smtp.gmail.com with ESMTPSA id u64sm3697907wmg.23.2019.05.03.05.29.23 for <35394@debbugs.gnu.org> (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 03 May 2019 05:29:23 -0700 (PDT) Date: Fri, 3 May 2019 14:27:12 +0200 From: Miguel Message-ID: <20190503142712.5604f83f@gmail.com> In-Reply-To: <20190426125041.4bd524e0@gmail.com> References: <20190426125041.4bd524e0@gmail.com> X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; x86_64-unknown-linux-gnu) MIME-Version: 1.0 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: 209.51.188.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 Last patches contain a couple of problems, unbound variables are fixed in the attached patch. Commit message has been reworded. ----- gnu: grub: Add locale output. * gnu/packages/bootloaders.scm (grub): Add new phase 'install-locale-folder to generate new output used for bootloader localization. --- gnu/packages/bootloaders.scm | 33 +++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) From d8462c2b980eb8fc5eff3d97292bffea63a89ea9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20=C3=81ngel=20Arruga=20Vivas?= Date: Fri, 26 Apr 2019 11:56:43 +0200 Subject: [PATCH 3/4] gnu: grub: Add locale output. * gnu/packages/bootloaders.scm (grub): Add new phase 'install-locale-folder to generate new output used for bootloader localization. --- gnu/packages/bootloaders.scm | 33 +++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 6e6e69ff3b..71411ca954 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -94,7 +94,10 @@ "grub-efi-fat-serial-number.patch")))) (build-system gnu-build-system) (arguments - `(#:phases (modify-phases %standard-phases + `(#:modules ((ice-9 ftw) + (guix build utils) + (guix build gnu-build-system)) + #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-stuff (lambda* (#:key inputs #:allow-other-keys) (substitute* "grub-core/Makefile.in" @@ -127,7 +130,30 @@ (substitute* "Makefile.in" (("grub_cmd_date grub_cmd_set_date grub_cmd_sleep") "grub_cmd_date grub_cmd_sleep")) - #t))) + #t)) + (add-after 'install 'install-locale-folder + (lambda* (#:key outputs #:allow-other-keys) + ;; XXX: Better checks are needed here + (define (lang? file) + (not (or (string=? file ".") (string=? file "..")))) + (define (make-lang-installer to) + (lambda (in-file stat flag) + (if (eq? flag 'regular) + (copy-file in-file to) + #t))) + + (let* ((out (assoc-ref outputs "out")) + (locale (string-append out "/share/locale")) + (langs (scandir locale lang?)) + (locale-out (assoc-ref outputs "locale"))) + (mkdir-p locale-out) + (for-each (lambda (lang) + (let ((from (string-append locale "/" lang)) + (to (string-append locale-out "/" + lang ".mo"))) + (ftw from (make-lang-installer to)))) + langs) + #t)))) ;; Disable tests on ARM and AARCH64 platforms. #:tests? ,(not (any (cute string-prefix? <> (or (%current-target-system) (%current-system))) @@ -183,6 +209,7 @@ ("parted" ,parted) ("qemu" ,qemu-minimal-2.10) ("xorriso" ,xorriso))) + (outputs '("out" "locale")) (home-page "https://www.gnu.org/software/grub/") (synopsis "GRand Unified Boot loader") (description @@ -249,8 +276,6 @@ menu to select one of the installed operating systems.") ,@(package-inputs grub-efi))) (arguments (substitute-keyword-arguments (package-arguments grub-efi) - ((#:modules modules `((guix build utils) (guix build gnu-build-system))) - `((ice-9 ftw) ,@modules)) ((#:phases phases) `(modify-phases ,phases (add-after 'install 'install-non-efi -- 2.21.0