From patchwork Wed Jan 11 20:44:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 46052 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 F164C27BBED; Wed, 11 Jan 2023 20:46:19 +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=ham 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 5F56427BBE9 for ; Wed, 11 Jan 2023 20:46:19 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pFhyI-0001fv-Pn; Wed, 11 Jan 2023 15:45:18 -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 1pFhy6-0001Sr-Od for guix-patches@gnu.org; Wed, 11 Jan 2023 15:45:07 -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 1pFhy6-0007ho-Gm for guix-patches@gnu.org; Wed, 11 Jan 2023 15:45:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pFhy6-0007Iz-D5 for guix-patches@gnu.org; Wed, 11 Jan 2023 15:45:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH v4 05/12] 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: Wed, 11 Jan 2023 20:45:06 +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.167346990528048 (code B ref 60224); Wed, 11 Jan 2023 20:45:06 +0000 Received: (at 60224) by debbugs.gnu.org; 11 Jan 2023 20:45:05 +0000 Received: from localhost ([127.0.0.1]:44008 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFhy4-0007I6-Ld for submit@debbugs.gnu.org; Wed, 11 Jan 2023 15:45:04 -0500 Received: from mail-qv1-f41.google.com ([209.85.219.41]:42705) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFhy0-0007G7-Rk for 60224@debbugs.gnu.org; Wed, 11 Jan 2023 15:45:01 -0500 Received: by mail-qv1-f41.google.com with SMTP id m12so9327553qvt.9 for <60224@debbugs.gnu.org>; Wed, 11 Jan 2023 12:45:00 -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=2KS2ghGrg8G4eNG1qdIUPrWIzppWkyfxRrFdJGv+6Fo=; b=nUzyNEYOkLJKyyNbXcHX1uSWRuzmjD06uF79rXBSRhhs/LwNn3DxavF/ngFBgIZ3lM bmGP+Xc04t3czfltmYPujExyeK/gZZ6qHnpwiVS3X/DZrx0zbfp1O6NeJRCOySdptTDw qmeIqhBKY2UpXw3m0caPCO0xEfIJoEYbvA5yUsmCo9fqz2FW6bnVJQBgq4/E3xwXv+GC AQU/u2mC4JCWXggmLNSCSe2Xe/dIIyQZIkMQCD1W9Mf6z+zVJ/lERLys9epJ+F6zt4P3 0LxWmqO9dbi3OF+D7ujvHwmIMHMST+vP0LRXbl+q6v2LI8gb8WDs+R68vOipnHB1b3r6 DLDg== 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=2KS2ghGrg8G4eNG1qdIUPrWIzppWkyfxRrFdJGv+6Fo=; b=TYJk05tpGQAw8ghihw1IiOcZro3XjrGBYP+Oxh8fg4vtPQpfm0srmq6GvKj4cQVERG dv7Yo7cHTGeMbtfSnEQRkW4bVm88K6Dm32lvyZmhOBGtY65NNfmHO8lbu8ctHPQxHvjB NZsrBK1CXjkB3GNx31bLBdHU0wkOtqpGYigHAMx1C69EQiMmYHArW46AG5d3IoQyWCP5 M8JZ509A0Y/RiDdAlYO9IdogoravjrdppBIQweZ+velR9WV++rcRTRyKDtqxZ2EaeYbe +LE+4OC3IM/+3YMgJeiJzbTI1ydSvLfzbUFDgHlfNhYjhBRdJJM5BkuSYiAlwh7dKFdM QjNw== X-Gm-Message-State: AFqh2krtOjqmfP/XgPXhONg6XDE9xm8hpvL6M5mXMZlJl4WqVJzp3abE 4R9engdF1MRtzE3Oqd9r6yCum94YKQyXB9D7 X-Google-Smtp-Source: AMrXdXsLQ+V8/wtVkm3YNih8kiCi1SCt9GZ69OK5OseSduh622ccxRK42iCSF11i1NCtBtSml97cZg== X-Received: by 2002:ad4:5428:0:b0:532:1f17:2ce7 with SMTP id g8-20020ad45428000000b005321f172ce7mr27875691qvt.16.1673469895259; Wed, 11 Jan 2023 12:44:55 -0800 (PST) Received: from localhost.localdomain (dsl-159-79.b2b2c.ca. [66.158.159.79]) by smtp.gmail.com with ESMTPSA id y15-20020a05620a0e0f00b006f7ee901674sm9581862qkm.2.2023.01.11.12.44.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Jan 2023 12:44:54 -0800 (PST) From: Maxim Cournoyer Date: Wed, 11 Jan 2023 15:44:26 -0500 Message-Id: <20230111204433.15305-5-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230111204433.15305-1-maxim.cournoyer@gmail.com> References: <20230111204433.15305-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. --- 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 e48b55018b..3ac29a844b 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1230,17 +1230,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