Fetch upstream 05/07/2022

.gitignore

@@ -1,13 +1,10 @@
+*.dist
+*.dmg
+*.img
 *.iso
-mac_hdd.img
-mac_hdd_ng.img
+*.pkg
 *.sha256sum
-*.sucatalog
-*.img
-*.dmg
-*.dist
 *.smd
-*.dmg
-OVMF_VARS-1024x768.fd
+*.sucatalog
 OVMF_VARS*.fd
 OpenCore-Catalina/EFI/OC/Resources/

CREDITS.md

@@ -42,7 +42,7 @@
 
 * Jan Kuri (jkuri) - Mojave ISO creation fixes
 
-* Mike Hardy (mikehardy) - Network documentation improvements
+* Mike Hardy (mikehardy) - Network documentation improvements, Ventura 'ISO' script
 
 * CuriousTommy + pickled_monkey - Information on vmxnet3 network adapter
 
@@ -140,4 +140,8 @@
 
 - MobCode100 - Ventura + AVX2 docs
 
+- Murilo Rocha Pereira - https://github.com/murilopereirame - Typo fixes
+
+- gotjoshua - Typo fixes
+
 Note: Individual files have more specific 'credits' in them.

Makefile

@@ -7,7 +7,7 @@ BaseSystem.img: BaseSystem.dmg
 	qemu-img convert BaseSystem.dmg -O raw BaseSystem.img
 
 BaseSystem.dmg:
-	./fetch-macOS-v2.py --short=$(SHORTNAME)
+	./fetch-macOS-v2.py --shortname=$(SHORTNAME)
 
 mac_hdd_ng.img:
 	qemu-img create -f qcow2 mac_hdd_ng.img ${DISK_SIZE}

OVMF-notes.txt

@@ -1,6 +1,6 @@
 Current OVMF blobs are borrowed from the following URL(s),
 
-- http://ftp.debian.org/debian/pool/main/e/edk2/ (ovmf_2022.08-1_all.deb)
+- http://ftp.debian.org/debian/pool/main/e/edk2/ (ovmf_2023.05-2_all.deb)
 
 Building OVMF
 -------------

OpenCore-Boot.sh

@@ -9,9 +9,14 @@
 #
 # echo 1 > /sys/module/kvm/parameters/ignore_msrs (this is required)
 
-############################################################################
+###############################################################################
 # NOTE: Tweak the "MY_OPTIONS" line in case you are having booting problems!
-############################################################################
+###############################################################################
+#
+# Change `Penryn` to `Haswell-noTSX` in OpenCore-Boot.sh file for macOS Sonoma!
+#
+###############################################################################
+
 
 MY_OPTIONS="+ssse3,+sse4.2,+popcnt,+avx,+aes,+xsave,+xsaveopt,check"
 
@@ -30,18 +35,20 @@ OVMF_DIR="."
 args=(
   -enable-kvm -m "$ALLOCATED_RAM" -cpu Penryn,kvm=on,vendor=GenuineIntel,+invtsc,vmware-cpuid-freq=on,"$MY_OPTIONS"
   -machine q35
-  -usb -device usb-kbd -device usb-tablet
+  -device qemu-xhci,id=xhci
+  -device usb-kbd,bus=xhci.0 -device usb-tablet,bus=xhci.0
   -smp "$CPU_THREADS",cores="$CPU_CORES",sockets="$CPU_SOCKETS"
   -device usb-ehci,id=ehci
   # -device usb-kbd,bus=ehci.0
   # -device usb-mouse,bus=ehci.0
-  -device nec-usb-xhci,id=xhci
-  -global nec-usb-xhci.msi=off
+  # -device nec-usb-xhci,id=xhci
+  # -global nec-usb-xhci.msi=off
+  # -global ICH9-LPC.acpi-pci-hotplug-with-bridge-support=off
   # -device usb-host,vendorid=0x8086,productid=0x0808  # 2 USD USB Sound Card
   # -device usb-host,vendorid=0x1b3f,productid=0x2008  # Another 2 USD USB Sound Card
   -device isa-applesmc,osk="ourhardworkbythesewordsguardedpleasedontsteal(c)AppleComputerInc"
   -drive if=pflash,format=raw,readonly=on,file="$REPO_PATH/$OVMF_DIR/OVMF_CODE.fd"
-  -drive if=pflash,format=raw,file="$REPO_PATH/$OVMF_DIR/OVMF_VARS-1024x768.fd"
+  -drive if=pflash,format=raw,file="$REPO_PATH/$OVMF_DIR/OVMF_VARS-1920x1080.fd"
   -smbios type=2
   -device ich9-intel-hda -device hda-duplex
   -device ich9-ahci,id=sata
@@ -52,10 +59,11 @@ args=(
   -drive id=MacHDD,if=none,file="$REPO_PATH/mac_hdd_ng.img",format=qcow2
   -device ide-hd,bus=sata.4,drive=MacHDD
   # -netdev tap,id=net0,ifname=tap0,script=no,downscript=no -device virtio-net-pci,netdev=net0,id=net0,mac=52:54:00:c9:18:27
-  -netdev user,id=net0 -device virtio-net-pci,netdev=net0,id=net0,mac=52:54:00:c9:18:27
+  -netdev user,id=net0,hostfwd=tcp::2222-:22 -device virtio-net-pci,netdev=net0,id=net0,mac=52:54:00:c9:18:27
   # -netdev user,id=net0 -device vmxnet3,netdev=net0,id=net0,mac=52:54:00:c9:18:27  # Note: Use this line for High Sierra
   -monitor stdio
-  -device VGA,vgamem_mb=128
+  -device vmware-svga
+  # -spice port=5900,addr=127.0.0.1,disable-ticketing=on
 )
 
 qemu-system-x86_64 "${args[@]}"