[bug#74997] [PATCH 4/5] gnu: make-arm-trusted-firmware: Use downstream-package-name.

[Herman Rimm via Guix-patches via <guix-patches@gnu.org>]

* 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
---
 gnu/packages/firmware.scm | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm
index 89d29b8add..04f138f22c 100644
--- a/gnu/packages/firmware.scm
+++ b/gnu/packages/firmware.scm
@@ -1108,7 +1108,7 @@ (define* (make-arm-trusted-firmware platform #:key
         ;;%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* (make-arm-trusted-firmware platform #:key
       #: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* (make-arm-trusted-firmware platform #:key
                 (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* (make-arm-trusted-firmware platform #:key
                    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"))
-- 
2.45.2