From patchwork Mon Jan 16 03:25:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 46176 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 14AE527BBE9; Mon, 16 Jan 2023 03:28:09 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D782B27BBEB for ; Mon, 16 Jan 2023 03:28:07 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pHG9J-0000FS-Qg; Sun, 15 Jan 2023 22:27:05 -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-0000EU-I9 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-0005pK-A8 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-0007t5-66 for guix-patches@gnu.org; Sun, 15 Jan 2023 22:27:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH v5 06/13] 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, 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.167383957130142 (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]:60060 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG8Q-0007pz-EE for submit@debbugs.gnu.org; Sun, 15 Jan 2023 22:26:10 -0500 Received: from mail-qt1-f178.google.com ([209.85.160.178]:41483) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG8L-0007oE-N0 for 60224@debbugs.gnu.org; Sun, 15 Jan 2023 22:26:06 -0500 Received: by mail-qt1-f178.google.com with SMTP id d16so10793465qtw.8 for <60224@debbugs.gnu.org>; Sun, 15 Jan 2023 19:26:05 -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=jb7G9zsiHLxyJz1jpEbEetVQuSnKbqiR5Bl3hHOWRQ0=; b=edUwSHd0rBjUJZnp3zvmryDuuwufJYQVfYslim3QNooe/ZQzI2dpB0AIpAwAfL1O9N 8Qa7oUBFDh6jePjWPpGttz7JJ7FbHKcuDXLbgbez6VfhVUNP1VhuKoix+jHQfA5spp6u GAgaDdXJ0I7gv5MP2T/BngZ/p5+F7SGDwF/BZoV/HA7SWnaBH6CR/5/IZ3WvjOOMVUvR 4/WQrbrBI5G3ZwzwF84K2HgMCFJntnHxhgwefF68rpjNuA6hmEWRPmBi+aAG3RMq7a83 g3juvZaORXGRm3gg0icbPMmO3MJNSkgLHOm79/4zgGgxr04NGABElpF3zCK6Iuuwis5r SxnQ== 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=jb7G9zsiHLxyJz1jpEbEetVQuSnKbqiR5Bl3hHOWRQ0=; b=uaVCg19TjhZNjaX7r7tfVvT9mcGlohZ0quRFeFuFdnxFnyN4hZoSdS7S4rap6vepay NSfs4vAJHoq/US8zmAThhX2gqB7LwC4l8JE4Em3GQSZTfYN9kJC4RG/1q3v2cmaXLK5K fY8eFgtml2rTpplfRqW9zKzrf4uRuQmyZvZ0TY7hFl29JP3XHX7VPrD9b71w/6X6vu6D NBnZEqU7KQPx9ANEaKErUw/m7rxKfM9kr/DSHujqWtFnwwCUb0OiY9m2mQ/TfToCmtg/ zHzJGJcKvuqwjTEQjfet6i5NgRRwIBUjvnkGqbXZUpznWU2yTqv0lZLUYkBoqAogXlxz r4wQ== X-Gm-Message-State: AFqh2kr3DUnI8GlgfrNw36RnHrSJXw8mrqjBv+49ea0f4IZCyCAIZnMr QdrR+x0jFBZm5Tof79MOxvDQOm5fanmOXxW7 X-Google-Smtp-Source: AMrXdXumFSijtXxSuvNVGfLWPyv774Zd9nXX5qmCPsXFHUolCXcKI8RWjaJvlzZOVvooLfpl7vHZFA== X-Received: by 2002:a05:622a:1cc6:b0:3b6:33c6:c5ac with SMTP id bc6-20020a05622a1cc600b003b633c6c5acmr1704254qtb.4.1673839560161; Sun, 15 Jan 2023 19:26:00 -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.25.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Jan 2023 19:25:59 -0800 (PST) From: Maxim Cournoyer Date: Sun, 15 Jan 2023 22:25:37 -0500 Message-Id: <20230116032544.1378-6-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 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/bootloaders.scm (u-boot-pinebook-pro-rk3399) [arguments]: Remove input labels. [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 | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 290d832a83..f3b3c91c47 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1221,17 +1221,16 @@ (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))))) - (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 (make-u-boot-bin-package u-boot-package #:key