From patchwork Mon Jan 2 00:46:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 45785 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 E0DC027BBEB; Mon, 2 Jan 2023 00:47:30 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B31B727BBE9 for ; Mon, 2 Jan 2023 00:47:29 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pC8ys-0001uL-SX; Sun, 01 Jan 2023 19:47:10 -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 1pC8yp-0001sG-9k for guix-patches@gnu.org; Sun, 01 Jan 2023 19:47:07 -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 1pC8yp-0004Yw-1t for guix-patches@gnu.org; Sun, 01 Jan 2023 19:47:07 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pC8yo-0007IH-Tk for guix-patches@gnu.org; Sun, 01 Jan 2023 19:47:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH v3 08/11] gnu: u-boot-rock64-rk3328: Fix build. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Jan 2023 00:47:06 +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.167262042528004 (code B ref 60224); Mon, 02 Jan 2023 00:47:06 +0000 Received: (at 60224) by debbugs.gnu.org; 2 Jan 2023 00:47:05 +0000 Received: from localhost ([127.0.0.1]:42087 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC8ym-0007HS-TQ for submit@debbugs.gnu.org; Sun, 01 Jan 2023 19:47:05 -0500 Received: from mail-qt1-f177.google.com ([209.85.160.177]:46974) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC8yk-0007FI-P9 for 60224@debbugs.gnu.org; Sun, 01 Jan 2023 19:47:03 -0500 Received: by mail-qt1-f177.google.com with SMTP id x11so21459330qtv.13 for <60224@debbugs.gnu.org>; Sun, 01 Jan 2023 16:47:02 -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=wFsm+WsM6PdEq9YU8EXujhaXeKxBwa6adx5HEsWPabQ=; b=ifT70ybpsb42UpagS4/VAFJ5Tz7asE1V0UqOqCIYqvba24SiAa3HQHyOI2kOQdtWfk PtjXiKhfg3SWIfSGf7KbOLosrravzjkL9r/xBpu+uWH9TGQp4gVRUZvVF95rqaN9QU3i P/xd1PlugvJ47MvIS31rs1P26lGnkL/GXkH1n74Xdx6xwplGUqjGA5mcme8kXGwBEiv/ 39dGAN7ncu/tEfQcSrSexRwNCMNoZ3XxVlC0pbenD383+9ziE6u+PIXcgxw5Lkh2Z24w nmBh/ybiKJMVHsHEg7AcuxS8bS+0kM6g4ubna0kpaZFRIldfJ+xhYGkIkvasIfw9b2oF WqzA== 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=wFsm+WsM6PdEq9YU8EXujhaXeKxBwa6adx5HEsWPabQ=; b=B5WMVhx+W/msGy6yVcX30cDQGlk5fcwduAWmlYgbJkDfdRhXsU/vqFUtN5UfUkVlZ6 bGg6xYt08JqR2p4lh+DfvNC7GZGDKxWJ27BPWDLhV89LGKjlmYiQBKPX3D4swOaiQR2C fYp86Re8CE1CioKphok3KmfRF6ykF1hpWGMJ/8vJCQV7ZnKiDK7CX067GzQEaogk85gx 8p1+3E9QzBjkMtbnTq3ph85UdyTCKeRTyqO6cqSdUAjjHSGeIVNk6P6kX1FX6Eik9WmJ 0KMQl4uzS0RSw/gn4SO9mnUo+Fim9AWOf13+fmPzUWwRanFbcMfr/XS1ZxGWsjosctb1 Fgxg== X-Gm-Message-State: AFqh2koR2Pde2TUscaGsjhRrEIvVwiNOxMdq4VvEfcK7lh+Qu8gIpnlN 9WfNDfbWgSQ+r9h4dy7+ujjUTi8XNBZ2Sg== X-Google-Smtp-Source: AMrXdXvYM8gh6NwrCtfskV3rd7KE9cP5Yv7OkWLW6h4cawI99n0ZrOS0xEEPmQryeyb+cLHVzsorqA== X-Received: by 2002:ac8:470e:0:b0:3a9:756b:d9d1 with SMTP id f14-20020ac8470e000000b003a9756bd9d1mr46689357qtp.19.1672620417224; Sun, 01 Jan 2023 16:46:57 -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.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Jan 2023 16:46:56 -0800 (PST) From: Maxim Cournoyer Date: Sun, 1 Jan 2023 19:46:33 -0500 Message-Id: <20230102004637.3920-8-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 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/bootloaders.scm (u-boot-rock64-rk3328) [arguments]: Use gexps. [phases] {set-environment}: Also look in native-inputs. [native-inputs]: Remove input labels and use modify-inputs. --- (no changes since v1) gnu/packages/bootloaders.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index a19d1ebf17..d1c04db66a 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1141,14 +1141,14 @@ (define-public u-boot-rock64-rk3328 (arguments (substitute-keyword-arguments (package-arguments base) ((#:phases phases) - `(modify-phases ,phases - (add-after 'unpack 'set-environment - (lambda* (#:key inputs #:allow-other-keys) - (let ((bl31 (search-input-file inputs "/bl31.elf"))) - (setenv "BL31" bl31)))))))) + #~(modify-phases #$phases + (add-after 'unpack 'set-environment + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (setenv "BL31 "(search-input-file (or native-inputs inputs) + "bl31.elf")))))))) (native-inputs - `(("firmware" ,arm-trusted-firmware-rk3328) - ,@(package-native-inputs base)))))) + (modify-inputs (package-native-inputs base) + (append arm-trusted-firmware-rk3328)))))) (define-public u-boot-firefly-rk3399 (let ((base (make-u-boot-package "firefly-rk3399" "aarch64-linux-gnu")))