This updates m1n1 to the latest tagged version (1.4.8) and updates
u-boot to a version that can initailize the "mtp" coprocessor on with
newer system firmware. This is necessary to have a working keyboard
on machines like the M2 MacBook Air when using the latest version of
the Asahi installer.
ok?
Index: sysutils/firmware/apple-boot/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/firmware/apple-boot/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- sysutils/firmware/apple-boot/Makefile 27 Oct 2023 10:20:43 -0000
1.14
+++ sysutils/firmware/apple-boot/Makefile 12 Dec 2023 12:23:05 -0000
@@ -1,6 +1,6 @@
FW_DRIVER= apple-boot
FW_VER= 1.1
-REVISION= 0
+REVISION= 1
WRKDIST= ${WRKDIR}
DISTFILES=
@@ -10,8 +10,8 @@ DISTFILES=
PERMIT_PACKAGE= firmware
PERMIT_DISTFILES= Yes
-BUILD_DEPENDS= m1n1-=1.4.3:sysutils/m1n1:build \
- u-boot-asahi-=2023.07.02:sysutils/u-boot-asahi:build
+BUILD_DEPENDS= m1n1-=1.4.8:sysutils/m1n1:build \
+ u-boot-asahi-=2023.07.02p1:sysutils/u-boot-asahi:build
ASAHI_BUILD= ${WRKSRC}/sysutils/u-boot-asahi/u-boot-*/build
M1N1_BUILD= ${WRKSRC}/sysutils/m1n1/m1n1-*/build
Index: sysutils/m1n1/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/m1n1/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- sysutils/m1n1/Makefile 26 Oct 2023 18:45:28 -0000 1.12
+++ sysutils/m1n1/Makefile 12 Dec 2023 12:23:06 -0000
@@ -4,7 +4,7 @@ COMMENT= Bootloader for Apple Silicon
GH_ACCOUNT= AsahiLinux
GH_PROJECT= m1n1
-GH_TAGNAME= v1.4.3
+GH_TAGNAME= v1.4.8
CATEGORIES= sysutils
HOMEPAGE= https://github.com/AsahiLinux/m1n1
Index: sysutils/m1n1/distinfo
===================================================================
RCS file: /cvs/ports/sysutils/m1n1/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- sysutils/m1n1/distinfo 26 Oct 2023 18:45:28 -0000 1.5
+++ sysutils/m1n1/distinfo 12 Dec 2023 12:23:06 -0000
@@ -1,2 +1,2 @@
-SHA256 (m1n1-1.4.3.tar.gz) = 9x58eF1lQUgb9srl0pUYOOMeb2Q1SMdEDE//B1fV91U=
-SIZE (m1n1-1.4.3.tar.gz) = 819419
+SHA256 (m1n1-1.4.8.tar.gz) = ohQaSkEnddnyW3WWEcXQEKHsaSnq34laCUyi9643rCg=
+SIZE (m1n1-1.4.8.tar.gz) = 822674
Index: sysutils/u-boot-asahi/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/u-boot-asahi/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- sysutils/u-boot-asahi/Makefile 3 Dec 2023 22:55:16 -0000 1.13
+++ sysutils/u-boot-asahi/Makefile 12 Dec 2023 12:23:08 -0000
@@ -5,8 +5,8 @@ COMMENT= U-Boot firmware for Apple Silic
VERSION= 2023.07.02
GH_ACCOUNT= AsahiLinux
GH_PROJECT= u-boot
-GH_TAGNAME= openbsd-v${VERSION}
-REVISION= 0
+GH_TAGNAME= openbsd-v${VERSION}-1
+REVISION= 1
PKGNAME= u-boot-asahi-${VERSION:S/-/./g}
Index: sysutils/u-boot-asahi/distinfo
===================================================================
RCS file: /cvs/ports/sysutils/u-boot-asahi/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- sysutils/u-boot-asahi/distinfo 10 Sep 2023 15:18:39 -0000 1.3
+++ sysutils/u-boot-asahi/distinfo 12 Dec 2023 12:23:08 -0000
@@ -1,2 +1,2 @@
-SHA256 (u-boot-openbsd-v2023.07.02.tar.gz) =
aKuZg4uGmNDt9aaoKTjMrdkYJUKZbKqt3JHZtKWJquE=
-SIZE (u-boot-openbsd-v2023.07.02.tar.gz) = 25087062
+SHA256 (u-boot-openbsd-v2023.07.02-1.tar.gz) =
sVhMi6ZAIReDCU+Ps0BnYzOgMMftVpw2K8gNl7HR3b0=
+SIZE (u-boot-openbsd-v2023.07.02-1.tar.gz) = 25088652