From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id XDyGJqMEomOxkQAAbAwnHQ (envelope-from ) for ; Tue, 20 Dec 2022 19:53:23 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id oG+JJaMEomMzKAAAauVa8A (envelope-from ) for ; Tue, 20 Dec 2022 19:53:23 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 67851F05E for ; Tue, 20 Dec 2022 19:53:23 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p7hSR-0008D1-CI; Tue, 20 Dec 2022 13:35:19 -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 1p7hSG-00089H-Rk for guix-patches@gnu.org; Tue, 20 Dec 2022 13:35:09 -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 1p7hSD-0000Gk-46 for guix-patches@gnu.org; Tue, 20 Dec 2022 13:35:08 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p7hSD-0004JV-0L for guix-patches@gnu.org; Tue, 20 Dec 2022 13:35:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH 6/9] 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: Tue, 20 Dec 2022 18:35: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: Maxim Cournoyer Received: via spool by 60224-submit@debbugs.gnu.org id=B60224.167156129116514 (code B ref 60224); Tue, 20 Dec 2022 18:35:04 +0000 Received: (at 60224) by debbugs.gnu.org; 20 Dec 2022 18:34:51 +0000 Received: from localhost ([127.0.0.1]:46474 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7hRy-0004IC-QV for submit@debbugs.gnu.org; Tue, 20 Dec 2022 13:34:51 -0500 Received: from mail-qt1-f171.google.com ([209.85.160.171]:40850) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7hRu-0004Gt-M1 for 60224@debbugs.gnu.org; Tue, 20 Dec 2022 13:34:46 -0500 Received: by mail-qt1-f171.google.com with SMTP id jr11so11739245qtb.7 for <60224@debbugs.gnu.org>; Tue, 20 Dec 2022 10:34:46 -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=HM6NnJKbGSk6J7+g/gAHeaFV2qGk9YZ33AspqVW9ejU=; b=nNKJRoy4je2OSv0miRoGC1gyLqLD6spUMzDD8o92Wm6FdC83pni21O27LzACKbrGAx 71ft0XpzhMJpQyO48+cfKy0Uo+2dhJv7hmGXV8aGZYlx2KQATLTCrDjSlMB+ZDpilFJ0 NqNBl9AHaIvY292nJLERp/MnvrcB6G8TIgr8KV4O+V+GIVdEeT1P2O1FsEw/Dlc9LBzu eTilm2AG7oT6gbUlRqWq9fh2KfpeI67Q95bWUfWm2NrLxjgBokSjdW44ni62042/85Hj ktF4O2N42l1xGTr1s3TgC2hgoFzQBvGZO6nmPUc3yamdCIh2OdgJfXWJJUq8qH/L2JwT u+fA== 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=HM6NnJKbGSk6J7+g/gAHeaFV2qGk9YZ33AspqVW9ejU=; b=lFdE8EJyxSCXCsI7+TojY9aKSW5T3MOTzJGFDGnl4nSRk1zTI16uULSFvGWZCBJP9k 4IMJpU3EyBUyvWJZwZUXtx+hBDpNt0CZbU/6pU1aqt5f0mnrOHh3OXrJnK9MAw+NxTy1 tznUt7Ye1lxNdKWM/EfuxIH9bneiHmLTWnF/qWZ7t9iRF7hQC9BUNWcU5XZtRTxDI3Ua AYeKdlWRldJX9cJ+sQU2xabaYxepNGdDv420VI7anrmsUPyL+KNbNjejoK9jQHK8v1Jj kmFEXL4XjU8zIX8iyMXRF3NhiakVL7bmrksp0+jCmTcXPQHiRJS9Pvw50jzcklQrww2r Ic2A== X-Gm-Message-State: ANoB5pkMnDMxaeUKo8WxgfrY9M+0QbxPOYuVrFv7VRa5jlrOahEXgGBO 6isWDk5mA63+N3ksNqoG5wwTIPiyUSme+nEA X-Google-Smtp-Source: AA0mqf5nDmfH+OHOXg0uomXuLxSH3if03H4hzJsjTQzbXL08y3O1UOyzXPyTCJzAUxDGVG2KJOR1dg== X-Received: by 2002:ac8:5206:0:b0:3a8:496:19aa with SMTP id r6-20020ac85206000000b003a8049619aamr58566028qtn.4.1671561281188; Tue, 20 Dec 2022 10:34:41 -0800 (PST) Received: from localhost.localdomain ([2607:fad8:4:3::1002]) by smtp.gmail.com with ESMTPSA id fv20-20020a05622a4a1400b003ab43dabfb1sm942795qtb.55.2022.12.20.10.34.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Dec 2022 10:34:40 -0800 (PST) From: Maxim Cournoyer Date: Tue, 20 Dec 2022 13:34:24 -0500 Message-Id: <20221220183427.31752-7-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221220183427.31752-2-maxim.cournoyer@gmail.com> References: <20221220183427.31752-2-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=nNKJRoy4; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1671562403; a=rsa-sha256; cv=none; b=hnkY7ww6eh6Kdm4JqyoGeqk0W+qEB4a+3h5f31+l4fqaG9rbC91XwIesbj1jIsuHy0XSYL e2HXUXofSB22Gj9tKTMWHh+kE18bqoo1LakTLg4JoMCb7WxLOGucSIJKkelx/SuyQv8dgj N0QyqCaCDGo8oSJ/CE0/x4e2XaPajGa1iFYJZ2Gq6J9JzU+ed93jvPD5bc50Fn1Dt8o/cB /KCpw+ZdoDBXM+8GUOOsIadBe18WBnk/qzU/gdJedqWGdGdLV6BAkPgZlkSSolb65Yd1hs 8n75EXxS3BgmgnnNxeEZWLO9dt3AZRmGvXPA1Nz2LdX36X/kRv+/oeke/nkatQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1671562403; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=HM6NnJKbGSk6J7+g/gAHeaFV2qGk9YZ33AspqVW9ejU=; b=iyJICl0Rw2+8LmuGb94h3glRpwIdRW8/MyvBdyap/QqWp57c2AHWh6lGZF3Moy7+i5eOoJ LY5cqVs2eJD/+72SaVqY/ItKHxh2aLiU0pZr6VNJvceR9b2rUOGHjQAX1WHqMZwfz0QSG/ a8eKVdUNjHS/sb1ZB15/zkodOFRSZaYqlN10CRgXwCDPOf81zS1TTQ0Eq9QDvmiESmRKcY TOilgonnocghcbFU8OUn49qEFNSjeib/seRcIJWRuXiaW2y5QDRRWKFSrSFdX9PZW6tGRi PI8i/jovmVY1gEMv3yXTt49+kvxy6DrImz9K/PE76QkfO0Y5ZvjVNCEZP098ew== X-Migadu-Scanner: scn0.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=nNKJRoy4; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) X-Migadu-Spam-Score: 5.21 X-Spam-Score: 5.21 X-Migadu-Queue-Id: 67851F05E X-TUID: 4G1B5MrM9xPz * gnu/packages/bootloaders.scm (make-u-boot-sunxi64-package) [phases] {set-environment}: Replace bl31.bin with bl31.elf; bl31.elf doesn't exist anymore due to the package being a true cross-build. --- 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 ae847080d0..5f0182524d 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -925,17 +925,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")) -- 2.38.1