From patchwork Wed Jan 11 20:44:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 46054 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 AB73327BBEB; Wed, 11 Jan 2023 20:46:34 +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=ham 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 63DBE27BBE9 for ; Wed, 11 Jan 2023 20:46:34 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pFhzH-00027r-Ec; Wed, 11 Jan 2023 15:46:21 -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-00027K-GZ 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-00080F-8E 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-0007LU-3q for guix-patches@gnu.org; Wed, 11 Jan 2023 15:46:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH v4 08/12] gnu: u-boot-rock64-rk3328: Fix build. 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.167346991328140 (code B ref 60224); Wed, 11 Jan 2023 20:46:02 +0000 Received: (at 60224) by debbugs.gnu.org; 11 Jan 2023 20:45:13 +0000 Received: from localhost ([127.0.0.1]:44023 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFhyD-0007Jo-Dn for submit@debbugs.gnu.org; Wed, 11 Jan 2023 15:45:13 -0500 Received: from mail-qv1-f51.google.com ([209.85.219.51]:47089) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFhy5-0007Gc-I4 for 60224@debbugs.gnu.org; Wed, 11 Jan 2023 15:45:05 -0500 Received: by mail-qv1-f51.google.com with SMTP id l18so10612999qvt.13 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=xPPo2fHoFli95t2OVS/9dBdM5E23XTRdB3assKTD+qY=; b=W0TYRE8UIrk7+oSovLq6g+Sg5De0Sb6ACz3BmFIB61ukIPhhKeizwZBLUTBQIG5LNB Yv+m+Si7vXDxNNJDbnWt8xZ67YMrpyw/Ub08t24RN0qr7/FzVpG/wIlZsjJxO1Wz7Qrp cK1p2PStQ5ql2a8m7Mp+r/oR2IuN+FQzrUvbGx5pJsnwpxDHVwIaEtyTNs4j1rQBwZg+ hG5Dh2sgGDUPYSHKT4J4lJASBhtMT+Ba2D2tM7Dh7dkyeYrFlvVzj7wzpmH7fkbBhyxV VWByUHXP0UQfEgE6olJgWxEAtVdc9tqV0tjqybnNQqN4MqWP73bNrZXtk4WMrKvm67CU V98w== 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=xPPo2fHoFli95t2OVS/9dBdM5E23XTRdB3assKTD+qY=; b=cQ8QY7sPtmfa0jpBKJrBivFHoBYCyfrgOOL/pKX78VcyeBM9OUknT9KYx9O/BsROkS x6ZwDGFVnouGIzpcgpu5JAcFBmmwouFt2FPIjiV1LB2X8n2kMzK0LbFQJs16MoXo+Shk GPuGbbLLR6xh4vHktdaNDQDD21Ijk/DNWEWnhXIUilcjpXc3F6OPg1icydQAl74lc1Or eWQp+W6IfKEwm8FXBzDwOtFRk01jXjS4IhkB0MLdeJgfBq6OKvOMGAOv2s2Z886DbWcB UcwGgMXnEZ+eCh0wCkGfx6lhC4Ga3nl//TDmeKn6JUzm+P0X9/MhLBI6mBMvoTkZY/VF +mNA== X-Gm-Message-State: AFqh2krmyhrdeUgNo82id9DbDSbsTyM3pTWxoyo83kGcq65ot+FjoAEC Mq4rmFKkEQV1LemKqXQS7O/jaXXbzsaN+od5 X-Google-Smtp-Source: AMrXdXsilZBz4X/7hQLVYgXQVWb8KdD8mTyXv3d4FCFxJFeL46IwRH+/D5SUY9Ra62t+m0XN0z3pEw== X-Received: by 2002:a05:6214:5443:b0:4c7:80fa:755c with SMTP id kz3-20020a056214544300b004c780fa755cmr107110922qvb.45.1673469898948; Wed, 11 Jan 2023 12:44:58 -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.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Jan 2023 12:44:58 -0800 (PST) From: Maxim Cournoyer Date: Wed, 11 Jan 2023 15:44:29 -0500 Message-Id: <20230111204433.15305-8-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 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. [native-inputs]: Remove input labels and use modify-inputs, and turn into... [inputs]: ... this. --- Changes in v4: - Make arm-trusted-firmware-rk3328 a regular input 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 0c5205fa86..464c1f5729 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1145,14 +1145,13 @@ (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)))))))) - (native-inputs - `(("firmware" ,arm-trusted-firmware-rk3328) - ,@(package-native-inputs base)))))) + #~(modify-phases #$phases + (add-after 'unpack 'set-environment + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (setenv "BL31 "(search-input-file inputs "bl31.elf")))))))) + (inputs + (modify-inputs (package-inputs base) + (append arm-trusted-firmware-rk3328)))))) (define-public u-boot-firefly-rk3399 (let ((base (make-u-boot-package "firefly-rk3399" "aarch64-linux-gnu")))