On 2024/02/20 14:53, Mark Kettenis wrote:
> This splits out the sun50i boards from the aarch64 package, updates
> the U-Boot version for those boards and includes the new crust SCP
> firmware in the image.  The new sun50i package is provided as tgz
> file; the diff removes the relevant boards from the aarch64 package.

PLIST will need these changes:

-@pkgpath sysutils/u-boot-pinebook
-@pkgpath sysutils/u-boot,aarch64
+@conflict u-boot-aarch64-<2021.10p9

DESCR probably wants slight tweaking, currently it has
"This package provides U-Boot for various boards using ARM processors."

> My idea is to import the sun50i (onhooked to the build) and then apply
> the diff.
> 
> I probably need some help to make pkg_add -u do the right thing.  For
> the previous diff that split things up, sthen@ told me to add some
> magic @pkgpath lines.

If we want "pkg_add u-boot-aarch64" to still install of the various
aarch64 U-Boot packages, that can be done by adding this to
u-boot/aarch64 and bumping REVISION -

RUN_DEPENDS=	sysutils/u-boot/rk356x \
		sysutils/u-boot/rk3588 \
		sysutils/u-boot/sun50i

Doing this would mean that release builders shouldn't need to change
their existing workflow, which is probably helpful.