diff --git a/.gitmodules b/.gitmodules index 3570e23..7ae7f04 100644 --- a/.gitmodules +++ b/.gitmodules @@ -20,3 +20,6 @@ [submodule "src/OcBinaryData"] path = src/OcBinaryData url = https://github.com/acidanthera/OcBinaryData.git +[submodule "src/MacKernelSDK"] + path = src/MacKernelSDK + url = https://github.com/acidanthera/MacKernelSDK.git diff --git a/EFI/OC/config.plist b/EFI/OC/config.plist index 7d52ed1..ef88347 100644 --- a/EFI/OC/config.plist +++ b/EFI/OC/config.plist @@ -351,6 +351,8 @@ Emulate + DummyPowerManagement + Cpuid1Data VAYFAAAAAAAAAAAAAAAAAA== @@ -359,6 +361,10 @@ ////AAAAAAAAAAAAAAAAAA== + MaxKernel + + MinKernel + Force @@ -368,7 +374,7 @@ BundlePath System/Library/Extensions/IONetworkingFamily.kext Comment - Patch engine + Enabled Identifier @@ -474,14 +480,16 @@ DisableRtcChecksum - DummyPowerManagement - + ExtendBTFeatureFlags + ExternalDiskIcons IncreasePciBarSize LapicKernelPanic + LegacyCommpage + PanicNoKextDump PowerTimeoutKernelPanic @@ -699,12 +707,14 @@ AdviseWindows + SystemMemoryStatus + Auto MLB C02717306J9JG361M + ProcessorType + 0 ROM - - m7zhIYfl - + m7zhIYfl SpoofVendor SystemProductName diff --git a/Makefile b/Makefile index bca4a5b..c945c85 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,11 @@ SUBMODULES = \ src/WhateverGreen \ src/OpenCorePkg \ src/VirtualSMC \ - src/OcBinaryData + src/OcBinaryData \ + src/MacKernelSDK + +# Set me to include the version number in the packaged filenames +RELEASE_VERSION ?= master # Either DEBUG or RELEASE OPENCORE_MODE=RELEASE @@ -39,24 +43,24 @@ OPENCORE_UDK_BUILD_DIR=src/OpenCorePkg/UDK/Build/OpenCorePkg/$(OPENCORE_MODE)_XC # (avoids rebuilding deps after they touch their directories during build) all : $(SUBMODULES) $(EFI_FILES) -dist : $(SUBMODULES) OpenCore.dmg.gz OpenCoreEFIFolder.zip OpenCore.iso.gz +dist : $(SUBMODULES) OpenCore-$(RELEASE_VERSION).dmg.gz OpenCoreEFIFolder-$(RELEASE_VERSION).zip OpenCore-$(RELEASE_VERSION).iso.gz # Create OpenCore disk image: -OpenCore.dmg : Makefile $(EFI_FILES) - rm -f OpenCore.dmg - hdiutil create -layout GPTSPUD -partitionType EFI -fs "FAT32" -megabytes 150 -volname EFI OpenCore.dmg +OpenCore-$(RELEASE_VERSION).dmg : Makefile $(EFI_FILES) + rm -f $@ + hdiutil create -layout GPTSPUD -partitionType EFI -fs "FAT32" -megabytes 150 -volname EFI $@ mkdir -p OpenCore-Image - DEV_NAME=$$(hdiutil attach -nomount -plist OpenCore.dmg | xpath "/plist/dict/array/dict/key[text()='content-hint']/following-sibling::string[1][text()='EFI']/../key[text()='dev-entry']/following-sibling::string[1]/text()" 2> /dev/null) && \ + DEV_NAME=$$(hdiutil attach -nomount -plist $@ | xpath "/plist/dict/array/dict/key[text()='content-hint']/following-sibling::string[1][text()='EFI']/../key[text()='dev-entry']/following-sibling::string[1]/text()" 2> /dev/null) && \ mount -tmsdos "$$DEV_NAME" OpenCore-Image cp -a EFI OpenCore-Image/ hdiutil detach -force OpenCore-Image # Not actually an ISO, but useful for making it usable in Proxmox's ISO picker -OpenCore.iso : OpenCore.dmg +OpenCore-$(RELEASE_VERSION).iso : OpenCore-$(RELEASE_VERSION).dmg cp $< $@ -OpenCoreEFIFolder.zip : Makefile $(EFI_FILES) +OpenCoreEFIFolder-$(RELEASE_VERSION).zip : Makefile $(EFI_FILES) rm -f $@ zip -r $@ EFI @@ -68,44 +72,48 @@ OpenCoreEFIFolder.zip : Makefile $(EFI_FILES) EFI/OC/Kexts/AppleALC.kext : src/AppleALC/build/Release/AppleALC.kext cp -a $< $@ -src/AppleALC/build/Release/AppleALC.kext : src/AppleALC src/AppleALC/Lilu.kext +src/AppleALC/build/Release/AppleALC.kext : src/AppleALC src/AppleALC/Lilu.kext src/AppleALC/MacKernelSDK cd src/AppleALC && xcodebuild -configuration Release -src/AppleALC/Lilu.kext : src/Lilu/build/Debug/Lilu.kext - ln -s ../Lilu/build/Debug/Lilu.kext $@ - -# Lilu: - -EFI/OC/Kexts/Lilu.kext : src/Lilu/build/Release/Lilu.kext - cp -a $< $@ - -src/Lilu/build/Release/Lilu.kext src/Lilu/build/Debug/Lilu.kext : - cd src/Lilu && xcodebuild -configuration Debug - cd src/Lilu && xcodebuild -configuration Release - # WhateverGreen: EFI/OC/Kexts/WhateverGreen.kext : src/WhateverGreen/build/Release/WhateverGreen.kext cp -a $< $@ -src/WhateverGreen/build/Release/WhateverGreen.kext : src/WhateverGreen src/WhateverGreen/Lilu.kext +src/WhateverGreen/build/Release/WhateverGreen.kext : src/WhateverGreen src/WhateverGreen/Lilu.kext src/WhateverGreen/MacKernelSDK cd src/WhateverGreen && xcodebuild -configuration Release -src/WhateverGreen/Lilu.kext : src/Lilu/build/Debug/Lilu.kext - ln -s ../Lilu/build/Debug/Lilu.kext $@ - # VirtualSMC: EFI/OC/Kexts/VirtualSMC.kext : src/VirtualSMC/build/Release/VirtualSMC.kext cp -a $< $@ -src/VirtualSMC/build/Release/VirtualSMC.kext : src/VirtualSMC/Lilu.kext +src/VirtualSMC/build/Release/VirtualSMC.kext : src/VirtualSMC/Lilu.kext src/VirtualSMC/MacKernelSDK cd src/VirtualSMC && xcodebuild -configuration Release touch $@ +# Lilu: + +EFI/OC/Kexts/Lilu.kext : src/Lilu/build/Release/Lilu.kext + cp -a $< $@ + +src/Lilu/build/Release/Lilu.kext src/Lilu/build/Debug/Lilu.kext : + cd src/Lilu && xcodebuild -configuration Debug + cd src/Lilu && xcodebuild -configuration Release + +src/WhateverGreen/Lilu.kext \ +src/AppleALC/Lilu.kext \ src/VirtualSMC/Lilu.kext : src/Lilu/build/Debug/Lilu.kext ln -s ../Lilu/build/Debug/Lilu.kext $@ +# MacKernelSDK: + +src/Lilu/MacKernelSDK \ +src/WhateverGreen/MacKernelSDK \ +src/AppleALC/MacKernelSDK \ +src/VirtualSMC/MacKernelSDK : src/MacKernelSDK + ln -s ../MacKernelSDK $@ + # OpenCore: EFI/OC/OpenCore.efi : $(OPENCORE_UDK_BUILD_DIR)/OpenCore.efi @@ -160,5 +168,5 @@ very-clean : clean rm -rf src/OpenCorePkg/UDK clean : - rm -rf OpenCore.dmg OpenCoreEFIFolder.zip OpenCore-Image/ src/Lilu/build src/WhateverGreen/build src/OpenCorePkg/UDK/Build \ + rm -rf OpenCore-*.dmg OpenCoreEFIFolder-*.zip OpenCore-Image/ src/Lilu/build src/WhateverGreen/build src/OpenCorePkg/UDK/Build \ src/AppleALC/build $(KEXTS) $(DRIVERS) $(TOOLS) $(MISC) diff --git a/src/AppleALC b/src/AppleALC index a567a8b..3f86db1 160000 --- a/src/AppleALC +++ b/src/AppleALC @@ -1 +1 @@ -Subproject commit a567a8bd4bf983b2e8d77c9d62d90ba9bf7efa4c +Subproject commit 3f86db16b1330cfb040fd45a5262b0c3f492f2ac diff --git a/src/Lilu b/src/Lilu index b8eb26f..3b302dc 160000 --- a/src/Lilu +++ b/src/Lilu @@ -1 +1 @@ -Subproject commit b8eb26fadc827d1df8f4e5ab8c9216c5098e8318 +Subproject commit 3b302dc0d972b8cf89c19569dfbea75a16b3c51a diff --git a/src/MacKernelSDK b/src/MacKernelSDK new file mode 160000 index 0000000..06325f9 --- /dev/null +++ b/src/MacKernelSDK @@ -0,0 +1 @@ +Subproject commit 06325f9ae288e16fb9838cf641ab18cd52ff934e diff --git a/src/OcBinaryData b/src/OcBinaryData index 80b2448..d4a10f6 160000 --- a/src/OcBinaryData +++ b/src/OcBinaryData @@ -1 +1 @@ -Subproject commit 80b2448c7ebc31616d95bfcd60320dd0056ee0e5 +Subproject commit d4a10f6dd0e735e8fac7ba25d1cbfaeae31fbaa4 diff --git a/src/OpenCorePkg b/src/OpenCorePkg index db87b32..cad9e24 160000 --- a/src/OpenCorePkg +++ b/src/OpenCorePkg @@ -1 +1 @@ -Subproject commit db87b3263dd0d6345e19554ec0a97919fef5af01 +Subproject commit cad9e24d8698b323fba1498ac9efacfcb27c378f diff --git a/src/VirtualSMC b/src/VirtualSMC index eda655b..90fda6c 160000 --- a/src/VirtualSMC +++ b/src/VirtualSMC @@ -1 +1 @@ -Subproject commit eda655bc5c21519cc7734ce7e6d1ae10a8d9b27d +Subproject commit 90fda6cf756ec17446a4cfb5c92d1e9a23296771 diff --git a/src/WhateverGreen b/src/WhateverGreen index 68b87f9..562b591 160000 --- a/src/WhateverGreen +++ b/src/WhateverGreen @@ -1 +1 @@ -Subproject commit 68b87f9ad3c8d45b48c543300603ba8022cb3ab9 +Subproject commit 562b59121a56d8b02465ed0728d4b5509b80cdbb