From 478e3e85c5bb8c9b6387e00a3c6923421e15328a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 5 Mar 2025 00:13:05 +0100 Subject: [PATCH] gnu: bootloaders: Remove top-level circular dependency with firmware.scm. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes a circular dependency in ‘make-u-boot-rockchip-package’ that became apparent with 6e41ca397dd2810ee78bce8fdd11da5ba09c8fd4. * gnu/packages/bootloaders.scm (make-u-boot-rockchip-package): Remove ‘atf’ variable. Move ‘match’ form to the ‘inputs’ field. In ‘set-environment’ phase, use ‘search-input-file’. Change-Id: Ic42453efb8c2ef50a5f902998129bb8d6f0defdc --- gnu/packages/bootloaders.scm | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 58a7a667779..153e5ede0bb 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013-2019, 2021, 2023-2024 Ludovic Courtès +;;; Copyright © 2013-2019, 2021, 2023-2025 Ludovic Courtès ;;; Copyright © 2015, 2018 Mark H Weaver ;;; Copyright © 2015 Leo Famulari ;;; Copyright © 2016, 2020, 2024 Janneke Nieuwenhuizen @@ -1155,10 +1155,7 @@ CONFIG_TOOLS_KWBIMAGE=n")))) (System on Chip)." (let* ((board (string-append board "-" (symbol->string soc))) (base (make-u-boot-package board "aarch64-linux-gnu" - #:configs configs)) - (atf (match soc - ('rk3399 arm-trusted-firmware-rk3399) - ('rk3328 arm-trusted-firmware-rk3328)))) + #:configs configs))) (package (inherit base) (arguments @@ -1167,9 +1164,11 @@ CONFIG_TOOLS_KWBIMAGE=n")))) #~(modify-phases #$phases (add-after 'unpack 'set-environment (lambda* (#:key inputs #:allow-other-keys) - (let ((atf (assoc-ref inputs #$(package-name atf)))) - (setenv "BL31" (string-append atf "/bl31.elf"))))))))) - (inputs (modify-inputs (package-inputs base) (append atf)))))) + (setenv "BL31" (search-input-file inputs "/bl31.elf")))))))) + (inputs (modify-inputs (package-inputs base) + (append (match soc + ('rk3399 arm-trusted-firmware-rk3399) + ('rk3328 arm-trusted-firmware-rk3328)))))))) (define-public u-boot-am335x-boneblack (let ((base (make-u-boot-package