From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id aLoOJM8psmMPGAAAbAwnHQ (envelope-from ) for ; Mon, 02 Jan 2023 01:48:15 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id 6OwWI88psmMGgQEAG6o9tA (envelope-from ) for ; Mon, 02 Jan 2023 01:48:15 +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 524B49BEB for ; Mon, 2 Jan 2023 01:48:15 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pC8zn-0002VL-6a; Sun, 01 Jan 2023 19:48:07 -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 1pC8zk-0002RK-Tg for guix-patches@gnu.org; Sun, 01 Jan 2023 19:48:04 -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 1pC8zj-0004gQ-7C for guix-patches@gnu.org; Sun, 01 Jan 2023 19:48:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pC8zj-0007MZ-3v for guix-patches@gnu.org; Sun, 01 Jan 2023 19:48:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH v3 09/11] gnu: u-boot-sifive-unmatched: Use gexps and remove inputs. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Jan 2023 00:48:03 +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 Received: via spool by 60224-submit@debbugs.gnu.org id=B60224.167262043228079 (code B ref 60224); Mon, 02 Jan 2023 00:48:03 +0000 Received: (at 60224) by debbugs.gnu.org; 2 Jan 2023 00:47:12 +0000 Received: from localhost ([127.0.0.1]:42097 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC8yt-0007Ip-Pr for submit@debbugs.gnu.org; Sun, 01 Jan 2023 19:47:12 -0500 Received: from mail-qt1-f181.google.com ([209.85.160.181]:44667) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC8yl-0007Fb-OH for 60224@debbugs.gnu.org; Sun, 01 Jan 2023 19:47:10 -0500 Received: by mail-qt1-f181.google.com with SMTP id c11so21453266qtn.11 for <60224@debbugs.gnu.org>; Sun, 01 Jan 2023 16:47:03 -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=kl4YmHHu4tQ52Yx51BWGoML4i4gSKW8uYkp8la5Wzrg=; b=Z7sktAwRRy+MGFyVB/mXr2iPobDJMWAUZB4v8Y1sRYgjJ3hcLwjXGpJMWMavNaJh8t qJliMWgH6iP80JvihH74yfpz7kl5P/nb0gZVIodg49d3T5i2c4Dcx35pP0AQjsqWtSie sRTfi99m2Opj2qo/fFMefvv2nZgZ5qm0iptweQ6YzxO0Cm6rf6WeL6J32KX6b03/Yixb 2WENvGzKlwTxyLvYCridKnn08N7Cm40lObAYjxXPic6mMARbKG/8KnloVgGRj6czT4g0 4Fc3Hflt5pe3WR4xDZajit959e7O/WZaPDNqBp17owRHgL4bIFtzsDxPxX9EREB2UxNf ZcnA== 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=kl4YmHHu4tQ52Yx51BWGoML4i4gSKW8uYkp8la5Wzrg=; b=seO0imL19DnyARKF79NwuftDIclR7QM7KtwyUogpBYnZlaYZc/jy7leo9MaalGS3nc uIix1Y/0PTd9NvxGMG20Xor7DOB+s0sPMcBLHuCv+SL7TQ+JPwJINSgGchkVI+IDmsf9 Ue4i7kCvSK/WHPiclusLxBWQqK8tXDMvmDctnTiYDvIcSylZ3c4BvGs72KuqE6KAs9sJ jJz5oe66QHlG9mVsdr2/xFOp6h5I1KwVnJ0yJjNj0c13Ls6ECaVS03AMAS4SI/2Eng0K FMN0Kfkh0qACns76h6/7aaLglIf0FcI7euhvfULx+CSKeOtF+CJA7KwOKzDcit8K3j72 YiZg== X-Gm-Message-State: AFqh2krabuY0L83iOqaAUXL12n0jeiWBGbTcU8L/iLEDFMUzPvcLK+2w 3coHKxRB4BoFjMb6i+5a0ScvK+SSF6Eorw== X-Google-Smtp-Source: AMrXdXtmfsXc4Uq5AreVdKTc1g9iGK3iF2IC7V3oEoy9Jl8kIHCp+Jc0TjoxMtVZcLMf1C0mskKr0Q== X-Received: by 2002:ac8:140e:0:b0:3a6:a7a2:57b with SMTP id k14-20020ac8140e000000b003a6a7a2057bmr50473671qtj.6.1672620418216; Sun, 01 Jan 2023 16:46:58 -0800 (PST) Received: from localhost.localdomain (dsl-10-148-224.b2b2c.ca. [72.10.148.224]) by smtp.gmail.com with ESMTPSA id h24-20020ac87458000000b003a7ef7a758dsm16788311qtr.59.2023.01.01.16.46.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Jan 2023 16:46:57 -0800 (PST) From: Maxim Cournoyer Date: Sun, 1 Jan 2023 19:46:34 -0500 Message-Id: <20230102004637.3920-9-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230102004637.3920-1-maxim.cournoyer@gmail.com> References: <20230102004637.3920-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-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1672620495; 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=kl4YmHHu4tQ52Yx51BWGoML4i4gSKW8uYkp8la5Wzrg=; b=btIL1VRxj7OcJAVJcPB30Xrbk4mQAsoRbqHV5Lc4NCH42LHBj+IZgyFtEYf8MSfvLhvOq2 SsgceC+ZAbt7CgkVKn5jYCaettqaMLNC8BM3csBASfUqYua+OUkZEFU3o0oTVKUvS3o/sD Po+OFN5KOOo0WlNJ7obVwrGwQpdmp8vmqhjJ8OJpKgL0z8BVTwAp8BA9uZTCt0shznwdhp rMAKVZkvtVX1xwELnss66KxYnvQ546lLwglJMUH5SF1W7KI9fsyV2JZe3tuGLf5UMsTOIh 5OZ2KWkdq7N9Bt4otgyrT9ck/iV4PMYzquX3eMhYvs5X4Y/IdV5yJr2lm+qmgQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=Z7sktAwR; 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=1672620495; a=rsa-sha256; cv=none; b=qrKHmSn/smJCt06VsEkYTC/qUsLNhXPhzlMRt8zllSuDMwbXPnopcDxXEsVwyGNch03YJt eIWHnvi8CWcpWWvrsnKENgCVXgn2Hz0XjxEylg17Ysvj4ehqoZ0cnJ5s5Bp+UurZfLPmI7 kDZvbIIoUzA9Lve0au/1bkVvmw3okqilNxXWp/QYux6LWgjmwfzSReY0IDcN6B0eI3hDXu I0Q41LrWMRvMvGSuF9ONpE2GOplwsPj4Hnh7urNdwtHUXpdd03DlYgrkuICLE/e77nxFIK VA4xERl0lMqBtfg/mxNl359U+dguLVJ2uIMJdqCxy1h+wbxItQo0Qx8EopJk7A== X-Spam: Yes X-Migadu-Queue-Id: 524B49BEB X-Migadu-Spam: Yes X-Spam-Score: 6.45 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=Z7sktAwR; 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-Scanner: scn1.migadu.com X-Migadu-Spam-Score: 6.45 X-TUID: DLTZ51eFFNFs * 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 d1c04db66a..960c5b4a88 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1124,15 +1124,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