tribes/guix
1
0
Fork 1
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-05-29 12:35:15 +02:00
Code Activity

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
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gnu/packages/firmware.scm
+4 -6
View File
@@ -1108,7 +1108,7 @@ Virtual Machines. OVMF contains a sample UEFI firmware for QEMU and KVM.")
;;%current-system is a *triplet*, unlike its name would suggest. ;;%current-system is a *triplet*, unlike its name would suggest.
(string=? (%current-system) (gnu-triplet->nix-system triplet)))) (string=? (%current-system) (gnu-triplet->nix-system triplet))))
(package (package
(name (string-append "arm-trusted-firmware-" platform)) (name (downstream-package-name "arm-trusted-firmware-" platform))
(version "2.12") (version "2.12")
(source (source
(origin (origin
@@ -1131,7 +1131,7 @@ Virtual Machines. OVMF contains a sample UEFI firmware for QEMU and KVM.")
#:target (and (not (native-build?)) triplet) #:target (and (not (native-build?)) triplet)
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(replace 'configure ;no configure script (add-after 'unpack 'fix-cross-build
;; Fix ATF commit ffb7742125def3e0acca4c7e4d3215af5ce25a31 ;; Fix ATF commit ffb7742125def3e0acca4c7e4d3215af5ce25a31
(lambda _ (lambda _
(unless #$(native-build?) (unless #$(native-build?)
@@ -1140,6 +1140,7 @@ Virtual Machines. OVMF contains a sample UEFI firmware for QEMU and KVM.")
(substitute* "make_helpers/build_macros.mk" (substitute* "make_helpers/build_macros.mk"
(("-oc") "-oc-default") (("-oc") "-oc-default")
(("-od") "-od-default"))))) (("-od") "-od-default")))))
(delete 'configure) ;no configure script
(replace 'install (replace 'install
(lambda _ (lambda _
(for-each (lambda (file) (for-each (lambda (file)
@@ -1171,10 +1172,7 @@ interface standards, such as:
license:bsd-2)))) ; libfdt license:bsd-2)))) ; libfdt
(define-public arm-trusted-firmware-sun50i-a64 (define-public arm-trusted-firmware-sun50i-a64
(let ((base (make-arm-trusted-firmware "sun50i_a64"))) (make-arm-trusted-firmware "sun50i_a64"))
(package
(inherit base)
(name "arm-trusted-firmware-sun50i-a64"))))
(define-public arm-trusted-firmware-rk3328 (define-public arm-trusted-firmware-rk3328
(make-arm-trusted-firmware "rk3328")) (make-arm-trusted-firmware "rk3328"))