From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id KJFiOUbExGOnOgEAbAwnHQ (envelope-from ) for ; Mon, 16 Jan 2023 04:28:07 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id 0BxcOUbExGOgzwAA9RJhRA (envelope-from ) for ; Mon, 16 Jan 2023 04:28:06 +0100 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 C0F3039382 for ; Mon, 16 Jan 2023 04:28:06 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pHG9N-0000I7-IV; Sun, 15 Jan 2023 22:27:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pHG9K-0000GO-Ak for guix-patches@gnu.org; Sun, 15 Jan 2023 22:27:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pHG9K-0005pk-3I for guix-patches@gnu.org; Sun, 15 Jan 2023 22:27:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pHG9J-0007te-VA for guix-patches@gnu.org; Sun, 15 Jan 2023 22:27:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH v5 10/13] gnu: u-boot-sifive-unmatched: Use gexps and remove inputs labels. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 16 Jan 2023 03:27:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60224 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60224@debbugs.gnu.org Cc: rekado@elephly.net, Maxim Cournoyer , vagrant@reproducible-builds.org Received: via spool by 60224-submit@debbugs.gnu.org id=B60224.167383958230206 (code B ref 60224); Mon, 16 Jan 2023 03:27:05 +0000 Received: (at 60224) by debbugs.gnu.org; 16 Jan 2023 03:26:22 +0000 Received: from localhost ([127.0.0.1]:60072 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG8c-0007r7-Bf for submit@debbugs.gnu.org; Sun, 15 Jan 2023 22:26:22 -0500 Received: from mail-qv1-f53.google.com ([209.85.219.53]:43808) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG8Q-0007pN-Fw for 60224@debbugs.gnu.org; Sun, 15 Jan 2023 22:26:11 -0500 Received: by mail-qv1-f53.google.com with SMTP id q10so18842052qvt.10 for <60224@debbugs.gnu.org>; Sun, 15 Jan 2023 19:26:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=m3ZLRnoLsifWGrkuPUdFtG8Hl0S8tCPx9NArDSxJaPw=; b=nrVQPO5ttOHtEXwtGnQdK/dAFHiI50WGT/XeKwQ3iruxNgvYs9s/7kZqpML7r3Bzqo cAiBAcKNAaBmV4itCg19lUgbgJoQ9gdrec5W5xVwPBM9xpjDVCY19bf5EIyhX/miuimf Ka49x0Rxvp2zXiqBHiE4r7rXv4fqdTBkDZz9xnzS9/tIzIzDjBBoXq5qGymEJsd14jBm nh+5Df+Vow7Cb78/UDGZBoEwBcRW7Le3Y+CEnHIaMALM2v8IOVFsoV5mbfRPiC5W1uvy VBDhParB85ex7FKqWoZcm1xI258NXronKtYBiGUuwU/bJ3k/oj3roycMg6JYjcoZCeCl L5Lw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=m3ZLRnoLsifWGrkuPUdFtG8Hl0S8tCPx9NArDSxJaPw=; b=ZajWq5gUHzginDWHpDYIvs/J9e7WMytO0Gojnl0Pvorekn5h8LO425iIKgCe+ojDBj 4p18BrFWbocVWi5KEcYd9/I1G7hrVgEg0hvNRPQq0vvhYUeCVYqcTeOF0NmBMNwdTA4y G1Ig66CntI+c/AbOydI3Esp3hxJfgR4DhvpifrEMKTKTC13GM3aEAR1WpE6egsyXv8Qa 1cmS2XeTIBbK/7bjGGa5zrVWgHGcKsUOVp+0Ef++T5/7tkYLWrEEEm5S4aY9qS1Q8IeM gZDHTkd7wr5xhpwR99pFq2iCiECs7c6ius+4sXHwF/GO3jtnaCqHBDHbX78Y9elS1tXR wWCQ== X-Gm-Message-State: AFqh2korX8Phdf6lE8cV0r9p0iTkFZ0UG6cOA/t3d7gFqdMAdU7tu5gP Bz2nbjFISk5H40FYxyhQzhMoeifSsw7DPnlO X-Google-Smtp-Source: AMrXdXvyfsDc3vV1tB6XjRVX2DLfRz+Vpz5V5p8Tn3/JNpgqGOkRI8WumwOsC0sO8rsuA8gJlspaQg== X-Received: by 2002:a0c:f688:0:b0:532:d40:1eb0 with SMTP id p8-20020a0cf688000000b005320d401eb0mr59972966qvn.30.1673839564926; Sun, 15 Jan 2023 19:26:04 -0800 (PST) Received: from localhost.localdomain (dsl-10-130-209.b2b2c.ca. [72.10.130.209]) by smtp.gmail.com with ESMTPSA id bi1-20020a05620a318100b006fb0e638f12sm17474636qkb.4.2023.01.15.19.26.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Jan 2023 19:26:04 -0800 (PST) From: Maxim Cournoyer Date: Sun, 15 Jan 2023 22:25:41 -0500 Message-Id: <20230116032544.1378-10-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230116032544.1378-1-maxim.cournoyer@gmail.com> References: <20230116032544.1378-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=nrVQPO5t; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1673839686; a=rsa-sha256; cv=none; b=UHUFgea4fAF/WZnDw8NHlHxX5eCFrOuv1LNiqv+gS6nX1EoKBwNyfgfW7f/FHOwPPbkMpj 48hMP/LzqOxG12iaF+JkW7lGvcgCr069Hz07VbL7mFYC4XSg7aCYLcOLFfpyWKawULSYK4 bJ5zue9kik6dZGiakHuPvWpjMnNNqxjeMbymVjaUe5n5/5d498tlL40Mpcy4B4mCYF0Rrb f6ki80apsT2q6MHg4wRhP8Kc7T/82kl6FPFW/1m43wBDrvB8Z2iX7WjXqaqlR4BE5/YLuM AQdcAj5gwhhymFyFx8jqB1Lrvx28FHcqSvsZVHBJv7DJsmr+HGFeH89rBQguqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1673839686; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=m3ZLRnoLsifWGrkuPUdFtG8Hl0S8tCPx9NArDSxJaPw=; b=NQ5GnuOBD9aTeo9Pod26C4fKceGKtzpJcdgnCTN+EojrO8Gq5F0MFJC7awyafWhENQo+53 HMWC90kSDIbmBrJibCBMsaaWZP/S2dYZgr4ETjw8ATVaBLeG6NRuma0xYKjY0PAY9Tt2mS HPaLPjox0uHK4ZRD0VozvMyKHHI82oUEYbeVxET5vgF3WkuIw66WzMh7Ggf9+BL8usKyyf Jmc+Ey8ZncUqc/MovSmmN3pbSXJwifBZKea/ZU8MZcxMp4J6tjQaeJhXcbYVGxNpDsHa+F C/ykPVqZ9ff57abbdnxFkQ+nDXAOIMKr9CKBpnCjnfLC82j38HUI34/C7z2rNw== X-Migadu-Queue-Id: C0F3039382 X-Migadu-Scanner: scn0.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=nrVQPO5t; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) X-Migadu-Spam-Score: -0.82 X-Spam-Score: -0.82 X-TUID: 26sneK5wFpw7 * gnu/packages/bootloaders.scm (u-boot-sifive-unmatched) [arguments]: Use gexps. Use search-input-file. [inputs]: Remove labels. Use modify-inputs. --- (no changes since v1) gnu/packages/bootloaders.scm | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 64af453844..d9f9672f77 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1119,15 +1119,14 @@ (define-public u-boot-sifive-unmatched (arguments (substitute-keyword-arguments (package-arguments base) ((#:phases phases) - `(modify-phases ,phases - (add-after 'unpack 'set-environment - (lambda* (#:key inputs #:allow-other-keys) - (let ((opensbi (string-append (assoc-ref inputs "firmware") - "/fw_dynamic.bin"))) - (setenv "OPENSBI" opensbi)))))))) + #~(modify-phases #$phases + (add-after 'unpack 'set-environment + (lambda* (#:key inputs #:allow-other-keys) + (setenv "OPENSBI" (search-input-file inputs + "fw_dynamic.bin")))))))) (inputs - `(("firmware" ,opensbi-generic) - ,@(package-inputs base)))))) + (modify-inputs (package-inputs base) + (append opensbi-generic)))))) (define-public u-boot-rock64-rk3328 (let ((base (make-u-boot-package "rock64-rk3328" "aarch64-linux-gnu"))) -- 2.38.1