OSX-KVM - June 2021 Batch Update

Changes:

- Upgrade to OpenCore 0.7.0

- Upgrade OVMF to ovmf_2021.05-1_all.deb

CREDITS.md

@@ -116,4 +116,6 @@
 
 - mikkeyboi - Unraid OS stuff
 
+- deftdawg - Various correctness and robustness fixes - thanks!
+
 Note: Individual files have more specific 'credits' in them.

OVMF-notes.txt

@@ -1,7 +1,9 @@
-Current OVMF blobs are borrowed from the following URL,
+Current OVMF blobs are borrowed from the following URLs,
 
 http://download.proxmox.com/debian/dists/buster/pve-no-subscription/binary-amd64/pve-edk2-firmware_2.20200531-1_all.deb
 
+http://ftp.debian.org/debian/pool/main/e/edk2/
+
 OVMF for non-OpenCore boot loaders: https://github.com/kholia/edk2/tree/macOS-NG-v3.
 
 Building OVMF

OpenCore-Catalina/EFI/OC/Kexts/Lilu.kext/Contents/Info.plist

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>19H2</string>
+	<string>19H524</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>KEXT</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.9</string>
+	<string>1.5.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleSupportedPlatforms</key>
@@ -25,23 +25,23 @@
 		<string>MacOSX</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.4.9</string>
+	<string>1.5.3</string>
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>12A7209</string>
+	<string>12B45b</string>
 	<key>DTPlatformName</key>
 	<string>macosx</string>
 	<key>DTPlatformVersion</key>
-	<string>10.15.6</string>
+	<string>11.0</string>
 	<key>DTSDKBuild</key>
-	<string>19G68</string>
+	<string>20A2408</string>
 	<key>DTSDKName</key>
-	<string>macosx10.15</string>
+	<string>macosx11.0</string>
 	<key>DTXcode</key>
-	<string>1200</string>
+	<string>1220</string>
 	<key>DTXcodeBuild</key>
-	<string>12A7209</string>
+	<string>12B45b</string>
 	<key>IOKitPersonalities</key>
 	<dict>
 		<key>as.vit9696.Lilu</key>

OpenCore-Catalina/EFI/OC/Kexts/VirtualSMC.kext/Contents/Info.plist

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>19H2</string>
+	<string>19H1217</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>KEXT</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.8</string>
+	<string>1.2.4</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleSupportedPlatforms</key>
@@ -25,23 +25,23 @@
 		<string>MacOSX</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.8</string>
+	<string>1.2.4</string>
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>12A7209</string>
+	<string>12B45b</string>
 	<key>DTPlatformName</key>
 	<string>macosx</string>
 	<key>DTPlatformVersion</key>
-	<string>10.15.6</string>
+	<string>11.0</string>
 	<key>DTSDKBuild</key>
-	<string>19G68</string>
+	<string>20A2408</string>
 	<key>DTSDKName</key>
-	<string>macosx10.15</string>
+	<string>macosx11.0</string>
 	<key>DTXcode</key>
-	<string>1200</string>
+	<string>1220</string>
 	<key>DTXcodeBuild</key>
-	<string>12A7209</string>
+	<string>12B45b</string>
 	<key>IOKitPersonalities</key>
 	<dict>
 		<key>as.vit9696.VirtualSMC</key>

OpenCore-Catalina/EFI/OC/Kexts/WhateverGreen.kext/Contents/Info.plist

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>19H2</string>
+	<string>19H1217</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>KEXT</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.4</string>
+	<string>1.5.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleSupportedPlatforms</key>
@@ -25,23 +25,23 @@
 		<string>MacOSX</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.4.4</string>
+	<string>1.5.0</string>
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>12A7209</string>
+	<string>12B45b</string>
 	<key>DTPlatformName</key>
 	<string>macosx</string>
 	<key>DTPlatformVersion</key>
-	<string>10.15.6</string>
+	<string>11.0</string>
 	<key>DTSDKBuild</key>
-	<string>19G68</string>
+	<string>20A2408</string>
 	<key>DTSDKName</key>
-	<string>macosx10.15</string>
+	<string>macosx11.0</string>
 	<key>DTXcode</key>
-	<string>1200</string>
+	<string>1220</string>
 	<key>DTXcodeBuild</key>
-	<string>12A7209</string>
+	<string>12B45b</string>
 	<key>IOKitPersonalities</key>
 	<dict>
 		<key>NVHDAEnabler</key>

OpenCore-Catalina/README.md

@@ -2,8 +2,8 @@
 
 Catalina installs the same way as Mojave.
 
-Tested with macOS Catalina 10.15.7 with OpenCore-0.6.7-RELEASE.zip release
-(March, 2021).
+Tested with macOS Catalina 10.15.7 with OpenCore-0.7.0-RELEASE.zip release
+(June, 2021).
 
 Note: Our `config.plist` is buggy and we need to fix it!
 
@@ -14,18 +14,11 @@ Attention: Use 64-bit Ubuntu 20.04 LTS as the host OS for "best" results.
 Guestfish output results may vary across platforms.
 
 ```
-git submodule init && git submodule update
-
-cp -a ../resources/OcBinaryData/Resources EFI/OC/Resources  # symlink hacks don't work
-
 # Normal OpenCore Image
 rm -f OpenCore.qcow2; sudo ./opencore-image-ng.sh --cfg config.plist --img OpenCore.qcow2
 
 # OpenCore w/ ShowPicker Disabled
 rm -f OpenCore-nopicker.qcow2; sudo ./opencore-image-ng.sh --cfg config-nopicker.plist --img OpenCore-nopicker.qcow2
-
-# Passthrough Optimized OpenCore
-rm -f OpenCore-Passthrough.qcow2; sudo ./opencore-image-ng.sh --cfg config-pt.plist --img OpenCore-Passthrough.qcow2
 ```
 
 Note: https://github.com/thenickdude/KVM-Opencore is one of the best resources

OpenCore-Catalina/config.plist

@@ -563,7 +563,7 @@
 			<key>TakeoffDelay</key>
 			<integer>0</integer>
 			<key>Timeout</key>
-			<integer>0</integer>
+			<integer>120</integer>
 		</dict>
 		<key>Debug</key>
 		<dict>

OpenCore-Catalina/opencore-image-ng.sh

@@ -132,7 +132,7 @@ fish part-add /dev/sda p 302048 -2048
 fish part-set-gpt-type /dev/sda 1 C12A7328-F81F-11D2-BA4B-00A0C93EC93B
 fish part-set-bootable /dev/sda 1 true
 fish mkfs vfat /dev/sda1 label:EFI
-fish mkfs vfat /dev/sda2 label:OpenCoreBoot
+fish mkfs vfat /dev/sda2 label:OpenCore
 fish mount /dev/sda2 /
 fish mkdir /ESP
 fish mount /dev/sda1 /ESP
@@ -150,7 +150,7 @@ fish copy-in $WORK/EFI/OC/OpenCore.efi         /ESP/EFI/OC
 fish copy-in $WORK/EFI/OC/Drivers /ESP/EFI/OC/
 fish copy-in $WORK/EFI/OC/Kexts /ESP/EFI/OC/
 fish copy-in $WORK/EFI/OC/ACPI /ESP/EFI/OC/
-fish copy-in $WORK/EFI/OC/Resources            /ESP/EFI/OC/
+fish copy-in $BASE/../resources/OcBinaryData/Resources /ESP/EFI/OC/
 fish copy-in $WORK/EFI/OC/Tools /ESP/EFI/OC/
 
 # Note

README.md

@@ -95,7 +95,7 @@ Phenom II X3 720 does not. Ryzen processors work just fine.
   ```
   cd ~
 
-  git clone --depth 1 https://github.com/kholia/OSX-KVM.git
+  git clone --depth 1 --recursive https://github.com/kholia/OSX-KVM.git
 
   cd OSX-KVM
   ```

resources/OcBinaryData

@@ -1 +1 @@
-Subproject commit 9446405e44d7e17a84655c335ae5efe47d81608d
+Subproject commit 6dd2d92383edee522052ebbe2c634c92894b37e6