From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.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 IH5bLjogv2MGSQEAbAwnHQ (envelope-from ) for ; Wed, 11 Jan 2023 21:46:50 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id mLjLLjogv2P0DgEA9RJhRA (envelope-from ) for ; Wed, 11 Jan 2023 21:46:50 +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 2A54023213 for ; Wed, 11 Jan 2023 21:46:48 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pFhzT-0002YR-FU; Wed, 11 Jan 2023 15:46:39 -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 1pFhz0-00027d-Te for guix-patches@gnu.org; Wed, 11 Jan 2023 15:46:02 -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 1pFhz0-00080R-LM for guix-patches@gnu.org; Wed, 11 Jan 2023 15:46:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pFhz0-0007Ld-HH for guix-patches@gnu.org; Wed, 11 Jan 2023 15:46:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH v4 09/12] 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: Wed, 11 Jan 2023 20:46:02 +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.167346991428149 (code B ref 60224); Wed, 11 Jan 2023 20:46:02 +0000 Received: (at 60224) by debbugs.gnu.org; 11 Jan 2023 20:45:14 +0000 Received: from localhost ([127.0.0.1]:44025 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFhyD-0007Ju-P8 for submit@debbugs.gnu.org; Wed, 11 Jan 2023 15:45:14 -0500 Received: from mail-qv1-f51.google.com ([209.85.219.51]:36501) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFhy5-0007Gs-M4 for 60224@debbugs.gnu.org; Wed, 11 Jan 2023 15:45:06 -0500 Received: by mail-qv1-f51.google.com with SMTP id t7so11399192qvv.3 for <60224@debbugs.gnu.org>; Wed, 11 Jan 2023 12:45:05 -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=f2G53Xx/xVIXpkpOxXjAdS03IItIyPZ8WMtu/vitWjo=; b=VsF221i9CJAObY6HeME4mvsedq9MbBv6Qc5yPf+w5u4vLvlHF74618jf0VzIviUzhO BfE+gD/FvP/kbEWhbCOOz37zk8NVBSxLf+3sShWI5AO3a9UqB/s5eddzn1ClTfM2U/ch L+MvuAX+okSmTVhopXiHEvLWA8s/eBqO73JHB10HRjfVXSt8MVaL2nUvFyRm3/vf5BFN i6ySME9QIXeYux6RIC4MKWuuKqawy40aU2R0NMZXkMgPrkUq0o7m6nyIWyyJJJXUHhP3 Y+HHvkczMLzCRPvhFF5Yi0+iP2/Yn3ILK+8VBooOyG5/Zr/1OD5FlpN/qyW18GHBfUE+ ochg== 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=f2G53Xx/xVIXpkpOxXjAdS03IItIyPZ8WMtu/vitWjo=; b=CD4BSaoMmk1C/q8OAchpMw98LJRGurIawgmyrdMYlocGFRvXS+9hR616Fl+3P309WO wmSVJVhn9kBf505jnk3LOMCyc0HPskTB+MhumJIhivnW7Kb8AvvIDXHMFGq7OHpQwmIj LIrjSbCdRJITznvFImT4l4ajvXiq1J9s4ra2WKY+xVixKdbgs33hMF+xWe7WKJoY4kfv uzyg8ib84x6b2ktFpQlgtk5/OdOkQ2MaL5qHtTMZuv8UtideVkSBdf/WvzcI9Roa4n3D lm90VI133LthxJPxa1ROpUCvfJ5NXxt6ChqIAdrkMAQym9IoJU8fkVDgg4Y6QOKbX3G8 A4Vg== X-Gm-Message-State: AFqh2kroSlPT4nCUMQY3TGjp7AjA1H/QHkymIugg48H9MnJfexNl7tvf 6IvVBYzdYVLnArKAxYGT4UWAdnkukdDoBqvE X-Google-Smtp-Source: AMrXdXujK2HZu57KOp2KAZcZn+gEszPYgiKCDgBNBH+HA5Yqgd2cV9+PEiVyVRUd3X5pYnBcUVpn4A== X-Received: by 2002:a0c:f78c:0:b0:532:31e5:1566 with SMTP id s12-20020a0cf78c000000b0053231e51566mr16236479qvn.12.1673469900142; Wed, 11 Jan 2023 12:45:00 -0800 (PST) Received: from localhost.localdomain (dsl-159-79.b2b2c.ca. [66.158.159.79]) by smtp.gmail.com with ESMTPSA id y15-20020a05620a0e0f00b006f7ee901674sm9581862qkm.2.2023.01.11.12.44.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Jan 2023 12:44:59 -0800 (PST) From: Maxim Cournoyer Date: Wed, 11 Jan 2023 15:44:30 -0500 Message-Id: <20230111204433.15305-9-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230111204433.15305-1-maxim.cournoyer@gmail.com> References: <20230111204433.15305-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=VsF221i9; 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=1673470008; a=rsa-sha256; cv=none; b=S7H5nmvASi7FMkLix4AXQ45s1CYSbu9Jj5pQw33o/mMLniA0LamGG0Z+RlLBhEXCcEcShw v9JyGEvUgUzXoY3yxZfsaSfclzunsi1U7JOQqQs+0Ji6Gt24ChudO7aj7K+ZEay4bO36zG QsnW+s/kGTcb7HSrVr3EufC30N8kK/F2npTiO4IPamAr+FwiDsxjxblTsNrxEmVZaNAh4A IXAtP8aIa7mYZfOAey+tbo9BnaduYVQko9KiznJCCNVB/a0Ra1USLlVBNteXf5OkW6S3oS EAR8ambyyaiuoqxWV6XuNbdOqaF/lTyoO0X9v+w9BZ8vN86FxC4r2vMp8fEjyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1673470008; 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=f2G53Xx/xVIXpkpOxXjAdS03IItIyPZ8WMtu/vitWjo=; b=oMUTXas2O1E/lEvBP96rC0jr3CaNa90ZT9dAL6yQsSjVlcj390Ns91o6m+up5k3I8TnJUi RlYOa9JaHeA5epmHDEsJlxl1eKqRJVVQbew03GSv6CUK4uUe/wQZ6I9hdq4mXDy9556Sqm Q9w0OPOAbR1xBiIDc9FZcsmYr2iHbTcz7AByjFEUJ3Ad9siIlnK54YDASXYOeRJrRlJwJv 62l+84JFGohYk0MKNb4TOIqmHmjlcuIXT4hTWuJMCkKOMVGrLm+JxHEfrA4RCSPk8NYWbO P3z5+Jwz10jkcwkb5wyzXvpUibDGSJCDtz/DnWmMEu8Jc/3z8/gmx6ueJUNqRA== X-Migadu-Queue-Id: 2A54023213 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=VsF221i9; 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.60 X-Spam-Score: -0.60 X-TUID: 41cR7VPJHuqy * 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 464c1f5729..b2e15b88f1 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1128,15 +1128,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