From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.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 ONv8Db4psmMPGAAAbAwnHQ (envelope-from ) for ; Mon, 02 Jan 2023 01:47:58 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id iFugDb4psmPnegEAauVa8A (envelope-from ) for ; Mon, 02 Jan 2023 01:47:58 +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 043069E2E for ; Mon, 2 Jan 2023 01:47:57 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pC8yq-0001so-EC; Sun, 01 Jan 2023 19:47:08 -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-0001rL-4z 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 1pC8yn-0004YY-Sr for guix-patches@gnu.org; Sun, 01 Jan 2023 19:47:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pC8yn-0007Ho-OG for guix-patches@gnu.org; Sun, 01 Jan 2023 19:47:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH v3 05/11] gnu: u-boot-pinebook-pro-rk3399: Remove input labels and use gexps. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Jan 2023 00:47: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 Received: via spool by 60224-submit@debbugs.gnu.org id=B60224.167262042227934 (code B ref 60224); Mon, 02 Jan 2023 00:47:05 +0000 Received: (at 60224) by debbugs.gnu.org; 2 Jan 2023 00:47:02 +0000 Received: from localhost ([127.0.0.1]:42073 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC8yj-0007GF-OB for submit@debbugs.gnu.org; Sun, 01 Jan 2023 19:47:02 -0500 Received: from mail-qt1-f169.google.com ([209.85.160.169]:38850) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC8yh-0007Ey-Mo for 60224@debbugs.gnu.org; Sun, 01 Jan 2023 19:47:00 -0500 Received: by mail-qt1-f169.google.com with SMTP id z12so21495828qtv.5 for <60224@debbugs.gnu.org>; Sun, 01 Jan 2023 16:46:59 -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=O6ikzglE2k4gB8lo7Su39uWFENRIsTKcMDXCf4doHlo=; b=VvI2nCd/iY4TVA73vDE/zzt6I9FztePvbzKtpRE7TSgq662EREPRc2HzGtCRJ4F3jL NyPjG4ggbR75kMBJqW/DLRcbscXRQ4bz3Wd+Hp/fzj33KmuUNQsTDpNScLhQVhvMsXH+ W/Q6sRCPZosanwOhaCrjXfTbIDyk7DuKjKGm31ZxpW5a0WZvUGD1YJqxwZUT4fDrhty2 hdF18i4W6Xun3kDS4x5IzroWtl3PDDCPPLNJswHOOqwLxB2EEpamokjehcRGQng+0KZL SUJzok8k2pDdInKVcspPMO+Zll9uv9lwMv9nloqqKkAWx/qbPaF+n0FU9rzsD7EUPILc +i8A== 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=O6ikzglE2k4gB8lo7Su39uWFENRIsTKcMDXCf4doHlo=; b=5xNMr0kRjH2meV2vXRABMZTBu/w8vLBl0HDxx7S0CntW5W2V03UXMI7wdMiiYXtsU8 vrD7KsXkvAr8u+GZxaeAPB0ej8Q92PbcJU1vxr4VEB3iAXN0gWF1EUMFSPC39O1abbEn aVY4zi6IsrllHylLwqFeeuMurwp09DHht/bj0FXVvFnzmhqQwfCxxWBfdG0ZBqG1VpPt Jo1P8WZ9vSfoXyu+L/jLN04CpDaNPI+UN74p+gRThzaYoNiUp7yHZnxjbvFJ5EYFqkNu ukco5eFLZl+y1bLpO1QQ/NnDeG/mTXtQXibqVgOTJScKqHv/IJrH55skoKMIHIoWRPCo giSg== X-Gm-Message-State: AFqh2koApIcz0/wPj+F5Z0qXW5E/+folwVoAM6dm/Rxd3jICCfLP5wvd gmuwEJmt7K6Bdr5sryAxT5MU6B6qMUBi0g== X-Google-Smtp-Source: AMrXdXtvqaxAwChApdjAeLorhyfAliJfyH+PH3Yl/8/W5wZA/JMihhUs1wxkrndT9vROO+2OEnQfNg== X-Received: by 2002:a05:622a:144:b0:3a5:4f32:9caf with SMTP id v4-20020a05622a014400b003a54f329cafmr69196381qtw.59.1672620414076; Sun, 01 Jan 2023 16:46:54 -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.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Jan 2023 16:46:53 -0800 (PST) From: Maxim Cournoyer Date: Sun, 1 Jan 2023 19:46:30 -0500 Message-Id: <20230102004637.3920-5-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 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-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1672620478; 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=O6ikzglE2k4gB8lo7Su39uWFENRIsTKcMDXCf4doHlo=; b=MhMdpp6LYw84wNXeigzeWAezcrbK3mTilcoDpLrnvzpHpOv+hR7EkAtLmh25BjuYHoCNjq DR/0UUxWSdoO7aO1ISGUzO0RpqbP0QcoXspkCOYWGqMoB8hs/abbr9IShejToIOpFLVrua BataHH4XBRqa5bgEo0ikHh2LJMEx5XpYpSSgly1k8+ZZW/Xm+EQYfEvACmlm7tPODhRGB9 HaX70Mw7Do3tE0Aev0klxeJ92CUZVZ8Zv1AiysShOt17tdL1h01Kf+htVdm08RKjEVQDGB 2zOWrSI9KY4F2rUin7LDQlHqeJI2+xhI2Qy1gn13Q3xnG+iyYIK8KVQXHoJT/Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b="VvI2nCd/"; 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=1672620478; a=rsa-sha256; cv=none; b=En3oElBhK1/A6pYHKCQ+jYq8vn437z1wS2qvHc3bi/YYTEhTnccgV/5fYk4THcfStKxNPU I8ELp1P+jhy/y4TV3mCqCBn6CMIBrlSmAK0Jwp8sPWtL5oS8mSwpwXuYcAQZqpBp/gctVL 0n7J9bt5BTfh0kZab+B8+AS2F/8ZBkFLkqgs0YbGsqlHduzdBWiaRDRLmi56XbNCeJKGAF pFG1X9fo6gyZRI5pg5wUH3OtUj2s3IlKUI5gnoeF0WvuMYYkIV1ahYRO+Ov5xSDcYljW6p bgOPNiOHBt4puCrbC5SkJClDlBCnyxpYopmvTd3GizmpDuGszZU/K5Lnq6mHPw== X-Spam: Yes X-Migadu-Queue-Id: 043069E2E X-Migadu-Spam: Yes X-Spam-Score: 6.45 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b="VvI2nCd/"; 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-Scanner: scn1.migadu.com X-Migadu-Spam-Score: 6.45 X-TUID: hj25HdD6qve2 * gnu/packages/bootloaders.scm (u-boot-pinebook-pro-rk3399) [arguments]: Remove input labels. [phases] {set-environment}: Look also in native-inputs (for cross-compilation). [native-inputs]: Use gexps. --- (no changes since v1) gnu/packages/bootloaders.scm | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 1a4415b858..602ec7f8a3 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1225,17 +1225,18 @@ (define-public u-boot-pinebook-pro-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))))) + #~(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")))) + ;; 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-inputs (package-native-inputs base) + (append arm-trusted-firmware-rk3399)))))) (define*-public (make-u-boot-bin-package u-boot-package #:key -- 2.38.1