On 2022-12-26, Maxim Cournoyer wrote:
> Vagrant Cascadian <vagrant@debian.org> writes:
>> On 2022-12-22, Maxim Cournoyer wrote:
>>> Vagrant Cascadian <vagrant@debian.org> writes:
>> I will take a guess that it was commit
>> c2c1dfdf5760873f1db86d14873f725a105f7feb which removed the "name" bit:
>
> Oh, that explains it, thank you for digging a bit.
>
> The following should return us to the previous name, fixing that
> regression:
>
> --8<---------------cut here---------------start------------->8---
> modified   gnu/bootloader/u-boot.scm
> @@ -144,7 +144,7 @@ (define u-boot-bootloader
>  (define u-boot-beaglebone-black-bootloader
>    (bootloader
>     (inherit u-boot-bootloader)
> -   (package u-boot-am335x-evm-boneblack)
> +   (package u-boot-am335x-boneblack)
>     (disk-image-installer install-beaglebone-black-u-boot)))
>  
>  (define u-boot-allwinner-bootloader
> modified   gnu/packages/bootloaders.scm
> @@ -890,17 +890,23 @@ (define*-public (make-u-boot-package board triplet
>  (define-public u-boot-malta
>    (make-u-boot-package "malta" "mips64el-linux-gnuabi64"))
>  
> -(define-public u-boot-am335x-evm-boneblack
> -  (make-u-boot-package
> -   "am335x_evm" "arm-linux-gnueabihf"
> -   ;; Patch out other device trees to build an image small enough to fit
> -   ;; within typical partitioning schemes where the first partition begins at
> -   ;; sector 2048.
> -   #:configs '("CONFIG_OF_LIST=\"am335x-evm am335x-boneblack\"")
> -   #:name-suffix "-boneblack"
> -   #:append-description "This U-Boot is built for the BeagleBone Black, which
> -was removed upstream, adjusted from the am335x_evm build with several device
> -trees removed so that it fits within common partitioning schemes."))
> +(define-public u-boot-am335x-boneblack
> +  (let ((base (make-u-boot-package
> +               "am335x_evm" "arm-linux-gnueabihf"
> +               ;; Patch out other device trees to build an image small enough
> +               ;; to fit within typical partitioning schemes where the first
> +               ;; partition begins at sector 2048.
> +               #:configs '("CONFIG_OF_LIST=\"am335x-evm am335x-boneblack\"")
> +               #:append-description
> +               "This U-Boot is built for the BeagleBone Black, which was
> +removed upstream, adjusted from the am335x_evm build with several device trees
> +removed so that it fits within common partitioning schemes.")))
> +    (package
> +      (inherit base)
> +      ;; The name is not derived from the board name on purpose as the config
> +      ;; is modified per the comment above, parting from the default
> +      ;; am335x_evm configuration.
> +      (name "u-boot-am335x-boneblack"))))
>  
>  (define-public u-boot-am335x-evm
>    (make-u-boot-package "am335x_evm" "arm-linux-gnueabihf"))
> --8<---------------cut here---------------end--------------->8---
>
> Does it look good to you?  If so, I'll commit it.

It doesn't look obviously wrong... but there are a lot of whitespace
changes that my lazy eyeballs might not catch... :)

I would like to be able to see the results with "git diff
--ignore-allspace" but it is not formatted in a way I understand how to
actually apply it to git.


live well,
  vagrant