Re: u-boot-am335x-boneblack -> u-boot-am335x-evm-boneblack
On 2022-12-26, Maxim Cournoyer wrote:
> Vagrant Cascadian writes:
>> On 2022-12-22, Maxim Cournoyer wrote:
>>> Vagrant Cascadian 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
signature.asc
Description: PGP signature
Re: u-boot-am335x-boneblack -> u-boot-am335x-evm-boneblack
Hi Vagrant,
Vagrant Cascadian writes:
> On 2022-12-22, Maxim Cournoyer wrote:
>> Vagrant Cascadian writes:
>>
>>> Wondering what necessitated this change from the old variable name to a
>>> new name...
>>>
>>> commit c04528d2a2597d79278833f3607c806278253446
>>> Author: Maxim Cournoyer
>>> Date: Tue Dec 20 21:25:27 2022 -0500
>>>
>>> gnu: u-boot-am335x-evm-boneblack: Fix variable name.
>>>
>>> * gnu/packages/bootloaders.scm (u-boot-am335x-boneblack): Rename to...
>>> (u-boot-am335x-evm-boneblack), to match the package name.
>>> * gnu/bootloader/u-boot.scm (u-boot-beaglebone-black-bootloader): Adjust
>>> accordingly.
>>> ...
>>> diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
>>> index bd9f7bb577..c8b8adbc93 100644
>>> --- a/gnu/packages/bootloaders.scm
>>> +++ b/gnu/packages/bootloaders.scm
>>> @@ -889,7 +889,7 @@ (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-boneblack
>>> +(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
>>>
>>> The u-boot-am335x-boneblack was named to match the original target that
>>> was removed from upstream, adapting the upstream am335x-evm to fit into
>>> a smaller gap in the partition tables... (e.g. 2MB partition offset
>>> instead of 4MB offset required by the default am335x-evm board
>>> configuration).
>>
>> The problem was that the *name* of the package was
>> "u-boot-am335x-evm-boneblack", as computed by the MAKE-U-BOOT-PACKAGE
>> procedure, which includes the board argument in its name (it's been like
>> this since its inception in 862e38d5518, 2017).
>>
>> If the previous variable name should have been its name, the name field
>> would have needed to be overridden to it (or perhaps we could introduce
>> a #:name argument that would take precedence over any cleverness).
>>
>> I noticed of the problem when trying to build the package; "guix build
>> u-boot-am335x-boneblack" would tell me it didn't exist.
>>
>> I considered making a deprecated alias but decided against, because in
>> the past we didn't when moving/renaming packages *variables*.
>
> Odd. I was certainy able to build u-boot-am335x-boneblack from commit
> 6b99afeef89233b71d113a63cf04a6b4b49a4679 when it was introduced in 2019,
> though it has been quite some time since I tested it...
>
> 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
(
Re: u-boot-am335x-boneblack -> u-boot-am335x-evm-boneblack
On 2022-12-22, Maxim Cournoyer wrote:
> Vagrant Cascadian writes:
>
>> Wondering what necessitated this change from the old variable name to a
>> new name...
>>
>> commit c04528d2a2597d79278833f3607c806278253446
>> Author: Maxim Cournoyer
>> Date: Tue Dec 20 21:25:27 2022 -0500
>>
>> gnu: u-boot-am335x-evm-boneblack: Fix variable name.
>>
>> * gnu/packages/bootloaders.scm (u-boot-am335x-boneblack): Rename to...
>> (u-boot-am335x-evm-boneblack), to match the package name.
>> * gnu/bootloader/u-boot.scm (u-boot-beaglebone-black-bootloader): Adjust
>> accordingly.
>> ...
>> diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
>> index bd9f7bb577..c8b8adbc93 100644
>> --- a/gnu/packages/bootloaders.scm
>> +++ b/gnu/packages/bootloaders.scm
>> @@ -889,7 +889,7 @@ (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-boneblack
>> +(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
>>
>> The u-boot-am335x-boneblack was named to match the original target that
>> was removed from upstream, adapting the upstream am335x-evm to fit into
>> a smaller gap in the partition tables... (e.g. 2MB partition offset
>> instead of 4MB offset required by the default am335x-evm board
>> configuration).
>
> The problem was that the *name* of the package was
> "u-boot-am335x-evm-boneblack", as computed by the MAKE-U-BOOT-PACKAGE
> procedure, which includes the board argument in its name (it's been like
> this since its inception in 862e38d5518, 2017).
>
> If the previous variable name should have been its name, the name field
> would have needed to be overridden to it (or perhaps we could introduce
> a #:name argument that would take precedence over any cleverness).
>
> I noticed of the problem when trying to build the package; "guix build
> u-boot-am335x-boneblack" would tell me it didn't exist.
>
> I considered making a deprecated alias but decided against, because in
> the past we didn't when moving/renaming packages *variables*.
Odd. I was certainy able to build u-boot-am335x-boneblack from commit
6b99afeef89233b71d113a63cf04a6b4b49a4679 when it was introduced in 2019,
though it has been quite some time since I tested it...
I will take a guess that it was commit
c2c1dfdf5760873f1db86d14873f725a105f7feb which removed the "name" bit:
(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\""
-(package
- (inherit base)
- (name "u-boot-am335x-boneblack")
live well,
vagrant
signature.asc
Description: PGP signature
Re: u-boot-am335x-boneblack -> u-boot-am335x-evm-boneblack
Hi Vagrant, Vagrant Cascadian writes: > Wondering what necessitated this change from the old variable name to a > new name... > > commit c04528d2a2597d79278833f3607c806278253446 > Author: Maxim Cournoyer > Date: Tue Dec 20 21:25:27 2022 -0500 > > gnu: u-boot-am335x-evm-boneblack: Fix variable name. > > * gnu/packages/bootloaders.scm (u-boot-am335x-boneblack): Rename to... > (u-boot-am335x-evm-boneblack), to match the package name. > * gnu/bootloader/u-boot.scm (u-boot-beaglebone-black-bootloader): Adjust > accordingly. > ... > diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm > index bd9f7bb577..c8b8adbc93 100644 > --- a/gnu/packages/bootloaders.scm > +++ b/gnu/packages/bootloaders.scm > @@ -889,7 +889,7 @@ (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-boneblack > +(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 > > The u-boot-am335x-boneblack was named to match the original target that > was removed from upstream, adapting the upstream am335x-evm to fit into > a smaller gap in the partition tables... (e.g. 2MB partition offset > instead of 4MB offset required by the default am335x-evm board > configuration). The problem was that the *name* of the package was "u-boot-am335x-evm-boneblack", as computed by the MAKE-U-BOOT-PACKAGE procedure, which includes the board argument in its name (it's been like this since its inception in 862e38d5518, 2017). If the previous variable name should have been its name, the name field would have needed to be overridden to it (or perhaps we could introduce a #:name argument that would take precedence over any cleverness). I noticed of the problem when trying to build the package; "guix build u-boot-am335x-boneblack" would tell me it didn't exist. I considered making a deprecated alias but decided against, because in the past we didn't when moving/renaming packages *variables*. -- Thanks, Maxim
Re: u-boot-am335x-boneblack -> u-boot-am335x-evm-boneblack
Vagrant Cascadian writes: > With all that said... having 512MB of ram, I wonder how well a > beaglebone black would do running guix at all... I used to use Guix on Debian (not Guix System) on my BeagleboneBlack. With swap space, it worked well, even though `guix pull` took multiple days to complete. But I haven’t used it since 2020 and lost my UART (gotta be somewhere…) and the BBB’s screen remains black now for some reason. Regards, Florian
u-boot-am335x-boneblack -> u-boot-am335x-evm-boneblack
Wondering what necessitated this change from the old variable name to a new name... commit c04528d2a2597d79278833f3607c806278253446 Author: Maxim Cournoyer Date: Tue Dec 20 21:25:27 2022 -0500 gnu: u-boot-am335x-evm-boneblack: Fix variable name. * gnu/packages/bootloaders.scm (u-boot-am335x-boneblack): Rename to... (u-boot-am335x-evm-boneblack), to match the package name. * gnu/bootloader/u-boot.scm (u-boot-beaglebone-black-bootloader): Adjust accordingly. ... diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index bd9f7bb577..c8b8adbc93 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -889,7 +889,7 @@ (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-boneblack +(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 The u-boot-am335x-boneblack was named to match the original target that was removed from upstream, adapting the upstream am335x-evm to fit into a smaller gap in the partition tables... (e.g. 2MB partition offset instead of 4MB offset required by the default am335x-evm board configuration). Was this a side-effect of some of the changes that were implemented with the raspberry pi series? Is the name change actually needed in some way, or is it just "housecleaning" ? It doesn't actually "match" the name of the target, which is "am335x_evm", not "am335x_evm_boneblack". I would think keeping the old name would allow for seamless upgrades. Or at least leaving a deprecated package placeholder or something like that if the rename is actually needed... but a little unclear on the situation at the moment. With all that said... having 512MB of ram, I wonder how well a beaglebone black would do running guix at all... Are people actually using some of these low-end boards with guix? I'll admit, I added a bunch of them in my early days of enthusiastically contributing to guix... but wonder if they are pragmatic to use. live well, vagrant signature.asc Description: PGP signature
