Re: sysutils/u-boot-asahi

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
- -cd ${WRKSRC}/build && \
- cp ${FILES} ${PREFIX}/share/u-boot/apple_m1/
+ cd ${WRKSRC}/build && \
+ ${INSTALL_DATA} ${FILES} ${PREFIX}/share/u-boot/apple_m1/

.include <bsd.port.mk>