add asahi to image builder

Author: dkwo

lib.sh.in

@@ -298,6 +298,7 @@ set_target_arch_from_platform() {
         pinebookpro*) XBPS_TARGET_ARCH="aarch64";;
         pinephone*) XBPS_TARGET_ARCH="aarch64";;
         rock64*) XBPS_TARGET_ARCH="aarch64";;
+	asahi*) XBPS_TARGET_ARCH="aarch64";;
         *) die "$PROGNAME: Unable to compute target architecture from platform";;
     esac
 

mkimage.sh.in

@@ -117,7 +117,7 @@ PLATFORM="${PLATFORM%-PLATFORMFS*}"
 
 # Be absolutely certain the platform is supported before continuing
 case "$PLATFORM" in
-    bananapi|beaglebone|cubieboard2|cubietruck|odroid-c2|odroid-u2|rpi|rpi2|rpi3|rpi4|GCP|pinebookpro|pinephone|rock64|*-musl);;
+    bananapi|beaglebone|cubieboard2|cubietruck|odroid-c2|odroid-u2|rpi|rpi2|rpi3|rpi4|GCP|pinebookpro|pinephone|rock64|asahi|*-musl);;
     *) die "The $PLATFORM is not supported, exiting..."
 esac
 
@@ -226,9 +226,18 @@ _EOF
         esac
         mkfs.${ROOT_FSTYPE} ${disable_journal:+"$disable_journal"} "${LOOPDEV}p2" >/dev/null 2>&1
         mount "${LOOPDEV}p2" "$ROOTFS"
-        mkdir -p "${ROOTFS}/boot"
-        mount "${LOOPDEV}p1" "${ROOTFS}/boot"
-        BOOT_UUID=$(blkid -o value -s UUID "${LOOPDEV}p1")
+	case "$PLATFORM" in
+		asahi*)
+			# we need /boot/efi
+			mkdir -p "${ROOTFS}"/boot/efi
+			mount "${LOOPDEV}p1" "${ROOTFS}/boot/efi"
+			;;
+		*)
+        		mkdir -p "${ROOTFS}/boot"
+			mount "${LOOPDEV}p1" "${ROOTFS}/boot"
+			;;
+	esac
+	BOOT_UUID=$(blkid -o value -s UUID "${LOOPDEV}p1")
         ROOT_UUID=$(blkid -o value -s UUID "${LOOPDEV}p2")
         ROOT_PARTUUID=$(blkid -o value -s PARTUUID "${LOOPDEV}p2")
         ;;
@@ -373,6 +382,13 @@ GCP*)
     # run_cmd_chroot commands
     cleanup_chroot
     ;;
+asahi*)
+    # setup GRUB
+    mount_pseudofs
+    run_cmd_chroot "${ROOTFS}" "grub-install --target=arm64-efi --efi-directory=/boot/efi --removable"
+    run_cmd_chroot "${ROOTFS}" "grub-mkconfig  > /boot/grub/grub.cfg"
+    cleanup_chroot
+    ;;
 esac
 
 # Release all the mounts, deconfigure the loop device, and remove the

mkplatformfs.sh.in

@@ -51,7 +51,7 @@ Usage: $PROGNAME [options] <platform> <base-tarball>
 Supported platforms: i686, x86_64, GCP, bananapi, beaglebone,
                      cubieboard2, cubietruck, odroid-c2, odroid-u2,
                      rpi, rpi2 (armv7), rpi3 (aarch64), rpi4 (aarch64), ci20,
-                     pinebookpro, pinephone, rock64
+                     pinebookpro, pinephone, rock64, asahi
 
 Options
     -b <syspkg> Set an alternative base-system package (defaults to base-system)
@@ -128,6 +128,7 @@ case "$PLATFORM" in
     pinebookpro*) PKGS="$BASEPKG ${PLATFORM%-*}-base" ;;
     pinephone*) PKGS="$BASEPKG ${PLATFORM%-*}-base" ;;
     rock64*) PKGS="$BASEPKG ${PLATFORM%-*}-base" ;;
+    asahi*) PKGS="$BASEPKG asahi-base grub-arm64-efi" ;;
     *) die "$PROGNAME: invalid platform!";;
 esac