[bug#60224] [PATCH v4 07/12] gnu: make-u-boot-sunxi64-package: Use gexps and adjust file name.

[Vagrant Cascadian]

On 2023-01-11, Maxim Cournoyer wrote:
> * gnu/packages/bootloaders.scm (make-u-boot-sunxi64-package)
> [phases] {set-environment}: Replace bl31.bin with bl31.elf; bl31.elf doesn't
> exist anymore for some reason.

The code no longer mentions bl31.elf, but the commit comment still does!

> [native-inputs]: Turn into...
> [inputs]: ... this.
>
> ---
>
> Changes in v4:
> - Revert erroneously replaced firmware package
> - Revert bl31.bin -> bl31.elf change caused by the above
> - Make the arm-trusted-firmware-sun50i-a64 a host input

So fix the commit comment to reflect that...

>  gnu/packages/bootloaders.scm | 18 +++++++-----------
>  1 file changed, 7 insertions(+), 11 deletions(-)
>
> diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
> index 87d5bcb824..0c5205fa86 100644
> --- a/gnu/packages/bootloaders.scm
> +++ b/gnu/packages/bootloaders.scm
> @@ -1010,17 +1010,13 @@ (define*-public (make-u-boot-sunxi64-package board 
> triplet
>        (arguments
>         (substitute-keyword-arguments (package-arguments base)
>           ((#:phases phases)
> -          `(modify-phases ,phases
> -             (add-after 'unpack 'set-environment
> -               (lambda* (#:key native-inputs inputs #:allow-other-keys)
> -                 (let ((bl31
> -                        (string-append
> -                         (assoc-ref (or native-inputs inputs) "firmware")
> -                         "/bl31.bin")))
> -                   (setenv "BL31" bl31))))))))
> -      (native-inputs
> -       `(("firmware" ,arm-trusted-firmware-sun50i-a64)
> -         ,@(package-native-inputs base))))))
> +          #~(modify-phases #$phases
> +              (add-after 'unpack 'set-environment
> +                (lambda* (#:key native-inputs inputs #:allow-other-keys)
> +                  (setenv "BL31" (search-input-file inputs "bl31.bin"))))))))
> +      (inputs
> +       (modify-inputs (package-inputs base)
> +         (append arm-trusted-firmware-sun50i-a64))))))
>  
>  (define-public u-boot-pine64-plus
>    (make-u-boot-sunxi64-package "pine64_plus" "aarch64-linux-gnu"))
> -- 
> 2.38.1

signature.asc
Description: PGP signature