diff mbox series

[bug#60224,v3,10/11] gnu: u-boot-puma-rk3399: Use make-u-boot-sunxi64-package.

Message ID 20230102004637.3920-10-maxim.cournoyer@gmail.com
State New
Headers show
Series [bug#60224,v3,01/11] gnu: make-u-boot-package: Add a u-boot argument and use gexps. | expand

Commit Message

Maxim Cournoyer Jan. 2, 2023, 12:46 a.m. UTC 
* gnu/packages/bootloaders.scm (u-boot-puma-rk3399): Use make-u-boot-sunxi64-package.

---

(no changes since v2)

Changes in v2:
- Add commit to allow disabling cross-compilation

 gnu/packages/bootloaders.scm | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

Comments

Vagrant Cascadian Jan. 6, 2023, 5:09 p.m. UTC | #1 
On 2023-01-01, Maxim Cournoyer wrote:
> * gnu/packages/bootloaders.scm (u-boot-puma-rk3399): Use make-u-boot-sunxi64-package.
...
> diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
> index 960c5b4a88..18750c2ad4 100644
> --- a/gnu/packages/bootloaders.scm
> +++ b/gnu/packages/bootloaders.scm
> @@ -1090,23 +1090,7 @@ (define-public u-boot-cubietruck
>    (make-u-boot-package "Cubietruck" "arm-linux-gnueabihf"))
>  
>  (define-public u-boot-puma-rk3399
> -  (let ((base (make-u-boot-package "puma-rk3399" "aarch64-linux-gnu")))
> -    (package
> -      (inherit base)
> -      (arguments
> -       (substitute-keyword-arguments (package-arguments base)
> -         ((#:phases phases)
> -          `(modify-phases ,phases
> -             (add-after 'unpack 'set-environment
> -               (lambda* (#:key inputs #:allow-other-keys)
> -                 (setenv "BL31"
> -                         (search-input-file inputs "/bl31.elf"))))
> -             ;; Phases do not succeed on the bl31 ELF.
> -             (delete 'strip)
> -             (delete 'validate-runpath)))))
> -      (native-inputs
> -       `(("firmware" ,arm-trusted-firmware-rk3399)
> -         ,@(package-native-inputs base))))))
> +  (make-u-boot-sunxi64-package "puma-rk3399" "aarch64-linux-gnu"))

This is definitely not a sunxi64 platform (sunxi ~= the community name
for allwinner platforms, and rk3399 is rockchip based), so either the
make-u-boot-sunx64-package has been overgeneralized and should be
renamed, or this is just not right...

live well,
  vagrant
diff mbox series

Patch

diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index 960c5b4a88..18750c2ad4 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -1090,23 +1090,7 @@  (define-public u-boot-cubietruck
   (make-u-boot-package "Cubietruck" "arm-linux-gnueabihf"))
 
 (define-public u-boot-puma-rk3399
-  (let ((base (make-u-boot-package "puma-rk3399" "aarch64-linux-gnu")))
-    (package
-      (inherit base)
-      (arguments
-       (substitute-keyword-arguments (package-arguments base)
-         ((#:phases phases)
-          `(modify-phases ,phases
-             (add-after 'unpack 'set-environment
-               (lambda* (#:key inputs #:allow-other-keys)
-                 (setenv "BL31"
-                         (search-input-file inputs "/bl31.elf"))))
-             ;; Phases do not succeed on the bl31 ELF.
-             (delete 'strip)
-             (delete 'validate-runpath)))))
-      (native-inputs
-       `(("firmware" ,arm-trusted-firmware-rk3399)
-         ,@(package-native-inputs base))))))
+  (make-u-boot-sunxi64-package "puma-rk3399" "aarch64-linux-gnu"))
 
 (define-public u-boot-qemu-riscv64
   (make-u-boot-package "qemu-riscv64" "riscv64-linux-gnu"))