From patchwork Wed Jan 11 20:44:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 46047 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 E027A27BBEE; Wed, 11 Jan 2023 20:45:31 +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 1686827BBEB for ; Wed, 11 Jan 2023 20:45:31 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pFhyB-0001Yq-Hr; Wed, 11 Jan 2023 15:45:13 -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 1pFhy5-0001Rg-Cl for guix-patches@gnu.org; Wed, 11 Jan 2023 15:45: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 1pFhy5-0007hD-2i for guix-patches@gnu.org; Wed, 11 Jan 2023 15:45:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pFhy4-0007ID-Ug for guix-patches@gnu.org; Wed, 11 Jan 2023 15:45:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH v4 07/12] gnu: make-u-boot-sunxi64-package: Use gexps and adjust file name. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 11 Jan 2023 20:45:04 +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.167346990227981 (code B ref 60224); Wed, 11 Jan 2023 20:45:04 +0000 Received: (at 60224) by debbugs.gnu.org; 11 Jan 2023 20:45:02 +0000 Received: from localhost ([127.0.0.1]:43997 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFhy1-0007H8-SG for submit@debbugs.gnu.org; Wed, 11 Jan 2023 15:45:02 -0500 Received: from mail-qv1-f42.google.com ([209.85.219.42]:34395) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFhxy-0007Fg-6G for 60224@debbugs.gnu.org; Wed, 11 Jan 2023 15:44:58 -0500 Received: by mail-qv1-f42.google.com with SMTP id p17so11407811qvn.1 for <60224@debbugs.gnu.org>; Wed, 11 Jan 2023 12:44:58 -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=/KflUoNsIw6sUg2Erl+ljEDs/mMBqaFoqLSyGE81NjM=; b=LpwKf0iqAojev+Ezef9UbGciJEBepP6WWMAl2WWppKAFsVQDXtjLbbhXQf0d7BAGeu 9lKdk+XIv9v3WYTTRkbnGEi8yNVAeW7JtBpDu1mVkFdb5zxZLzncp87S2UOBaj14cxss V0ZbiiEF0brC9PI4JrJZ3IgEC0qyWDw8fRek8xBPy7BFvkFM7BP9Y4u/f88fPi1LxNi9 e5a9qdPLqZQ58VzpKvej3M7W+3TgH0pnx0C+s8aj2qkxIBKPIiJALebw6jn/0LiRIC/+ xrCBTW5rMDqcR2XNbu+O99Y5vBy2VJB7k0VTpXOLvyad/bYobHRRjvUdw38tP1YVluvg W8LQ== 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=/KflUoNsIw6sUg2Erl+ljEDs/mMBqaFoqLSyGE81NjM=; b=qMVV9dLlRwVMzGTA3ZjKgRDk7ZbzYuT3XKOzBHlXnv5qJbqNrPGYbsQ9KxeCTaTq65 QjRQZHO6zvQddhvwBgtC77Go9CUBba4hkqzYbGj5OihICe5ZLJ5Col9ncfk7cLBmxYb/ +eoiO8HkXXx3SR9E/D7MaJFrGHkFkHdGA31yadO9F1T0sQFwK1IgDzGtWET4W2fpMm+e 8IIHCkvy8LNOwLl0A9cTGZO957S/k4U+YcF5fy/qCpe8+DexLuBaqZFRh0szN/QqrsTl VvB/93/unr1FWzvMVZ/JUby8ogg7haTGmToeW7jemg7DtJOsdbLEMNAAI7rtO5houY0i Zx6A== X-Gm-Message-State: AFqh2koswQsnAIsbi/3HGQtsjGcPDAZyAPyikUTtHPngL/SlYwCtkmqK gBzqzTy+gEez397OTlnIwRCnvrIsIpa+YXOe X-Google-Smtp-Source: AMrXdXuPQVRNEiooxIYIetgvb8N1dKYMafZIDQ/L0u3ihWKhiM+oXn4ryVaH2ZM//l2DCyQqzc1Mog== X-Received: by 2002:a05:6214:4947:b0:52e:6f33:ec2 with SMTP id pe7-20020a056214494700b0052e6f330ec2mr94372471qvb.31.1673469897741; Wed, 11 Jan 2023 12:44:57 -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.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Jan 2023 12:44:57 -0800 (PST) From: Maxim Cournoyer Date: Wed, 11 Jan 2023 15:44:28 -0500 Message-Id: <20230111204433.15305-7-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 (make-u-boot-sunxi64-package) [phases] {set-environment}: Replace bl31.bin with bl31.elf; bl31.elf doesn't exist anymore for some reason. [native-inputs]: Turn into... [inputs]: ... this. --- Changes in v4: - Revert erroneously replaced firmware package - Revert bl31.bin -> bl31.elf change caused by the above - Make the arm-trusted-firmware-sun50i-a64 a host input gnu/packages/bootloaders.scm | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 87d5bcb824..0c5205fa86 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1010,17 +1010,13 @@ (define*-public (make-u-boot-sunxi64-package board triplet (arguments (substitute-keyword-arguments (package-arguments base) ((#:phases phases) - `(modify-phases ,phases - (add-after 'unpack 'set-environment - (lambda* (#:key native-inputs inputs #:allow-other-keys) - (let ((bl31 - (string-append - (assoc-ref (or native-inputs inputs) "firmware") - "/bl31.bin"))) - (setenv "BL31" bl31)))))))) - (native-inputs - `(("firmware" ,arm-trusted-firmware-sun50i-a64) - ,@(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.bin")))))))) + (inputs + (modify-inputs (package-inputs base) + (append arm-trusted-firmware-sun50i-a64)))))) (define-public u-boot-pine64-plus (make-u-boot-sunxi64-package "pine64_plus" "aarch64-linux-gnu"))