From patchwork Mon Jan 2 00:46:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 8785 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 ACBCF27BBED; Mon, 2 Jan 2023 00:47:25 +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 1C68227BBE9 for ; Mon, 2 Jan 2023 00:47:25 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pC8yq-0001tI-T5; Sun, 01 Jan 2023 19:47:08 -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 1pC8yo-0001rS-Ft for guix-patches@gnu.org; Sun, 01 Jan 2023 19:47:06 -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 1pC8yo-0004Yj-7c for guix-patches@gnu.org; Sun, 01 Jan 2023 19:47:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pC8yo-0007Hy-3q for guix-patches@gnu.org; Sun, 01 Jan 2023 19:47:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH v3 06/11] 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: Mon, 02 Jan 2023 00:47: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 Received: via spool by 60224-submit@debbugs.gnu.org id=B60224.167262042327963 (code B ref 60224); Mon, 02 Jan 2023 00:47:06 +0000 Received: (at 60224) by debbugs.gnu.org; 2 Jan 2023 00:47:03 +0000 Received: from localhost ([127.0.0.1]:42078 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC8yl-0007Gm-5Y for submit@debbugs.gnu.org; Sun, 01 Jan 2023 19:47:03 -0500 Received: from mail-qt1-f175.google.com ([209.85.160.175]:44660) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pC8yi-0007F0-Qk for 60224@debbugs.gnu.org; Sun, 01 Jan 2023 19:47:01 -0500 Received: by mail-qt1-f175.google.com with SMTP id c11so21453209qtn.11 for <60224@debbugs.gnu.org>; Sun, 01 Jan 2023 16:47: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=fhIEgZXQs7XrHkDSXGoBPg/YTzU+0HSi9Qd6Ucnil8I=; b=Gn+WyVKqbBlOYf9Dqto9u3OSS8CtDNxa3B4f25dBTLcBJUoQqu0CDkpGl3OU3MTRuJ 2h9eR5Cw/Bfm0RXfuqtZznO6XJM7ynAg+l7Jy800kbPo7Nz663ogU9tz65gNT+V/CU+s P03BkClGMTLJzDXnt+H0aaQrel0YbDBig0Ff8IeXrXfPt+zHOm7LCNz3pAuFDq8TlsLX cvHvCZJZFMDtKfMNLWSK36id6m86gr7JqPw2ixMSUPObdSGG+8msYWhGPt86NaZfxjP4 YuAi+wNqzUnzPzPwQwJjnWImSPvl9ZGC4r4tQ3Vc/jymCS8D2MHGhmqX9lAi2HtQF8lq UxJg== 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=fhIEgZXQs7XrHkDSXGoBPg/YTzU+0HSi9Qd6Ucnil8I=; b=isI64/wPabxD5fUsWbl6MwtepKR+MfRT9jYFsRdVK8vQYwE2CUxOP4QIgQ2hwgy4T4 HKoyaPh4LcOh1ikWGRvccSPcVTqEv1Wm3a7EMVFWTcYPSmB0sl3boJL/zSI4Qda/E68m YZPBJlaeFeZfdJicWoZ2kSmQ6gqpHcAET2ZgY2Oo+3RzVp8XZQN4oj4Rh28wnXqEWv/3 lRoyjuhdKoTmd76HecM3XeenI5+U/mQtVHcc43NaIzOS8IoOcVxcbQSvQap+zF7vi/q4 JHa/qCHeS765BT/X26AObqEZpXLqOaXzZQxnqWy7zh8xhskO3CqZ9AMQNzCiiP/Dutkp CRxw== X-Gm-Message-State: AFqh2kqrnapecpuVNOyZJLC9DzpP5Rnhi7rSkhTkJjX+2EL2Y94NU7aG Uhbk0r421QiSfghjuk+s5kUZe8ux0+PyTA== X-Google-Smtp-Source: AMrXdXu6w/h8X/7cVL00ZM8oVXS9uqiCjWOR+C4b8Yg2q98ILWSG9WgExkpnL6Cv094XmWYiYRX5yg== X-Received: by 2002:a05:622a:4d8a:b0:39c:da20:5f8 with SMTP id ff10-20020a05622a4d8a00b0039cda2005f8mr73291592qtb.2.1672620415252; Sun, 01 Jan 2023 16:46:55 -0800 (PST) Received: from localhost.localdomain (dsl-10-148-224.b2b2c.ca. [72.10.148.224]) by smtp.gmail.com with ESMTPSA id h24-20020ac87458000000b003a7ef7a758dsm16788311qtr.59.2023.01.01.16.46.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Jan 2023 16:46:54 -0800 (PST) From: Maxim Cournoyer Date: Sun, 1 Jan 2023 19:46:31 -0500 Message-Id: <20230102004637.3920-6-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230102004637.3920-1-maxim.cournoyer@gmail.com> References: <20230102004637.3920-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-firefly-rk3399) [arguments]: Use gexps. [phases] {set-environment}: Look for the bl31.elf in native-inputs, useful when cross-compiling. --- (no changes since v1) gnu/packages/bootloaders.scm | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 602ec7f8a3..8a56ee9cec 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1160,16 +1160,17 @@ (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))))) + #~(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")))) + ;; 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-inputs (package-native-inputs base) + (append arm-trusted-firmware-rk3399)))))) (define-public u-boot-rockpro64-rk3399 (let ((base (make-u-boot-package "rockpro64-rk3399" "aarch64-linux-gnu"