block skywalk version2

Signed-off-by: Slice <sergey.slice@gmail.com>
This commit is contained in:
Slice 2023-08-27 20:00:02 +03:00
parent 772746c694
commit c653a7378a
3 changed files with 20 additions and 14 deletions

View File

@ -21,6 +21,8 @@ declare -r DRIVERS_LEGACY="BIOS" # same in buildpkg.sh/makeiso
declare -r DRIVERS_UEFI="UEFI" # same in buildpkg.sh/makeiso declare -r DRIVERS_UEFI="UEFI" # same in buildpkg.sh/makeiso
declare -r DRIVERS_OFF="off" # same in buildpkg.sh/makeiso declare -r DRIVERS_OFF="off" # same in buildpkg.sh/makeiso
startBuildEpoch=$(date -u "+%s")
if [[ "$SYSNAME" == Linux ]]; then if [[ "$SYSNAME" == Linux ]]; then
declare -r NUMBER_OF_CPUS=$(nproc) declare -r NUMBER_OF_CPUS=$(nproc)
else else
@ -882,16 +884,6 @@ MainPostBuildScript() {
echo "Generating BootSectors" echo "Generating BootSectors"
local BOOTHFS="$CLOVERROOT"/BootHFS local BOOTHFS="$CLOVERROOT"/BootHFS
DESTDIR="$CLOVER_PKG_DIR"/BootSectors make -C $BOOTHFS DESTDIR="$CLOVER_PKG_DIR"/BootSectors make -C $BOOTHFS
echo "Done!"
stopBuildEpoch=$(date -u "+%s")
buildTime=$(expr $stopBuildEpoch - $startBuildEpoch)
if [[ $buildTime -gt 59 ]]; then
timeToBuild=$(printf "%dm%ds" $((buildTime/60%60)) $((buildTime%60)))
else
timeToBuild=$(printf "%ds" $((buildTime)))
fi
printf -- "\n* %s %s %s\n" "Clover build process took " "$timeToBuild" " to complete..."
} }
@ -925,3 +917,17 @@ fi
# End: # # End: #
# #
# vi: set expandtab ts=4 sw=4 sts=4: # # vi: set expandtab ts=4 sw=4 sts=4: #
echo "Done!"
stopBuildEpoch=$(date -u "+%s")
buildTime=$(expr $stopBuildEpoch - $startBuildEpoch)
if [[ $buildTime -ge 3600 ]]; then
timeToBuild=$(printf "%dh%dm%ds" $((buildTime/3600)) $((buildTime/60%60)) $((buildTime%60)))
elif [[ $buildTime -gt 59 ]]; then
timeToBuild=$(printf "%dm%ds" $((buildTime/60%60)) $((buildTime%60)))
else
timeToBuild=$(printf "%ds" $((buildTime)))
fi
printf -- "\n* %s %s %s\n" "Clover build process took " "$timeToBuild" " to complete..."

View File

@ -1,8 +1,8 @@
#!/bin/bash #!/bin/bash
#./ebuild.sh -gcc53 -fr --no-lto --ia32 -D NO_GRUB_DRIVERS_EMBEDDED #./ebuild.sh -gcc53 -fr --no-lto --ia32 -D NO_GRUB_DRIVERS_EMBEDDED
./ebuild.sh -gcc53 -fr -n 5 -mc --no-usb -D NO_GRUB_DRIVERS_EMBEDDED ./ebuild.sh -gcc131 -fr -n 5 -mc --no-usb -D NO_GRUB_DRIVERS_EMBEDDED
./ebuild.sh -gcc53 -fr -n 5 -D NO_GRUB_DRIVERS_EMBEDDED ./ebuild.sh -gcc131 -fr -n 5 -D NO_GRUB_DRIVERS_EMBEDDED
cd CloverPackage cd CloverPackage
#./makepkg #./makepkg
./makeiso ./makeiso

View File

@ -1152,9 +1152,9 @@ void LOADER_ENTRY::StartLoader()
OC_STRING_ASSIGN(mOpenCoreConfiguration.Kernel.Block.Values[0]->Arch, OC_BLOB_GET(&mOpenCoreConfiguration.Kernel.Scheme.KernelArch)); OC_STRING_ASSIGN(mOpenCoreConfiguration.Kernel.Block.Values[0]->Arch, OC_BLOB_GET(&mOpenCoreConfiguration.Kernel.Scheme.KernelArch));
OC_STRING_ASSIGN(mOpenCoreConfiguration.Kernel.Block.Values[0]->Comment, ""); OC_STRING_ASSIGN(mOpenCoreConfiguration.Kernel.Block.Values[0]->Comment, "");
OC_STRING_ASSIGN(mOpenCoreConfiguration.Kernel.Block.Values[0]->MaxKernel, ""); OC_STRING_ASSIGN(mOpenCoreConfiguration.Kernel.Block.Values[0]->MaxKernel, "");
OC_STRING_ASSIGN(mOpenCoreConfiguration.Kernel.Block.Values[0]->MinKernel, ""); OC_STRING_ASSIGN(mOpenCoreConfiguration.Kernel.Block.Values[0]->MinKernel, "23");
OC_STRING_ASSIGN(mOpenCoreConfiguration.Kernel.Block.Values[0]->Identifier, "com.apple.iokit.IOSkywalkFamily"); OC_STRING_ASSIGN(mOpenCoreConfiguration.Kernel.Block.Values[0]->Identifier, "com.apple.iokit.IOSkywalkFamily");
OC_STRING_ASSIGN(mOpenCoreConfiguration.Kernel.Block.Values[0]->Strategy, "Exclude");
#endif #endif
mOpenCoreConfiguration.Uefi.Output.ProvideConsoleGop = gSettings.GUI.ProvideConsoleGop; mOpenCoreConfiguration.Uefi.Output.ProvideConsoleGop = gSettings.GUI.ProvideConsoleGop;