From patchwork Wed Jan 11 20:44:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 46056 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 53C9527BBE9; Wed, 11 Jan 2023 20:46:59 +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 5573427BBEB for ; Wed, 11 Jan 2023 20:46:57 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pFhzk-0002by-05; Wed, 11 Jan 2023 15:46:49 -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 1pFhz2-00028L-77 for guix-patches@gnu.org; Wed, 11 Jan 2023 15:46:10 -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 1pFhz1-000810-Od for guix-patches@gnu.org; Wed, 11 Jan 2023 15:46:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pFhz1-0007MC-Ko for guix-patches@gnu.org; Wed, 11 Jan 2023 15:46:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH v4 12/12] gnu: u-boot-puma-rk3399: Fix build. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 11 Jan 2023 20:46:03 +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.167346991528170 (code B ref 60224); Wed, 11 Jan 2023 20:46:03 +0000 Received: (at 60224) by debbugs.gnu.org; 11 Jan 2023 20:45:15 +0000 Received: from localhost ([127.0.0.1]:44031 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFhyF-0007KC-25 for submit@debbugs.gnu.org; Wed, 11 Jan 2023 15:45:15 -0500 Received: from mail-vk1-f178.google.com ([209.85.221.178]:40930) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFhyB-0007Ii-1o for 60224@debbugs.gnu.org; Wed, 11 Jan 2023 15:45:11 -0500 Received: by mail-vk1-f178.google.com with SMTP id w72so7804584vkw.7 for <60224@debbugs.gnu.org>; Wed, 11 Jan 2023 12:45:11 -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=S5SLEwlkzVnelb0AqsZ/Hk+Ptl+a04guB8w7hKuzQoY=; b=CBv6roa8e6NFul6kdqmZwhUnaOV4gvqlh3wTsOzjXKWxQC9+NaL4TBjTmIkDDVDcAs A9Uc0ShqIOsrwmQL5XCyzwx+NPNBfkg7s+YwlM2n0g+jdgsNe66MMLUJIAxtSuSiVR8x /w8O5bS7bIJ2aql4Mw+IClhBxfbXO6nFdeq98ZUFigcfBNlUk+rMaqv+2743z8ZB4L3G zQWf+vSOkPLGQrDwg+LwfMKlFKGly33aLTk0HlImUbM0VQmEOYYP+ihVLRhF2Swk8XBV R66wUmZ4oho9XqR17a7UYk4Jk+bWvH75ZIYyxmBvGgnB1cnVSYFqmP2KPFFcCMwpLxBT KpIA== 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=S5SLEwlkzVnelb0AqsZ/Hk+Ptl+a04guB8w7hKuzQoY=; b=EmJECm9H530wOLxMBTdopl9fsebsq/9DP6IB4xt/AibNLJGA86hqGsnPjPB7icG7NB Q6INfkxuSp8Fy6bKFMTiQqQg9L0H/YNi+DrunzV2lUBwve73tKzrNiyJ89/6LMxCX83/ qwWtcrmYmbRG8pntlHpdpRNQdE8EhJUD7GmqtMcvNgz53XTTTe+NxqYEYh3QhbgmbteI n49Uhdeax8K/42FI8wiRvCCD4CgmUqo8mE7RGppsPdA5HgCkiU4LJ+8Qel4oZ18o84/R rmKDVC8ziXSs45/7JaKQJlU1Bd7Gy/PY3VfyMES7fmt1EpY6oVcC206BGUfRu2luU4lQ gw4A== X-Gm-Message-State: AFqh2ko6/0cm7KKgFV5y3oDW8jfDOB1dGgiyi5n5FywXSjz3HCX5vAAc uhbotvaa0E3skPMDKVciMjvLpzCeR/Vi38JT X-Google-Smtp-Source: AMrXdXtF9UTuzJ0c5BIN31rE9tiqaIthJ5IHrZnl+9+yUrm6ho0no63M5U9gMpfcJ4RPycnXqBGzUQ== X-Received: by 2002:a1f:a8c7:0:b0:3da:f53f:8fc0 with SMTP id r190-20020a1fa8c7000000b003daf53f8fc0mr2412598vke.4.1673469903990; Wed, 11 Jan 2023 12:45:03 -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.45.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Jan 2023 12:45:03 -0800 (PST) From: Maxim Cournoyer Date: Wed, 11 Jan 2023 15:44:33 -0500 Message-Id: <20230111204433.15305-12-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-puma-rk3399) [arguments]: Use gexps. [native-inputs]: Turn into... [inputs]: ... this, and use modify-inputs. --- 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 0878dd3168..c3f254cf0b 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1100,17 +1100,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"))