From patchwork Mon Jan 2 00:46:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 8789 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 2744227BBED; Mon, 2 Jan 2023 00:47:52 +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 89A4627BBE9 for ; Mon, 2 Jan 2023 00:47:51 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pC8yr-0001tK-4j; Sun, 01 Jan 2023 19:47:09 -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 1pC8yo-0001s4-Sc for guix-patches@gnu.org; Sun, 01 Jan 2023 19:47:06 -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 1pC8yo-0004Yq-KM for guix-patches@gnu.org; Sun, 01 Jan 2023 19:47:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pC8yo-0007IA-Fz for guix-patches@gnu.org; Sun, 01 Jan 2023 19:47:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH v3 07/11] 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: 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.167262042527994 (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]:42084 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC8ym-0007HK-I8 for submit@debbugs.gnu.org; Sun, 01 Jan 2023 19:47:04 -0500 Received: from mail-qt1-f175.google.com ([209.85.160.175]:38857) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC8yj-0007F2-Nc for 60224@debbugs.gnu.org; Sun, 01 Jan 2023 19:47:02 -0500 Received: by mail-qt1-f175.google.com with SMTP id z12so21495889qtv.5 for <60224@debbugs.gnu.org>; Sun, 01 Jan 2023 16:47:01 -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=7urhBD6EuoSPV7a76anzEzJic8m3aNAtkY/qq1EsFUQ=; b=BNGVHxW5mVz214yJH7Z1L9vGHZhe6zKs6JcyhahywMCdeeVFj0AWS66NFfO174pLy5 K0D0Vllx1yosZp0FZ/muKAvWm+I/RM8Wjg9V0GuxBFFmG8uC6Wuj++HC9V5K0NE46oZB O343FVuUB6Ho+NfsqRArRhb3JC4nyIcpaSEIrIoe/2UT65ofZy7TBehe0t/EBWhCSt4E OEwC5CTy4xO0QRfF/keDkNF9rlNuErKCyDkxkMcipyYifZb1XvhWn0XdjIjwHvTUlIz+ MKr++uHFjwqIfczw6Fzhi/mDtsTv2j1BXJWyVOzeNI1HUhiMdc08aCBWY2XlbuAWKnWm /tRQ== 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=7urhBD6EuoSPV7a76anzEzJic8m3aNAtkY/qq1EsFUQ=; b=jWiFYIeuj2+lYufiW7IIhNJbgTnhKhde2uxyvK2dg33Y2B/l6GWd/E1pMYjsTRTBtu xsnG78WqJ6uKIbYF19g93tlAVi9ljGmGMO2SKhMoT85r4nCk9grB6BTDzSJhhdj9B8tB gn7EINY6Red7iq+JxR9Km0jWKBQD3xy92SxM/BYrtaI0ZGeGjdjI1yNQc3SEC65nqVov qGrd0YE49af+jfUG85Aa5oKnWJbhgZs8glB1xOLTAWJ3M+AfdmWOx+AjnnJ5c98zukTz mxmjSmSOWDdUr7mDBzb6IQicnVnHF8Mgs9AS2LFARQ4p/Tswk29Wwbvk3GO457yd0F2P IxBw== X-Gm-Message-State: AFqh2ko7SWcc/ecA8nN2IXI0pb0p52lPoBpoFHL254lEewbkrN0nm6BX cgOerTUbSdPbNqbJhgE0A61X8jqFyevx9Q== X-Google-Smtp-Source: AMrXdXuV0G0TH1ekYGyOGBlBrgfVRnBotnQAmITrsprYQNo2/bUpc75eqQ4bxtDEMkZjVYKrvPZM/A== X-Received: by 2002:ac8:6a0e:0:b0:3a9:86c6:e27b with SMTP id t14-20020ac86a0e000000b003a986c6e27bmr46702077qtr.28.1672620416256; Sun, 01 Jan 2023 16:46:56 -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.55 (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:32 -0500 Message-Id: <20230102004637.3920-7-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 (make-u-boot-sunxi64-package) [phases] {set-environment}: Replace bl31.bin with bl31.elf; bl31.elf doesn't exist anymore for some reason. --- (no changes since v1) gnu/packages/bootloaders.scm | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 8a56ee9cec..a19d1ebf17 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1005,17 +1005,14 @@ (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)))))))) + #~(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-sun50i-a64) - ,@(package-native-inputs base)))))) + (modify-inputs (package-native-inputs base) + (append arm-trusted-firmware-rk3399)))))) (define-public u-boot-pine64-plus (make-u-boot-sunxi64-package "pine64_plus" "aarch64-linux-gnu"))