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 aCjfIRUgv2OfZQEAbAwnHQ (envelope-from ) for ; Wed, 11 Jan 2023 21:46:13 +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 WCbKIBUgv2MqbgEAG6o9tA (envelope-from ) for ; Wed, 11 Jan 2023 21:46:13 +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 457EADC28 for ; Wed, 11 Jan 2023 21:46:13 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pFhyF-0001dM-EF; Wed, 11 Jan 2023 15:45:15 -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 1pFhy7-0001Tx-7W 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-0007hu-VW 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-0007J6-RQ for guix-patches@gnu.org; Wed, 11 Jan 2023 15:45:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH v4 06/12] gnu: u-boot-firefly-rk3399: Use gexps and fix cross-build. 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.167346990528056 (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]:44011 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFhy5-0007IK-1Y for submit@debbugs.gnu.org; Wed, 11 Jan 2023 15:45:05 -0500 Received: from mail-qv1-f50.google.com ([209.85.219.50]:41760) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pFhy2-0007G9-35 for 60224@debbugs.gnu.org; Wed, 11 Jan 2023 15:45:02 -0500 Received: by mail-qv1-f50.google.com with SMTP id d13so11373218qvj.8 for <60224@debbugs.gnu.org>; Wed, 11 Jan 2023 12:45:02 -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=HWMDZjv/QNOvrmvQMYiRmg8GEMr0QcInTGadyWGc/9A=; b=aDeG1lRm1jxwBkcTxGlIeQLQNTUe1i+M1Eo2UJ7QlOVmgDb+42MZGnSN7fDccxzb5A 5GBgnarwROFTMwChJx3lXkm4Lx9ZTGWz2EZQAPa9j9G1SBog5UZHNrivCwXcM7DQymEq HZYg6q9sEXy7oSfNjc5cnAKcSGrs85skNeYM24f/1I+ZnDMphXQA2RpJWpaad0qkcEmm 0ukd1JWmCQDkyAh+pScWJlexUMpIfqwnKQuEdkJDHU59YkdiWzHS3kooMbl+1sJovmxh JieGUKlccIfM8DDQB7byTXqPXrMsO4mqln585RjFFQjLIQlojl62mULApbhtmIwZtc8Y qY1A== 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=HWMDZjv/QNOvrmvQMYiRmg8GEMr0QcInTGadyWGc/9A=; b=lmTfXQrhyS6rbueoFux839/aS0bKMGH2T/pohCwcxJBc1JIlStJacFPqz6ofYUkWFR 1z8Sb9zKE+ilqaUUnyu3u+1m4JQb57LuC8ojIOhfCwqDvORjSf9WQarJ8AkSIU6eJGBo agvZA/cQWy/UzyVKz2qfdCw7qrwi4y5ipyjy7ZV1kYw/7oI8HdKPzaX08iuJ74OMtFpc qhIiEraFGxpYkpbDa7GpnIjFZ7tsr/m9pbWxzaKPuiTradUbyyaTzv3e6zrVWig1O5DC yVbnE0Ab8ealzPEqqceBTonF3ImV4BNLRKxuYHYiM0001vq9UTxfPQB7/aL4Wt0fkks1 ObQw== X-Gm-Message-State: AFqh2kqEUE3TNH/gBIFYa3zC6CvTmAm+jYSLByKZ9HUGmFJQddQsFCOv eWGc1hk7gJJ6fc1RXkUopatJMJyzxNQgvzWo X-Google-Smtp-Source: AMrXdXuEjQ+BxFN8EbrKeQHOR7/8t+i28k+aK8bj07+vE1j1V1GOPEceFlOWmACT1+m5La1HLa7oNA== X-Received: by 2002:a0c:c783:0:b0:531:c27b:8ab3 with SMTP id k3-20020a0cc783000000b00531c27b8ab3mr50117958qvj.41.1673469896461; Wed, 11 Jan 2023 12:44:56 -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.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Jan 2023 12:44:56 -0800 (PST) From: Maxim Cournoyer Date: Wed, 11 Jan 2023 15:44:27 -0500 Message-Id: <20230111204433.15305-6-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 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-Seal: i=1; s=key1; d=yhetil.org; t=1673469973; a=rsa-sha256; cv=none; b=kLcWlAHHH4EKivUzqBTtk0UAuhJyawi1JvcGZ0rQm/HfzQAPzSQAXgEWl7j3/GqbrKtA6F uD72IIX5Rgb/Ry1HezqNVlIOrT2XOdehINsvYnDDCti2IaOGzRb0+YDC2eAuHFKNmJuFw3 ThfDpEZNUdxNS6w0n7aWpNJcyNfaL9Xzd0RDjSgQdR/b9BimSTMH+GAT/Mg2dctDBj0QUu ZavAdZKHwfbxnyxubGMY3nhmtx+VSmJnBrgpYcPiyMIvytZtcnr1yOPUPMmREt95kU0zMS /GkG/RO+AhZy8zbk5BHclXegjXcnhWS11tGIfYEoKh3LXT2SCMNNHGpJ5VOX9w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=aDeG1lRm; 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"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1673469973; 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=HWMDZjv/QNOvrmvQMYiRmg8GEMr0QcInTGadyWGc/9A=; b=uBBI8rDoiy8abW7ahZsOXXDxw4cYV8Cqgg6sO5HHgPLWguye8H6kxqRCjbLX+9FTrIGycH dWVZK4hIXxjtBwyZazMGGR0RoO0Zy+wI9N07YlqPccDwMh5ak/WxAiPXGL4mB6bVyVFr/I 1h7y56FfIrfvRCxEvtPYEV6b9+6eECTBObiSQyEodHTp60eg5ZeUqvxYehTSqyvXvPeCtK GG8UsBJ+0OV/qGG+emrP75+j7w4fhsiebJ/uFJJdPpyFW+J8FPzl1RY7NaKEFT4DYMHmgc LmdK15IdrPZtUJ/tRZWNNsTeFKSSvUUmvKxp1+fl/gRt1kPIYsqEVQ6qPd6Svw== X-Migadu-Spam-Score: 0.00 X-Spam-Score: 0.00 X-Migadu-Queue-Id: 457EADC28 X-Migadu-Scanner: scn1.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=aDeG1lRm; 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"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) X-TUID: 6k+x1Ka0sD/s * gnu/packages/bootloaders.scm (u-boot-firefly-rk3399) [arguments]: Use gexps. [native-inputs]: Use modify-inputs and turn into... [inputs]: ... this. --- Changes in v4: - Move arm-trusted-firmware-rk3399 to inputs gnu/packages/bootloaders.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 3ac29a844b..87d5bcb824 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1165,16 +1165,16 @@ (define-public u-boot-firefly-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 u-boot-rockpro64-rk3399 (let ((base (make-u-boot-package "rockpro64-rk3399" "aarch64-linux-gnu" -- 2.38.1