From patchwork Tue Dec 20 18:34:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 45475 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 3B27627BBED; Tue, 20 Dec 2022 18:50:15 +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 CB02627BBE9 for ; Tue, 20 Dec 2022 18:50:14 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p7hST-0008EH-Hy; Tue, 20 Dec 2022 13:35:21 -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-00089F-RP 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 1p7hSC-0000Gh-Nq for guix-patches@gnu.org; Tue, 20 Dec 2022 13:35:07 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p7hSC-0004JO-K2 for guix-patches@gnu.org; Tue, 20 Dec 2022 13:35:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60224] [PATCH 5/9] 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: Tue, 20 Dec 2022 18:35:04 +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.167156129116507 (code B ref 60224); Tue, 20 Dec 2022 18:35:04 +0000 Received: (at 60224) by debbugs.gnu.org; 20 Dec 2022 18:34:51 +0000 Received: from localhost ([127.0.0.1]:46472 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7hRy-0004Hz-Ax for submit@debbugs.gnu.org; Tue, 20 Dec 2022 13:34:50 -0500 Received: from mail-qt1-f176.google.com ([209.85.160.176]:44601) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7hRt-0004Gs-Qh for 60224@debbugs.gnu.org; Tue, 20 Dec 2022 13:34:46 -0500 Received: by mail-qt1-f176.google.com with SMTP id c11so3887146qtn.11 for <60224@debbugs.gnu.org>; Tue, 20 Dec 2022 10:34:45 -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=3zCyxb5K5VdB2W8TGIbeGchvmYcJpl78QbfX399jlAk=; b=PartcC9qCkotdcmT3RRoT95Rkw/INWPrHodAfe1NZ3Kle376lZfXAbuk9rShwoSUAd OMCr1dn3njm9iCntGhE4XSy8RmNuHuRiuC3qa9kWl0PC4Ps4e1qXCpPNlt0TIPJGfrvq ZYcd1jMYhwKVH6MNqhl1YNUgMDXMyF8eZEKaPeb2jwps5T4vUmQN2M4wq9VXtslmQIrh LNqd3izIQKygAduiDBqKWDrosq40q2K++YPITwoSDW9nQ7ZMNxlySnE2b1yqLLsCKWK9 rX6RlfGGrkXcCDXH/1qYDMYZyIjwaqY/yBQK75wbu8y6XA4XMpz3++FuyKtfMvyluy0N EOTA== 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=3zCyxb5K5VdB2W8TGIbeGchvmYcJpl78QbfX399jlAk=; b=K1QueGkBjwamDSi9Ud+PkaLbL6UbcCQrmLTQxDfWOE7qsxFPlw156Kb+R3cImfhcqM BSJk319fb/7Ap6v8GH4907UP7SBgPcPyQpXcH/AB+gQh5vLdZzO1xqEoexogP3r9B7o5 TA3UgtQzpzB/r1R5+B1YIxVG7RogsD5i0cQCt0OHOmSAZje8vyu2J5n+/uDzOYZTyOL2 AsWqDDKlZOD8SFKlEoi2npXgVUJiZ778h/n2lIN4kbFZeW6NlakEMe2MboEaZG4NRj0P z441MRdpeihlRWeVP7JJN34xBTRh+hdUSNkqAWD3oVOwDftBa9/T1NKGDhufEpUoSSCL 0NxQ== X-Gm-Message-State: ANoB5plB+HlwZU/GzqgA8FIXz5hzllceMxxNQWmcVHi+LmfZAiFLGsPX nswXQZBJZfAu1Z04/JSc5TD6NwbKA1FxNBxH X-Google-Smtp-Source: AA0mqf7uFjwC946egqG0QsD8oMqDEUr0mwSYs1S6fsogsashH+Ps4oGV6maKVIZmsVjXxBZ4BMM3MA== X-Received: by 2002:ac8:5406:0:b0:3a7:eb2c:efea with SMTP id b6-20020ac85406000000b003a7eb2cefeamr62648215qtq.19.1671561280181; Tue, 20 Dec 2022 10:34:40 -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.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Dec 2022 10:34:39 -0800 (PST) From: Maxim Cournoyer Date: Tue, 20 Dec 2022 13:34:23 -0500 Message-Id: <20221220183427.31752-6-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 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. --- 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 7e78b9af41..ae847080d0 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1080,16 +1080,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"