From patchwork Mon Jan 16 03:25:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 46178 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 EB18527BBEB; Mon, 16 Jan 2023 03:28:12 +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 3B7D427BBED for ; Mon, 16 Jan 2023 03:28:12 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pHG9L-0000HZ-Qo; Sun, 15 Jan 2023 22:27: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 1pHG9J-0000Fa-T0 for guix-patches@gnu.org; Sun, 15 Jan 2023 22:27:05 -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 1pHG9J-0005pd-LJ for guix-patches@gnu.org; Sun, 15 Jan 2023 22:27:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pHG9J-0007tW-GY for guix-patches@gnu.org; Sun, 15 Jan 2023 22:27:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH v5 09/13] gnu: u-boot-rock64-rk3328: Use gexps and fix build. 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.167383957230170 (code B ref 60224); Mon, 16 Jan 2023 03:27:05 +0000 Received: (at 60224) by debbugs.gnu.org; 16 Jan 2023 03:26:12 +0000 Received: from localhost ([127.0.0.1]:60067 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG8R-0007qS-RI for submit@debbugs.gnu.org; Sun, 15 Jan 2023 22:26:12 -0500 Received: from mail-qv1-f51.google.com ([209.85.219.51]:45007) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG8P-0007p3-Aa for 60224@debbugs.gnu.org; Sun, 15 Jan 2023 22:26:09 -0500 Received: by mail-qv1-f51.google.com with SMTP id y8so18846946qvn.11 for <60224@debbugs.gnu.org>; Sun, 15 Jan 2023 19:26:09 -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=rZJ8KQ2EbbGH+k4ugzE3KdRywjCgH0pcOrR1ppLCb90=; b=REutzbTResn2mreTbezE632ZghhpgMN7sFJjABPrdVBfFfqVJJO6MQ4wMUm0lY170X seLbiJWFygcjBBnrxgtrU9VaGZZiU8Zpi6kEQnQoQFXpc945DUDy/A+EkE8fPsP2Tqoh /ZfQTjO1Xn0kFyqPe5HpwkHKnv7UNW2IZOu/JfWS63mjD+R47jxDNA5Y+hBpyqOCXMbe PsluKbpNrJqPCSBj5YHlmxr9iSupRbMj7/tOZc5GP43RS2plXD8+Wkk5GwKD/r9kaihA uaqwuhMIrsMe9yZadd9DYglDPxO7WryH2yvTQnSsrEHMCnfdXdZnnNg/6aRMP526vsgZ ZYJQ== 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=rZJ8KQ2EbbGH+k4ugzE3KdRywjCgH0pcOrR1ppLCb90=; b=bCT8r+tJYwCB803k/1FqHR+uku7eFoy84IL5vzT1HHZAt0HRxuWNVPd97kEtF4gLwN 4QOCuq6VVYTGKlipGYmqzo8IRR8AE60sHsuZK6DiiHimX2Y8tpakhTxgeN/tmA5JDsGS FoYgjGynhhxlnVolEGMnNoGJ0QEOpseV4NDtlaUOyiszrLhUrZmUvHjzb6rsfK2HYcQk 8YaeqFYOpIgGVdo0mZOCpgtRO+3QE7cDkalEGzfqm8wXN1jXebsRo47cIzhlLfvxEiY9 OvtxdUtkoTNZyjXdlBZzPdwOHRDassoY6BNo3aiVNuTsynSTyx3TRsoDWM2VSeW9Bqll BceA== X-Gm-Message-State: AFqh2kqshfzepQiJWtEgBXtxXl5ghguhZVtyz/XFcbBQOlTsg867sp8d BXYidrfIe+bhRrAqn9i+aDfSKTBb3m4xeWAI X-Google-Smtp-Source: AMrXdXsaVZQ8n4E2tHcv/a3ebALoLKcgbMpDW3pJFd1mzvfk7gBJ5KqBjBuNsy1Xbaxk7EZQ9+tcIw== X-Received: by 2002:ad4:4bc3:0:b0:4ca:28e3:27a2 with SMTP id l3-20020ad44bc3000000b004ca28e327a2mr117149146qvw.49.1673839563772; Sun, 15 Jan 2023 19:26:03 -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.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Jan 2023 19:26:03 -0800 (PST) From: Maxim Cournoyer Date: Sun, 15 Jan 2023 22:25:40 -0500 Message-Id: <20230116032544.1378-9-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 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. --- (no changes since v4) 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 53e6557ac7..64af453844 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1136,14 +1136,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")))