2019.01.24

* Update Clover to r4861 (add Boot Chime) * Update Theme * Update Kexts * Update sleep/wake scripts to remove kextunload
tluck · Jan 24, 2019 · ccaeaca · ccaeaca
1 parent e831fbc
commit ccaeaca
Show file tree

Hide file tree

Showing 18 changed files with 517 additions and 45 deletions.
diff --git a/EFI/BOOT/BOOTX64.efi b/EFI/BOOT/BOOTX64.efi
diff --git a/EFI/CLOVER/CLOVERX64.efi b/EFI/CLOVER/CLOVERX64.efi
diff --git a/EFI/CLOVER/drivers64UEFI/AudioDxe-64.efi b/EFI/CLOVER/drivers64UEFI/AudioDxe-64.efi
diff --git a/EFI/CLOVER/drivers64UEFI/SMCHelper-64.efi b/EFI/CLOVER/drivers64UEFI/SMCHelper-64.efi
diff --git a/EFI/CLOVER/drivers64UEFI/apfs.efi b/EFI/CLOVER/drivers64UEFI/apfs.efi
diff --git a/EFI/CLOVER/kexts/Other/AppleALC.kext/Contents/Info.plist b/EFI/CLOVER/kexts/Other/AppleALC.kext/Contents/Info.plist
diff --git a/EFI/CLOVER/kexts/Other/AppleALC.kext/Contents/MacOS/AppleALC b/EFI/CLOVER/kexts/Other/AppleALC.kext/Contents/MacOS/AppleALC
diff --git a/EFI/CLOVER/kexts/Other/IntelMausiEthernet.kext/Contents/Info.plist b/EFI/CLOVER/kexts/Other/IntelMausiEthernet.kext/Contents/Info.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>18D32a</string>
+	<string>18D42</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
@@ -33,9 +33,9 @@
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
-	<string>18B71</string>
+	<string>16E185</string>
 	<key>DTSDKName</key>
-	<string>macosx10.14</string>
+	<string>macosx10.12</string>
 	<key>DTXcode</key>
 	<string>1010</string>
 	<key>DTXcodeBuild</key>
@@ -59,9 +59,9 @@
 			<key>enableCSO6</key>
 			<true/>
 			<key>enableTSO4</key>
-			<false/>
+			<true/>
 			<key>enableTSO6</key>
-			<false/>
+			<true/>
 			<key>maxIntrRate</key>
 			<integer>7000</integer>
 		</dict>

diff --git a/EFI/CLOVER/kexts/Other/IntelMausiEthernet.kext/Contents/MacOS/IntelMausiEthernet b/EFI/CLOVER/kexts/Other/IntelMausiEthernet.kext/Contents/MacOS/IntelMausiEthernet
diff --git a/EFI/CLOVER/themes/ThinkPad/icons/os_hsierra.icns b/EFI/CLOVER/themes/ThinkPad/icons/os_hsierra.icns
diff --git a/EFI/CLOVER/themes/ThinkPad/icons/os_moja.icns b/EFI/CLOVER/themes/ThinkPad/icons/os_moja.icns
diff --git a/EFI/CLOVER/themes/ThinkPad/icons/os_sierra.icns b/EFI/CLOVER/themes/ThinkPad/icons/os_sierra.icns
diff --git a/EFI/CLOVER/themes/ThinkPad/theme.plist b/EFI/CLOVER/themes/ThinkPad/theme.plist
@@ -38,7 +38,7 @@
 		<key>Font</key>
 		<dict>
 			<key>CharWidth</key>
-			<integer>9</integer>
+			<integer>8</integer>
 			<key>Path</key>
 			<string>font.png</string>
 			<key>Type</key>
@@ -55,6 +55,6 @@
 		</dict>
 	</dict>
 	<key>Year</key>
-	<string>2016</string>
+	<string>2019</string>
 </dict>
 </plist>
diff --git a/EFI/CLOVER/tools/BootChimeCfg.efi b/EFI/CLOVER/tools/BootChimeCfg.efi
diff --git a/Utilities/Clover_v2.4k_r4855.pkg → Utilities/Clover_v2.4k_r4861.pkg b/Utilities/Clover_v2.4k_r4855.pkg → Utilities/Clover_v2.4k_r4861.pkg
diff --git a/Utilities/root/etc/rc.boot.d/20.mount_ESP.local b/Utilities/root/etc/rc.boot.d/20.mount_ESP.local
@@ -46,6 +46,12 @@ function mountESP {
         if [[ "$ESPDevice" == "" ]]; then
             ESPDevice=$(LC_ALL=C diskutil info / 2>/dev/null | \
              sed -n 's/.*Part [Oo]f Whole: *//p')
+        fi
+		# When ${ESPDevice} is an "Apple_APFS Container" on expected "Boot Volume" (ie. "Volume de démarrage")
+        # at "Force mount selected ESP at startup:"(ie. "Forcer le montage de l'ESP sélectionné au démarrage")
+        if [[ $(diskutil info / | sed -n 's/.*File System Personality: *//p' | tr "[:upper:]" "[:lower:]") = "apfs" ]] ; then
+            ESPDevice=$(diskutil list | grep "Apple_APFS Container ${ESPDevice}" | \
+             awk '{ print $NF}' | sed -E 's@^.*/?(disk[0-9]*).*@\1@')
         fi
     elif [[ "$arg" =~ $guidRegExp ]]; then
         ESPDevice=$(LC_ALL=C diskutil info "$arg" 2>/dev/null | \

diff --git a/Utilities/root/etc/rc.sleep b/Utilities/root/etc/rc.sleep
@@ -1,8 +1,5 @@
 #!/bin/bash
 
-# reset TrackPad
-kextunload -p /Library/Extensions/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Trackpad.kext &
-
 # turn off eth and wifi
 
 #ethd=$( networksetup -listallhardwareports | awk '$3=="Ethernet" {getline; print $2}')

diff --git a/Utilities/root/etc/rc.wakeup b/Utilities/root/etc/rc.wakeup
@@ -1,8 +1,5 @@
 #!/bin/bash
 
-# reload TrackPad
-kextload  /Library/Extensions/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Trackpad.kext &
-
 # turn off eth and wifi
 
 #ethd=$( networksetup -listallhardwareports | awk '$3=="Ethernet" {getline; print $2}')