From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.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 aIZxDlHExGML8wAAbAwnHQ (envelope-from ) for ; Mon, 16 Jan 2023 04:28:17 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id aLBqDlHExGObcgAA9RJhRA (envelope-from ) for ; Mon, 16 Jan 2023 04:28:17 +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 F011B1ABF1 for ; Mon, 16 Jan 2023 04:28:16 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pHG9K-0000G0-29; Sun, 15 Jan 2023 22:27:06 -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 1pHG9I-0000F2-VN for guix-patches@gnu.org; Sun, 15 Jan 2023 22:27:04 -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 1pHG9I-0005pQ-Nn for guix-patches@gnu.org; Sun, 15 Jan 2023 22:27:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pHG9I-0007tH-JN for guix-patches@gnu.org; Sun, 15 Jan 2023 22:27:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH v5 07/13] gnu: u-boot-firefly-rk3399: 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: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.167383957130156 (code B ref 60224); Mon, 16 Jan 2023 03:27:04 +0000 Received: (at 60224) by debbugs.gnu.org; 16 Jan 2023 03:26:11 +0000 Received: from localhost ([127.0.0.1]:60063 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG8Q-0007q7-TW for submit@debbugs.gnu.org; Sun, 15 Jan 2023 22:26:11 -0500 Received: from mail-qv1-f50.google.com ([209.85.219.50]:43000) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG8M-0007oV-UI for 60224@debbugs.gnu.org; Sun, 15 Jan 2023 22:26:07 -0500 Received: by mail-qv1-f50.google.com with SMTP id m12so16808712qvt.9 for <60224@debbugs.gnu.org>; Sun, 15 Jan 2023 19:26:06 -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=DexTVW/gWqGc3muGSmxgSnR+TBt/Ct8iUl/rckdsuI4=; b=eJYkrzbhk5UlVeNZRItupK2j2gjt0HssIe28NJUKqqOCresPzu3SoBvs8hlxb7+ane rMEgMU3WLLKVWUFBFYk/F87wyS7/qZubTlSsSFwQO+LdFCA7cjss1P9evwWKKhKIDBAM xFJXYqhRsCyHA3M18C2y7BrT/OmdKCi2VeZptF/C3SjA1QWUMfTDMcFS1eRSg4Wn/E4S RARiO25KoITjlaIfoGxfjg+kATV0xaJQCmEAoEp84y4wOXLYmg+C1sUST7UwWOpy2hfK tVwB1+l4XmowCYvbiEPfjVHKJPxHnqUKFFDAs0SEyRnGDuWJT/GmC9l8BuRHMG8YRk1J 43VQ== 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=DexTVW/gWqGc3muGSmxgSnR+TBt/Ct8iUl/rckdsuI4=; b=ZHFz2FD1y3J0GoMv2TipWZ8iANMfejo0cLtlUb/Kyx6ESMDnwzUbqNhMjjdlY/u0JG qVAyOwb6w0k/wvSEFLLvYWomvzqnoqGb6DteOQTb/xpgjdUy+j6uB25VAIOloWWp9M8h qiy8YQ0kSnid872MqxHpvwnjM/xe6FmZVFVdB0VJ9sGnDApQRabXJE8O/Ef+khB75UY3 bIo9qBbCda+9Ar43mm086Sofc1v+W7J/scSnq5yjW9RXByvZ2tYIkSnsuXe+/f3lLt3K Z4Xq6duPweUgx61+kldIwgikYehfCgdVbLUQod++ZQeLeg08sCKkkDL7x7YSVzILW2bt dbGw== X-Gm-Message-State: AFqh2koYx1kMjGkpFmLfVH+Z8W9rpkkheQX7MKI7Spp8EY4nrFlcuHZ7 vCUKERZtrcSsKlzGMvr+exnbdKcbcxpaWeUC X-Google-Smtp-Source: AMrXdXslG+/1c9z6qY5F+H6T2XZAaiFJe1qEWQygfyS9i3FaRvv6Hlyj7Utk1Vvu4OOIwuiq79iY/A== X-Received: by 2002:a05:6214:11a6:b0:534:1d7d:a290 with SMTP id u6-20020a05621411a600b005341d7da290mr30057334qvv.36.1673839561322; Sun, 15 Jan 2023 19:26:01 -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.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Jan 2023 19:26:01 -0800 (PST) From: Maxim Cournoyer Date: Sun, 15 Jan 2023 22:25:38 -0500 Message-Id: <20230116032544.1378-7-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-Seal: i=1; s=key1; d=yhetil.org; t=1673839697; a=rsa-sha256; cv=none; b=enVjl5goGaqCPiXDaJTulHL0R9+Z60T5565FeqZYJU4QXfPHz1ypyHSJFiom7VU4etBxTu ya87yck+BFV8aXBm0WTK2kQVLn67UmzwiTGvVs/BdeO5t2Fd6rCmy7fkyR8kZb1FyQEku1 e/rf0Dx70UbOzt9rjgweF3rxlmV6+esJq3o0Hi6dADlZXJS6bF0WdSHUQWLxfYtlJbLype bA2qbp9tjtrMDTvotoAP4nX7kbKGqRIzUjPj1kIW3/iy0PjxWetLwqZsNVwJ8qTe2fGNf6 sOHFpSWcbzkVjF9HoF3fVet5iZFeJiOvcp21xSVLTUIXaIB4AToUNGsKNrKTGQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=eJYkrzbh; 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-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1673839697; 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=DexTVW/gWqGc3muGSmxgSnR+TBt/Ct8iUl/rckdsuI4=; b=lcwyj77jJxR2aN8CmUJ7FikUs0GH+V0qQuPS26Qu3hWqy+0H+uCZ/LU8On+O3aIOm2/alP ZrtazrYBk/VjBN/qBRy/3ZYL7Ey36p0F6oq/Yk/dJK00PEZhF6DKGkgPsF9Qh/4w804fLJ oVvb0RtU+gnj6ANmxmNO62qX1jz8Y/wlHG3j2mR6tZb1q4jxMLN+hNlBJK1DMeNsQHq5jr PfYJ5/2XMfFD5e+Y/lEs2dXpYQ835vFtC4hR8JaX8wIRNDVobxcY/WI4pQGZnPgUnvOZxV puYbjzIvjya1v97MJJ2UfPMhg3nTzDOynSlFhUfcV4qs4pjBfSDWzObnMwbtrA== X-Migadu-Spam-Score: -0.02 X-Spam-Score: -0.02 X-Migadu-Queue-Id: F011B1ABF1 X-Migadu-Scanner: scn1.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=eJYkrzbh; 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-TUID: sIITIO4025R5 * gnu/packages/bootloaders.scm (u-boot-firefly-rk3399) [arguments]: Use gexps. [native-inputs]: Use modify-inputs and turn into... [inputs]: ... this. --- (no changes since v4) Changes in v4: - Move arm-trusted-firmware-rk3399 to inputs gnu/packages/bootloaders.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index f3b3c91c47..624a832802 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1156,16 +1156,16 @@ (define-public u-boot-firefly-rk3399 (arguments (substitute-keyword-arguments (package-arguments base) ((#:phases phases) - `(modify-phases ,phases - (add-after 'unpack 'set-environment - (lambda* (#:key inputs #:allow-other-keys) - (setenv "BL31" (search-input-file inputs "/bl31.elf")))) - ;; Phases do not succeed on the bl31 ELF. - (delete 'strip) - (delete 'validate-runpath))))) - (native-inputs - `(("firmware" ,arm-trusted-firmware-rk3399) - ,@(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")))) + ;; Phases do not succeed on the bl31 ELF. + (delete 'strip) + (delete 'validate-runpath))))) + (inputs + (modify-inputs (package-inputs base) + (append arm-trusted-firmware-rk3399)))))) (define-public u-boot-rockpro64-rk3399 (let ((base (make-u-boot-package "rockpro64-rk3399" "aarch64-linux-gnu" -- 2.38.1