mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-19 05:57:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: make-arm-trusted-firmware: Use downstream-package-name.

Browse source 
* gnu/packages/firmware.scm (make-arm-trusted-firmware): Use
downstream-package-name.
[arguments]: Remove configure phase, use fix-cross-build phase instead.
(arm-trusted-firmware-sun50i-a64): Return base package directly.

Change-Id: I23f05ac5e8e897037cd8d8afc4e747b05e56e32d
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Herman Rimm 2024-12-20 18:35:04 +01:00 committed by Ludovic Courtès
parent f6b85da0b9
commit 558c1f39a1
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gnu/packages/firmware.scm
View file

@ -1108,7 +1108,7 @@ (define (native-build?)
;;%current-system is a *triplet*, unlike its name would suggest.
(string=? (%current-system) (gnu-triplet->nix-system triplet))))
(package
(name (string-append "arm-trusted-firmware-" platform))
(name (downstream-package-name "arm-trusted-firmware-" platform))
(version "2.12")
(source
(origin
@ -1131,7 +1131,7 @@ (define (native-build?)
#:target (and (not (native-build?)) triplet)
#:phases
#~(modify-phases %standard-phases
(replace 'configure ;no configure script
(add-after 'unpack 'fix-cross-build
;; Fix ATF commit ffb7742125def3e0acca4c7e4d3215af5ce25a31
(lambda _
(unless #$(native-build?)
@ -1140,6 +1140,7 @@ (define (native-build?)
(substitute* "make_helpers/build_macros.mk"
(("-oc") "-oc-default")
(("-od") "-od-default")))))
(delete 'configure) ;no configure script
(replace 'install
(lambda _
(for-each (lambda (file)
@ -1171,10 +1172,7 @@ (define (native-build?)
license:bsd-2)))) ; libfdt
(define-public arm-trusted-firmware-sun50i-a64
(let ((base (make-arm-trusted-firmware "sun50i_a64")))
(package
(inherit base)
(name "arm-trusted-firmware-sun50i-a64"))))
(make-arm-trusted-firmware "sun50i_a64"))
(define-public arm-trusted-firmware-rk3328
(make-arm-trusted-firmware "rk3328"))