From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id +6WkGkzExGO/9wAAbAwnHQ (envelope-from ) for ; Mon, 16 Jan 2023 04:28:12 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id KGDIGEzExGOARAAAG6o9tA (envelope-from ) for ; Mon, 16 Jan 2023 04:28:12 +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 328341ACF4 for ; Mon, 16 Jan 2023 04:28:12 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pHG9K-0000Gk-W4; 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-0000FB-E9 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-0005pX-6V 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-0007tP-1m for guix-patches@gnu.org; Sun, 15 Jan 2023 22:27:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH v5 08/13] gnu: make-u-boot-sunxi64-package: 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.167383957230163 (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]:60065 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG8R-0007qL-GV for submit@debbugs.gnu.org; Sun, 15 Jan 2023 22:26:11 -0500 Received: from mail-qt1-f175.google.com ([209.85.160.175]:36861) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG8O-0007ov-4a for 60224@debbugs.gnu.org; Sun, 15 Jan 2023 22:26:08 -0500 Received: by mail-qt1-f175.google.com with SMTP id x5so141647qti.3 for <60224@debbugs.gnu.org>; Sun, 15 Jan 2023 19:26:08 -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=6OntEMal2WsUsfJrYmb/w3mTcsznjCXffGXjnyq/fLc=; b=iyNZ6efkx35AlTxuruZFSsO+E3lznjrq+SiZurr5ikUtrGLiPyGnh8mWd13Dm9/KQ1 LudFQ4vUJMXGN6uRhfaAyeRD3NGLP7wvOrPnTClGErYsN3unpFSUO/6JTF3q4RHEN/LQ m4xeL3XYcmHe90cBLTeKjR2vUI6qCi9kaTstACkZLfzE38u6uZTYrzXqw0bchGIf5KcX Qq1EDHwsBJ8gaV7hzqvw0y33T32STvyRA3cpLKQtPQSKib7WeVbzm2NHCnGB1ltyw6xN aL1Ht/k7OYgnQbfwIsx4rcp6mVqh+Bn3xcIH4EwoC9QJcWITB34i74WuzxF7i9nPNRvw IPvw== 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=6OntEMal2WsUsfJrYmb/w3mTcsznjCXffGXjnyq/fLc=; b=nBlG8B3rXEfBgoq77V6B35jwLE7Rgu7Nuunxr/oiL/304+h+tyL0dTOpxsK6oCl3fc jXQ50ZsqdoyMSwdMk1Lv4kYLw2q6xLJL8IiXK9jmUwoLQxHd6+GiDKShFpAJMQT7C+Rh kGXAvHPbafKJPGlOo1xu/kxE3GnqN72JMR3DVAGbJ30jOKAd/+pDcWxInZGRZZLNr8HV utt+z1JtsDis6x22FJaIvGmlKu+gN/kSC5lGMDY4RiKjcLqNlr6zOQ8RSGUM7WTuzuiL WjziiATl/sUJQVT3CPvORg41CdQfdMWzGoBp+xd4hBguSXg83+B86lHfz9ORux4nxGoN 1CVA== X-Gm-Message-State: AFqh2krbBvw4iC51A7jb6ElprdGpviOIj3CKeULYfCzggtyq9tY6tBff 4B6tlOjmL0WLBddkn08Bqta7r8ZY7+5MK7BA X-Google-Smtp-Source: AMrXdXs6Lk+NcKwdbrYgK7V4DZpLJYgimoFYQsoICIdY9c49C9QzVJhHfkbZlAMbWCjr8jhS2VKITg== X-Received: by 2002:ac8:4cc8:0:b0:3a8:e528:dab5 with SMTP id l8-20020ac84cc8000000b003a8e528dab5mr99625670qtv.0.1673839562525; Sun, 15 Jan 2023 19:26:02 -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.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Jan 2023 19:26:02 -0800 (PST) From: Maxim Cournoyer Date: Sun, 15 Jan 2023 22:25:39 -0500 Message-Id: <20230116032544.1378-8-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 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=iyNZ6efk; 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=1673839692; a=rsa-sha256; cv=none; b=OVZ2Kq3r/d+MttZVTZy2z7Sxi84z1+IBKP5kdoJJbb4RSa1ZuwnMilbf501EKU1hRCmNdw 8wuFwSOVvl+nE6zCxU5M5oXaHJSY8wYXHlhaJAwFWPc7mohQTth6YAJdciBOQTgiigq2r5 lRjlvNzelJ9fh0LUK9dS8WMXw9s5xrJVPSoRD/I+LQGfSA+Q5U3YEuLuEse2o5vJ9MMfX7 f06OQja7f3agocgDD9u7gJsuxP9li9tYLcRNaNbrSbMm8s5x3kg4j1isxqQEOvrjKdkN8E u7A2apMl7cFNzmtVOe72e7de+Vbgw+o4qo84dMyHwaWWHDrNmsjUfRCJad6c0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1673839692; 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=6OntEMal2WsUsfJrYmb/w3mTcsznjCXffGXjnyq/fLc=; b=HmlHKQKH0s26apUTxDemDKedu7Pv9CH6d7gQGTTAOuph1LJ1kIqXu5Lgn0x4s3wrYMQlet XBkHbWM8F7S/izc9vjTTxM3EbE+zU4DoJLZUwaWGfMXXp/uxJadlyAtpIBeC5D2R/Fkj0l Y/JGaCRbCEXThQj13RQ5oDKXOP9k/jrduZPiPyB1r+DMEEqjfq1BI66GulJsD/6IToLXtX BGHFnAZ1AjG5Zb1YUigBRc7s4dwWsDTVO+ee2bovLu8Z8EuTfgPq4Ad5IFXJ+jvklEhULs gDcRbdg/MtZJRFsen2a9skgXR+IfGSr06KUldfmxbo21r5aeBfwiSomnPTzgIw== X-Migadu-Queue-Id: 328341ACF4 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=iyNZ6efk; 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: -0.82 X-Spam-Score: -0.82 X-TUID: rQFKbnu+F3yv * gnu/packages/bootloaders.scm (make-u-boot-sunxi64-package) [native-inputs]: Turn into... [inputs]: ... this. --- Changes in v5: - Fix commit message 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 624a832802..53e6557ac7 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1001,17 +1001,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")) -- 2.38.1