Re: sysutils/u-boot-asahi

2022-10-25 Thread Stuart Henderson
On 2022/10/25 12:38, Stuart Henderson wrote:
> On 2022/10/24 23:15, Tobias Heider wrote:
> > u-boot-asahi is the Asahi Linux version of the u-boot bootloader that works
> > on Apple Silicon Arm hardware.
> > 
> > We need this package to update the bootloader chain on these devices from
> > OpenBSD and to distribute newer device trees.
> > 
> > There is already a u-boot port, but this fork has so many changes added that
> > it makes more sense to ship it as a separate port, as discussed with others
> > at g2k22.
> > 
> > ok?
> 
> That results in a bogus PKGNAME:
> 
> $ make show=PKGNAMES
> u-boot-asahi-v2022.07-3
> 
> the 'v' shouldn't be part of the version number, and - isn't allowed, it makes
> the following part into a suffix that would be used by a multi-FLAVOR port.
> 
> This fixes it (while there I dropped the "-" in do-install, as with m1n1
> this should fail if the files aren't present, also should normally use
> one of the ${INSTALL_xx} rather than just cp).
> 
> --- Makefile.orig Tue Oct 25 12:30:38 2022
> +++ Makefile  Tue Oct 25 12:38:14 2022
> @@ -1,11 +1,11 @@
>  COMMENT= U-Boot firmware for Apple Silicon
>  
> +VERSION= 2022.07-3
>  GH_ACCOUNT=  AsahiLinux
>  GH_PROJECT=  u-boot
> -VERSION= v2022.07-3
> -GH_TAGNAME=  asahi-${VERSION}
> +GH_TAGNAME=  asahi-v${VERSION}
>  
> -DISTNAME=u-boot-asahi-${VERSION}
> +PKGNAME= u-boot-asahi-${VERSION:S/-/./g}
>  
>  CATEGORIES=  sysutils
>  HOMEPAGE=https://github.com/AsahiLinux/u-boot
> @@ -41,7 +41,7 @@ do-build:
>  do-install:
>   ${INSTALL_DATA_DIR} ${PREFIX}/share/u-boot
>   ${INSTALL_DATA_DIR} ${PREFIX}/share/u-boot/apple_m1

oh, no need for the first ${INSTALL_DATA_DIR} either



Re: sysutils/u-boot-asahi

2022-10-25 Thread Stuart Henderson
On 2022/10/24 23:15, Tobias Heider wrote:
> u-boot-asahi is the Asahi Linux version of the u-boot bootloader that works
> on Apple Silicon Arm hardware.
> 
> We need this package to update the bootloader chain on these devices from
> OpenBSD and to distribute newer device trees.
> 
> There is already a u-boot port, but this fork has so many changes added that
> it makes more sense to ship it as a separate port, as discussed with others
> at g2k22.
> 
> ok?

That results in a bogus PKGNAME:

$ make show=PKGNAMES
u-boot-asahi-v2022.07-3

the 'v' shouldn't be part of the version number, and - isn't allowed, it makes
the following part into a suffix that would be used by a multi-FLAVOR port.

This fixes it (while there I dropped the "-" in do-install, as with m1n1
this should fail if the files aren't present, also should normally use
one of the ${INSTALL_xx} rather than just cp).

--- Makefile.orig   Tue Oct 25 12:30:38 2022
+++ MakefileTue Oct 25 12:38:14 2022
@@ -1,11 +1,11 @@
 COMMENT=   U-Boot firmware for Apple Silicon
 
+VERSION=   2022.07-3
 GH_ACCOUNT=AsahiLinux
 GH_PROJECT=u-boot
-VERSION=   v2022.07-3
-GH_TAGNAME=asahi-${VERSION}
+GH_TAGNAME=asahi-v${VERSION}
 
-DISTNAME=  u-boot-asahi-${VERSION}
+PKGNAME=   u-boot-asahi-${VERSION:S/-/./g}
 
 CATEGORIES=sysutils
 HOMEPAGE=  https://github.com/AsahiLinux/u-boot
@@ -41,7 +41,7 @@ do-build:
 do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/u-boot
${INSTALL_DATA_DIR} ${PREFIX}/share/u-boot/apple_m1
-   -cd ${WRKSRC}/build && \
-   cp ${FILES} ${PREFIX}/share/u-boot/apple_m1/
+   cd ${WRKSRC}/build && \
+   ${INSTALL_DATA} ${FILES} ${PREFIX}/share/u-boot/apple_m1/
 
 .include 



Re: sysutils/u-boot-asahi

2022-10-25 Thread Mark Kettenis
> Date: Mon, 24 Oct 2022 23:15:04 +0200
> From: Tobias Heider 
> 
> u-boot-asahi is the Asahi Linux version of the u-boot bootloader that works
> on Apple Silicon Arm hardware.
> 
> We need this package to update the bootloader chain on these devices from
> OpenBSD and to distribute newer device trees.
> 
> There is already a u-boot port, but this fork has so many changes added that
> it makes more sense to ship it as a separate port, as discussed with others
> at g2k22.
> 
> ok?

Yes please.  But it would be good to have an ok from a ports person as
well to make sure that you got the details for this port right.



sysutils/u-boot-asahi

2022-10-24 Thread Tobias Heider
u-boot-asahi is the Asahi Linux version of the u-boot bootloader that works
on Apple Silicon Arm hardware.

We need this package to update the bootloader chain on these devices from
OpenBSD and to distribute newer device trees.

There is already a u-boot port, but this fork has so many changes added that
it makes more sense to ship it as a separate port, as discussed with others
at g2k22.

ok?


u-boot-asahi.tar.gz
Description: application/gzip