From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.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 oO5fJeUDomOn+AAAbAwnHQ (envelope-from ) for ; Tue, 20 Dec 2022 19:50:13 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id iLFbJOUDomMMCAEAG6o9tA (envelope-from ) for ; Tue, 20 Dec 2022 19:50:13 +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 47260EE7E for ; Tue, 20 Dec 2022 19:50:13 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p7hSR-0008Cz-CG; 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-00089J-ST 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 1p7hSC-0000Gd-BT for guix-patches@gnu.org; Tue, 20 Dec 2022 13:35:07 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p7hSC-0004JH-6V for guix-patches@gnu.org; Tue, 20 Dec 2022 13:35:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH 4/9] 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: 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.167156129016494 (code B ref 60224); Tue, 20 Dec 2022 18:35:04 +0000 Received: (at 60224) by debbugs.gnu.org; 20 Dec 2022 18:34:50 +0000 Received: from localhost ([127.0.0.1]:46469 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7hRx-0004Hs-SO for submit@debbugs.gnu.org; Tue, 20 Dec 2022 13:34:50 -0500 Received: from mail-qt1-f180.google.com ([209.85.160.180]:35345) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7hRs-0004Gr-Md for 60224@debbugs.gnu.org; Tue, 20 Dec 2022 13:34:45 -0500 Received: by mail-qt1-f180.google.com with SMTP id h26so7915258qtu.2 for <60224@debbugs.gnu.org>; Tue, 20 Dec 2022 10:34:44 -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=XmXI+n3NwzrulGFb5noGXlJMzCZEz3A1YQMLG4RxmDo=; b=hJFBnIRushoUEgeYro6mKRg1jv7j14b3OpRe7yNEYFxTJisszMdiYWoD9h02ExJ6j1 1o+RD/iHwTTT2A6msRpQyC7moFAgCyPa/bNx+b7sZeZa4XXzdCcjGMCmnbozHkKA5MTt Dqpb0mvdh5ViPTpdmi/CEi/aKETSD7kgWfcFpkHyLWO/5G+H1cYqEykLOcAV5F2VRGJg 3sXN0vCmNK8HXKXM4+H8lJ5Qj3sZQ1Dc0aIwohXw3v8g+vP6IBumDFlRAS/4TwFU9xgU tKvbrVvgRwOCa4ZC6FIIM4e2zydo055dVr9CUSd0/CAXjyWTBSeWCzqOY/iCJDQeoWuo tTgQ== 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=XmXI+n3NwzrulGFb5noGXlJMzCZEz3A1YQMLG4RxmDo=; b=S1T08oz2fNIrCHNDIYBhWo5+iRj1mozYyYpXWZ2taxRqfkkRO0QnYbUsCafbOsombZ G2Kmcbc8CpqPk2dyi7aCv5oJw51/YVglqP0ewhF9Aw0tdoIF0UI1MDmayAafLAX7oxW3 PTxfImfSsDdZuEnno0MvVuzV3nvHPc3fYsmoTs8QMXXun8LJOeQGhEwF2H3MxIWAZaua XUuSJjKJBZeSi9vnP7RK3TKzoJurU8W9bwUWwBNKpgFDGiFIlo9xnVPt1oF/CC7Gyt7D 8O7aNPxiCbJo3b3MmqFbMHfhJrIAIIdj+bYhCvhk5dv3kdPHW9Iv3xroHRifv2wkg87b UgXg== X-Gm-Message-State: ANoB5pn4x8UIefAogewpFD4xrNiD4Bbu4xyDrGxw2zY9X9W4u8sY8peT SycSJDqwluKRK5Awr3SAaneciPD2VmtfDaFp X-Google-Smtp-Source: AA0mqf5EPrdSQi7H8QG9/4558/8a+pt8P+lKr5IlYH7uMi9qk9BQR9y98YQo/aPR1SVk08uRq4FFvA== X-Received: by 2002:ac8:6e87:0:b0:3a8:2ab9:7f9c with SMTP id c7-20020ac86e87000000b003a82ab97f9cmr37600319qtv.57.1671561279064; Tue, 20 Dec 2022 10:34:39 -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.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Dec 2022 10:34:38 -0800 (PST) From: Maxim Cournoyer Date: Tue, 20 Dec 2022 13:34:22 -0500 Message-Id: <20221220183427.31752-5-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=hJFBnIRu; 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=1671562213; a=rsa-sha256; cv=none; b=jIGZQ1SJ4Tl2UTZe0efYQ/k9eJ5hqfQ/SIr70eSuie7z6Inb6nJAzHXRLb6OyUaaMnECp1 mmKNTgiBQWlnTCfqH3+ENuSY10x7ZvtNVvwX2Ac8DJv3v7QuMaGRDESFupcYZkEolzrVWy wo5v50t15U9S5woAFi8cvUVZ4ybbpc4RociQUqR0QDERsmokZSTxhbfAcyIpBuBkAo6RP/ /QuiW9laa+KDUnjkKa2lDPbttnBqatqSuacnYQt+9qblOECQFbiZinUtZDfpSZccOmZfyu e+DcwYIpHf2bYSK4SwSGxJAyTCiYbUV73iUfQqKGl3FlAdrwxBQEG2lfy8jZeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1671562213; 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=XmXI+n3NwzrulGFb5noGXlJMzCZEz3A1YQMLG4RxmDo=; b=sF/GFTZvi6Gtvhwob/GCnWIqdnlfLITJls5m6NRVAHmHDg/PvNc7/NZw8n8Izjo14ItJpO xVZp+5SesouBXTK/Xfv9/DcuURUp2aUPtYieyiwN2t4bVEp9THbdBDSOJHcDHQxumm6hZz I5YbeFCnBZN9t0et+JJvKizJ+JyEL7cEr/w0yqgKIKWS37NSLyV3G+N5AOQGtKfeqRREV2 iYLOUeoED2HIxrTe1lUIZzWInxqQLaAwXNOV1AGaXs8fOgvwnqznZ3N/8/GwWmw2egF2mu 1FlvzVZ/8txB5HjW/vkK0a1DydFI+jJM2HaUdeUC1oAY3QZ3TFWkoDveNQhwBQ== 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=hJFBnIRu; 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: 47260EE7E X-TUID: ZCqa7JbX6kAi * gnu/packages/bootloaders.scm (u-boot-pinebook-pro-rk3399) [arguments]: Use gexps. [phases] {set-environment}: Look also in native-inputs (for cross-compilation). [native-inputs]: Remove input labels and use modify-inputs. --- 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 6893d12745..7e78b9af41 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1145,17 +1145,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