bartronx7/guix
1
0
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2026-01-25 12:05:19 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: bootloaders: Remove top-level circular dependency with firmware.scm.

Browse source 
Fixes a circular dependency in ‘make-u-boot-rockchip-package’ that
became apparent with 6e41ca397d.

* 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
This commit is contained in:
Ludovic Courtès 2025-03-05 00:13:05 +01:00
parent 6e41ca397d
commit 478e3e85c5
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
gnu/packages/bootloaders.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013-2019, 2021, 2023-2024 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013-2019, 2021, 2023-2025 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015, 2018 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016, 2020, 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
@ -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