ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 13:58:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: u-boot-am335x-boneblack: Revert to old name.

Browse source 
This reverts to the name this package had previous to commit
c2c1dfdf57 ("gnu: bootloader: Add U-Boot
packages for Raspberry Pi models."), which caused the package name to be
derived from the board name.

* gnu/packages/bootloaders.scm (u-boot-am335x-evm-boneblack): Remove the
NAME-SUFFIX keyword argument.  Specify the full name via the name field.
* gnu/bootloader/u-boot.scm (u-boot-beaglebone-black-bootloader): Adjust to
the renamed package.

Reported-by: Vagrant Cascadian <vagrant@debian.org>
This commit is contained in:
Maxim Cournoyer 2022-12-26 21:44:25 -05:00
parent 783b85f643
commit d6ea9f8b38
No known key found for this signature in database
GPG key ID: 1260E46482E63562
2 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gnu/bootloader/u-boot.scm
View file

@ -144,7 +144,7 @@ (define u-boot-bootloader
(define u-boot-beaglebone-black-bootloader (define u-boot-beaglebone-black-bootloader
(bootloader (bootloader
(inherit u-boot-bootloader) (inherit u-boot-bootloader)
(package u-boot-am335x-evm-boneblack) (package u-boot-am335x-boneblack)
(disk-image-installer install-beaglebone-black-u-boot))) (disk-image-installer install-beaglebone-black-u-boot)))
(define u-boot-allwinner-bootloader (define u-boot-allwinner-bootloader

28
gnu/packages/bootloaders.scm
View file

@ -963,17 +963,23 @@ (define*-public (make-u-boot-package board triplet
(define-public u-boot-malta (define-public u-boot-malta
(make-u-boot-package "malta" "mips64el-linux-gnuabi64")) (make-u-boot-package "malta" "mips64el-linux-gnuabi64"))
(define-public u-boot-am335x-evm-boneblack (define-public u-boot-am335x-boneblack
(make-u-boot-package (let ((base (make-u-boot-package
"am335x_evm" "arm-linux-gnueabihf" "am335x_evm" "arm-linux-gnueabihf"
;; Patch out other device trees to build an image small enough to fit ;; Patch out other device trees to build an image small enough
;; within typical partitioning schemes where the first partition begins at ;; to fit within typical partitioning schemes where the first
;; sector 2048. ;; partition begins at sector 2048.
#:configs '("CONFIG_OF_LIST=\"am335x-evm am335x-boneblack\"") #:configs '("CONFIG_OF_LIST=\"am335x-evm am335x-boneblack\"")
#:name-suffix "-boneblack" #:append-description
#:append-description "This U-Boot is built for the BeagleBone Black, which "This U-Boot is built for the BeagleBone Black, which was
was removed upstream, adjusted from the am335x_evm build with several device removed upstream, adjusted from the am335x_evm build with several device trees
trees removed so that it fits within common partitioning schemes.")) 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 (define-public u-boot-am335x-evm
(make-u-boot-package "am335x_evm" "arm-linux-gnueabihf")) (make-u-boot-package "am335x_evm" "arm-linux-gnueabihf"))