From patchwork Mon Jan 16 03:25:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 46174 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 DDCAD27BBE9; Mon, 16 Jan 2023 03:27:53 +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 686BB27BBEB for ; Mon, 16 Jan 2023 03:27:52 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pHG9O-0000IP-2e; Sun, 15 Jan 2023 22:27:10 -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 1pHG9L-0000HU-IE for guix-patches@gnu.org; Sun, 15 Jan 2023 22:27: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 1pHG9L-0005q5-Az for guix-patches@gnu.org; Sun, 15 Jan 2023 22:27:07 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pHG9L-0007u7-6n for guix-patches@gnu.org; Sun, 15 Jan 2023 22:27:07 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH v5 13/13] gnu: u-boot-puma-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:07 +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.167383958430229 (code B ref 60224); Mon, 16 Jan 2023 03:27:07 +0000 Received: (at 60224) by debbugs.gnu.org; 16 Jan 2023 03:26:24 +0000 Received: from localhost ([127.0.0.1]:60078 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG8d-0007rQ-MU for submit@debbugs.gnu.org; Sun, 15 Jan 2023 22:26:23 -0500 Received: from mail-qv1-f49.google.com ([209.85.219.49]:46825) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pHG8U-0007pj-6l for 60224@debbugs.gnu.org; Sun, 15 Jan 2023 22:26:14 -0500 Received: by mail-qv1-f49.google.com with SMTP id p96so6779765qvp.13 for <60224@debbugs.gnu.org>; Sun, 15 Jan 2023 19:26:14 -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=N0sM0haOlZUXc1qzcXi0eQd/VxpLktQ3HServgQFosM=; b=qK73+VxovCkgLYsmV1tyK7vMRXNosM2JyzNnvE+8wocNa0nVEnK1PuG9SmzSbdtqga thCfoE9TdbwLRcYSZAbwLq38BvqGoibFoZboLIgM8fDrx3YbUK/hLC0xqGKAM/f1wLqC RJhaUwQ2+tXNiE9rWXqZIykJkU8unVNycUBhUmpkCuncViMYeL3eDeU4aWO+TyKLGFgC VqzoiNkvg4B8+GfEIikQNI3QrTPtLfIfGJQbX45fDdnbbKCGlpnSLekf1PVboV6v3ddT 565YB4IiwjQZaxEVTdAZ1TCfD56iVWMAjBfVhQJ3OFGPRPJ+/YqW1K0wnbLUqhfq0qyf R7Aw== 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=N0sM0haOlZUXc1qzcXi0eQd/VxpLktQ3HServgQFosM=; b=cX81U/4BrFq4a88+r9XsYfjE43CiZirCMl6Fu8SECZUwQ9b7LNUUKB1pnloQu63pv4 /ogKf31a5qvKIjqAea7n/FDvrD2sOWqWRvnjd2WAi5FfESas5hQkXB0X46aiSfcHdo6J OqstvZjMNElWYscftQj/tEFPKdr20T6lrvoEGUDKmxl1VTW1Tp73efjyL48KNRrs9XLL t8auEeqVXiUDlb2HnokZlhs4thIdRtCQAi7veelNsBmxAjFkDIkgw+9s2xARjnzAj78V rhXvP2YMZYc0Q8wfYG0qf1SCmluNgWtWT+FcyZT+QWXkjt3twWXZsuql/r9unFLFkVv6 Edgg== X-Gm-Message-State: AFqh2koCUJgw3rLW8GxBU0uaZ+g1bizyEOs08v6loUXLDAckfIqQAfIj mBbWykNufL7ZUAWfx+u3wBOR6N484URCe8U1 X-Google-Smtp-Source: AMrXdXs1QkRkKNDBBdhVH/QW17qep1FO+jwEIyUK1JDXrZaL6sZRUyH2SGLYxP71G+iADLkz0OJPBA== X-Received: by 2002:ad4:5308:0:b0:532:25ce:8ae0 with SMTP id y8-20020ad45308000000b0053225ce8ae0mr45703373qvr.10.1673839568597; Sun, 15 Jan 2023 19:26:08 -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.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Jan 2023 19:26:08 -0800 (PST) From: Maxim Cournoyer Date: Sun, 15 Jan 2023 22:25:44 -0500 Message-Id: <20230116032544.1378-13-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-puma-rk3399) [arguments]: Use gexps. [native-inputs]: Turn into... [inputs]: ... this, and use modify-inputs. --- (no changes since v4) Changes in v4: - New commit 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 9da97232ea..4cf6a74022 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1091,17 +1091,16 @@ (define-public u-boot-puma-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 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-native-inputs base) + (append arm-trusted-firmware-rk3399)))))) (define-public u-boot-qemu-riscv64 (make-u-boot-package "qemu-riscv64" "riscv64-linux-gnu"))