add asahi to image builder

void-linux · Dec 1, 2022 · e531c89 · e531c89
1 parent c9dbeed
commit e531c89
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/lib.sh.in b/lib.sh.in
@@ -297,6 +297,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
 

diff --git a/mkimage.sh.in b/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-armv6l|rpi-armv7l|rpi-aarch64|GCP|pinebookpro|pinephone|rock64|*-musl);;
+    bananapi|beaglebone|cubieboard2|cubietruck|odroid-c2|odroid-u2|rpi-armv6l|rpi-armv7l|rpi-aarch64|GCP|pinebookpro|pinephone|rock64|asahi|*-musl);;
     *) die "The $PLATFORM is not supported, exiting..."
 esac
 
@@ -226,9 +226,9 @@ _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")
+	mkdir -p "${ROOTFS}/boot"
+	mount "${LOOPDEV}p1" "${ROOTFS}/boot"
+	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 +373,15 @@ GCP*)
     # run_cmd_chroot commands
     cleanup_chroot
     ;;
+asahi*)
+    # setup GRUB
+    mount_pseudofs
+    run_cmd_chroot "${ROOTFS}" "mkdir /boot/m1n1"
+    run_cmd_chroot "${ROOTFS}" "grub-install --target=arm64-efi --efi-directory=/boot --removable"
+    run_cmd_chroot "${ROOTFS}" "grub-mkconfig  > /boot/grub/grub.cfg"
+    run_cmd_chroot "${ROOTFS}" "xbps-reconfigure -f linux-asahi"
+    cleanup_chroot
+    ;;
 esac
 
 # Release all the mounts, deconfigure the loop device, and remove the

diff --git a/mkplatformfs.sh.in b/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-armv6l, rpi-armv7l, rpi-aarch64, ci20,
-                     pinebookpro, pinephone, rock64
+                     pinebookpro, pinephone, rock64, asahi
 
 Options
     -b <syspkg> Set an alternative base-system package (defaults to base-system)
@@ -125,6 +125,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 dracut asahi-uboot" ;;
     *) die "$PROGNAME: invalid platform!";;
 esac