From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id aCJqCw9Ol19AYwAA0tVLHw (envelope-from ) for ; Mon, 26 Oct 2020 22:30:39 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id sPwyBw9Ol184NgAAB5/wlQ (envelope-from ) for ; Mon, 26 Oct 2020 22:30:39 +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 C06D19400BF for ; Mon, 26 Oct 2020 22:30:38 +0000 (UTC) Received: from localhost ([::1]:45900 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kXB0f-0001OJ-HM for larch@yhetil.org; Mon, 26 Oct 2020 18:30:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45590) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kXB0B-00018i-D0 for bug-guix@gnu.org; Mon, 26 Oct 2020 18:30:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58558) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kXB07-0000dX-2J for bug-guix@gnu.org; Mon, 26 Oct 2020 18:30:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kXB06-0008WG-VH for bug-guix@gnu.org; Mon, 26 Oct 2020 18:30:02 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#44196: [PATCH 4/3] system: Fix dependency for grub.cfg generation. Resent-From: Miguel =?UTF-8?Q?=C3=81ngel?= Arruga Vivas Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Mon, 26 Oct 2020 22:30: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: 44196@debbugs.gnu.org Received: via spool by 44196-submit@debbugs.gnu.org id=B44196.160375138032688 (code B ref 44196); Mon, 26 Oct 2020 22:30:02 +0000 Received: (at 44196) by debbugs.gnu.org; 26 Oct 2020 22:29:40 +0000 Received: from localhost ([127.0.0.1]:41871 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kXAzj-0008V9-SD for submit@debbugs.gnu.org; Mon, 26 Oct 2020 18:29:40 -0400 Received: from mail-wr1-f47.google.com ([209.85.221.47]:43617) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kXAzh-0008Us-Hs for 44196@debbugs.gnu.org; Mon, 26 Oct 2020 18:29:37 -0400 Received: by mail-wr1-f47.google.com with SMTP id g12so14725663wrp.10 for <44196@debbugs.gnu.org>; Mon, 26 Oct 2020 15:29:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:references:date:in-reply-to:message-id:user-agent :mime-version; bh=WJ1qzwQh4JyoRqNuSsDQxVut5Na13osBqJ2XgzTpWas=; b=efIcgBhJzg+bokG6n2tD7RFd0VzuYsWYvan9qezrPbRIdJ4Dwtzkn1Qfn459mhE/Uz Ep7oU5Iv5Mzt4DpsrEWJehgohdGWgTbNYawaKMv0tPkcaH5z6/u7+ruXydo5ZbJM4hbV tlUyAsE/3wG25LRwoDsAcWdopN08uYw+j+ra9JMCzqu/YSl1y7yS9Vy3fQ5McWCArUIq tA88kcfgOau5DlxmUlz+8XEqlV1nkHAht/aQJ2Nu8o9YMgTiI+Na48BH8ak0BqqZtFG6 G4s6HJXZEbJv4hQaia8T5v8YqnYKLu24r5d3nz2W3WbZAtjRLN7YVAmVkEub95lj/JbZ rm7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=WJ1qzwQh4JyoRqNuSsDQxVut5Na13osBqJ2XgzTpWas=; b=I/VgnVKgNnrQ/c/2+oq34xYTkjPsv+nE2Wog4k0hAKF+LEJorReKnDJKspjbm/HlV5 rJZ3hwq/58SXPpZEdYX3fJTtWOUh+BeQUPHN6qcAiyWkL129Mojll0suySbS7KycxzaR UjMYNso84H3IlHiqfZa3OAkn7/nDUtkGG7XSF1rJfKSAoa6Qz6DUIKKoHMFiuc2eM/Dg QEo+4LzJCwp30OCDUFb68SvOH00J4JYx9rR8qLdxBvWkWd5QZrj6baGkg+VtHnN01ttJ dCkT1fUfntuEQQs/igxzZWNlcWWdvj2cU/QOYkKEEqteBEzG3lLQzR+mHU2w62uc5S7/ lEqw== X-Gm-Message-State: AOAM533JkFrp8T+cRBv/wUjQ/A3BAj25i0r1w2i236c/TIy1b4+sieFd uLhfpjHtKDAsIyMhyK3gnf9WbVYoOVkADg== X-Google-Smtp-Source: ABdhPJxmD2eTUpv5PPJKEQcC3M552Ftmf5nDM8krScEz8kftGLwG0FKcuTThQKCnBEx3+REe+nTDZw== X-Received: by 2002:a5d:458c:: with SMTP id p12mr19978679wrq.329.1603751371475; Mon, 26 Oct 2020 15:29:31 -0700 (PDT) Received: from unfall (218.139.134.37.dynamic.jazztel.es. [37.134.139.218]) by smtp.gmail.com with ESMTPSA id n9sm26595303wrq.72.2020.10.26.15.29.30 for <44196@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Oct 2020 15:29:30 -0700 (PDT) From: Miguel =?UTF-8?Q?=C3=81ngel?= Arruga Vivas References: <878sbvh5j4.fsf@gmail.com> Date: Mon, 26 Oct 2020 23:29:29 +0100 In-Reply-To: <878sbvh5j4.fsf@gmail.com> ("Miguel =?UTF-8?Q?=C3=81ngel?= Arruga Vivas"'s message of "Sat, 24 Oct 2020 19:56:15 +0200") Message-ID: <87mu08oc3a.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: 0.2 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -0.8 (/) X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=gmail.com header.s=20161025 header.b=efIcgBhJ; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); 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: 0.09 X-TUID: ydOmlZtSmo+8 --=-=-= Content-Type: text/plain 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. --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=v3-0004-system-Fix-dependency-for-grub.cfg-generation.patch Content-Description: 0004-system-Fix-dependency-for-grub.cfg-generation.patch >From ae2d83f91d522b5b0edfe1abbe88dec0a797235c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20=C3=81ngel=20Arruga=20Vivas?= 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 --=-=-=--