Add support for macOS 12.1

macOS 12.1's kmutil parses the custom boot object Mach-O and rejects
m1n1.macho. It added support for raw boot objects so use that instead
on MacOS 12.1 and later.
m1n1.macho for macOS 11.x can still be installed with an old kmutil
from the installation recovery image.

Signed-off-by: Janne Grunau <[email protected]>

Author: jannau

build.sh

@@ -38,7 +38,7 @@ echo "Copying files..."
 
 cp -r "$SRC"/* "$PACKAGE/"
 cp "$ARTWORK/logos/icns/AsahiLinux_logomark.icns" "$PACKAGE/logo.icns"
-cp "$M1N1/build/m1n1.macho" "$PACKAGE"
+cp "$M1N1/build/m1n1.macho" "$M1N1/build/m1n1.bin" "$PACKAGE"
 
 echo "Extracting Python framework..."
 

src/step2.sh

@@ -25,7 +25,12 @@ echo
 read
 
 bputil -nc -v "$VGID"
-kmutil configure-boot -c m1n1.macho -v "$system_dir"
+
+if [ -f m1n1.macho ]; then
+    kmutil configure-boot -c m1n1.macho -v "$system_dir"
+else
+    kmutil configure-boot -c m1n1.bin --raw --entry-point 2048 --lowest-virtual-address 0 -v "$system_dir"
+fi
 
 echo
 echo "Installation complete! Press enter to reboot."

src/stub.py

@@ -1,12 +1,14 @@
 # SPDX-License-Identifier: MIT
 import os, plistlib, shutil, sys, stat, subprocess, urlcache, zipfile
 import osenum
+from util import split_ver
 
 class Installer:
     def __init__(self, sysinfo, dutil, osinfo, ipsw_info):
         self.dutil = dutil
         self.sysinfo = sysinfo
         self.osinfo = osinfo
+        self.install_version = ipsw_info.version.split(maxsplit=1)[0]
         self.verbose = "-v" in sys.argv
 
         print("Downloading OS package info...")
@@ -182,7 +184,10 @@ def install_files(self, cur_os):
         except:
             print("Failed to apply extended attributes, logo will not work.")
 
-        shutil.copy("m1n1.macho", os.path.join(self.osi.system))
+        if split_ver(self.install_version) < (12, 1):
+            shutil.copy("m1n1.macho", os.path.join(self.osi.system))
+        else:
+            shutil.copy("m1n1.bin", os.path.join(self.osi.system))
         step2_sh = open("step2.sh").read().replace("##VGID##", self.osi.vgid)
         step2_sh_dst = os.path.join(self.osi.system, "step2.sh")
         with open(step2_sh_dst, "w") as fd: