From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id KOjQBSoDomPoFQEAbAwnHQ (envelope-from ) for ; Tue, 20 Dec 2022 19:47:06 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id 6BbKBCoDomMLHAEAG6o9tA (envelope-from ) for ; Tue, 20 Dec 2022 19:47:06 +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 A01BF13263 for ; Tue, 20 Dec 2022 19:47:05 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p7hSV-0008FO-Ec; Tue, 20 Dec 2022 13:35:23 -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-00089D-Qj 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 1p7hSD-0000Gl-GD for guix-patches@gnu.org; Tue, 20 Dec 2022 13:35:08 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p7hSD-0004Jc-Cu for guix-patches@gnu.org; Tue, 20 Dec 2022 13:35:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH 7/9] gnu: u-boot-rock64-rk3328: Fix build. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 20 Dec 2022 18:35:05 +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.167156129116520 (code B ref 60224); Tue, 20 Dec 2022 18:35:05 +0000 Received: (at 60224) by debbugs.gnu.org; 20 Dec 2022 18:34:51 +0000 Received: from localhost ([127.0.0.1]:46476 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7hRz-0004IJ-5k for submit@debbugs.gnu.org; Tue, 20 Dec 2022 13:34:51 -0500 Received: from mail-qt1-f182.google.com ([209.85.160.182]:43588) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7hRv-0004Gz-SB for 60224@debbugs.gnu.org; Tue, 20 Dec 2022 13:34:48 -0500 Received: by mail-qt1-f182.google.com with SMTP id a16so11730064qtw.10 for <60224@debbugs.gnu.org>; Tue, 20 Dec 2022 10:34:47 -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=JF/ncMgHASMKxyznQusw5njhOOWQoxRdlp3MW/TUu9c=; b=CyVYsHBZ3cuL2pragLsiUN8vjA412fMs9pt2qXUQqBic4A6QjaZEUsLM8Ih/QeeNtl O8Efj971fAejscbDvI8Fd1mYUNAAKM6Ne7rhyvw2eaM3cQoB3+UVfTywIymXpDaccVs+ L7/f+SUusYr00gvSJeJmkFyAhxawe6GT0cnvIb7Zqxw79Ob8LNCdRDJ76zqoPZRdhm5R p1CeJ4YS6vxITTQhWL6qVKisPa7nb/wk05qRc7tz0Fer98xrYoQylpHbv6ZyznOJboIx mpVwK+pzs4pbAWo05OoahrQXf3CoVT/JBQ7YGAuhUFoNr7xsvhkqSpnDraiCJMGlaDqY wCcw== 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=JF/ncMgHASMKxyznQusw5njhOOWQoxRdlp3MW/TUu9c=; b=6tTz9xkDrtR3HyZAZd7u12jfM+n7GY2xNxVCVpwlKuNCWL6cSZdpKcvy3hMG9CwBez oVLARA5wgzF31GuMGrz1yqP6/DOLGI1EKSlKkmUwAQty10zMeg6eCZWrF//qLcbET9Km DqdYRdMxw7SERoPESBN+Z6F4RopPWFxcAh4ROd8GjLH3N/jUN1WceVDhVmrE36xrYbkJ SOSUdvjDYKBTPo/8jna6SZPDcnQK+YFFegvh+mPM7Fnms5kCOJ7c+GZyoR3fLyk0yUQA 3dhJ+7zvumbYgFBZSke1DAuKQ9MrTiGgWtC8G7MDIF6FPFwNdcLvNyHdkmKiScQ0zCLO rlZg== X-Gm-Message-State: AFqh2kpe5ac+mDRZqRzQgQ+pUdmZQEK8lnP4w+uCnT4IgAsvuGv+hm2m yIyKLGPNLd7udYDIVOGVmMhUOc6r/pREA0Tv X-Google-Smtp-Source: AMrXdXv2TAzQE230aRSL8lNdQgSzKQ6WYYjFuJP1gPm5hy2qGSDDJ0NM1XAccDznrcqv0aGWt8ynLQ== X-Received: by 2002:ac8:507:0:b0:3a9:7faf:d635 with SMTP id u7-20020ac80507000000b003a97fafd635mr15455467qtg.1.1671561282243; Tue, 20 Dec 2022 10:34:42 -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.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Dec 2022 10:34:41 -0800 (PST) From: Maxim Cournoyer Date: Tue, 20 Dec 2022 13:34:25 -0500 Message-Id: <20221220183427.31752-8-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=CyVYsHBZ; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); 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" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1671562025; a=rsa-sha256; cv=none; b=W5Kjd5eKAJfZliYOZtjO+BMh6eHLtlbDtBrbBbbPvkuTvdb2UIDrPupLIdZQjGzhds/FaJ LPNtmUepPA2bbRliflVfC7cRnHF06hv3r1cPN2RZ6z1ZpmuaCc4ngoLPQQpC72yEtj8hBh iZuCkCZAJDCUABsygYu+ztHnDpnRQNA5Ns0cTHHQZ3kbkf2VJ2/+vdrFGCG4UbhTjpCd11 t2yEzPWFycvP2BiR4okSqJXwtNoJxKk//bhWzVIeWgJB5R/3d9BwPbR70WFD6izLZAKWg/ xz718FHBHyHTY1+AeMPh3KCauEQ7tf5fQabWyjOi4csZS/amD1EnqlaBbLrgvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1671562025; 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=JF/ncMgHASMKxyznQusw5njhOOWQoxRdlp3MW/TUu9c=; b=qb4HGxkE85aCCtUIqWc/AcKiXSyWl4EdvVI20xvCY2JdN4NrWJXfkA8e1BQ8a3+UKtSDAs j0k/xHIri1lujhwqKnUs2a4OFicGxkLaFfwnsRmos/6VDpTft2jml3wZ0x4QtWSXPbQ+6U +OeNhdHmnKwn5pE5ce1U9EZHJ0UYLQpimPQXgP14JJ2mazpUeE/CWIo/bRHy2bV/JPsYzy a36wyzTPLQKtO2pGrHx4C29/j74BoaLVop9HYPyVloJNojlxR3g2fkUpHnty0TWp3GvAKI xKl9DKINEQTVxzZeZGtONff5ZH3HlV3arHQbf9Tov4hJxx8wuXFHTMXCIeFBvw== Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=CyVYsHBZ; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); 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" X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: -1.39 X-Spam-Score: -1.39 X-Migadu-Queue-Id: A01BF13263 X-TUID: LAYkjZJ0pke3 * gnu/packages/bootloaders.scm (u-boot-rock64-rk3328) [arguments]: Use gexps. [phases] {set-environment}: Also look in native-inputs. [native-inputs]: Remove input labels and use modify-inputs. --- gnu/packages/bootloaders.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 5f0182524d..ce7be6f7b1 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1061,14 +1061,14 @@ (define-public u-boot-rock64-rk3328 (arguments (substitute-keyword-arguments (package-arguments base) ((#:phases phases) - `(modify-phases ,phases - (add-after 'unpack 'set-environment - (lambda* (#:key inputs #:allow-other-keys) - (let ((bl31 (search-input-file inputs "/bl31.elf"))) - (setenv "BL31" bl31)))))))) + #~(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")))))))) (native-inputs - `(("firmware" ,arm-trusted-firmware-rk3328) - ,@(package-native-inputs base)))))) + (modify-inputs (package-native-inputs base) + (append arm-trusted-firmware-rk3328)))))) (define-public u-boot-firefly-rk3399 (let ((base (make-u-boot-package "firefly-rk3399" "aarch64-linux-gnu"))) -- 2.38.1