diff --git a/hebuild.sh b/hebuild.sh index aa3b3308a..5b216479d 100755 --- a/hebuild.sh +++ b/hebuild.sh @@ -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_OFF="off" # same in buildpkg.sh/makeiso +startBuildEpoch=$(date -u "+%s") + if [[ "$SYSNAME" == Linux ]]; then declare -r NUMBER_OF_CPUS=$(nproc) else @@ -882,16 +884,6 @@ MainPostBuildScript() { echo "Generating BootSectors" local BOOTHFS="$CLOVERROOT"/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: # # # 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..." + diff --git a/makeall.sh b/makeall.sh index 8ee0600ba..77db44c32 100755 --- a/makeall.sh +++ b/makeall.sh @@ -1,8 +1,8 @@ #!/bin/bash #./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 -gcc53 -fr -n 5 -D NO_GRUB_DRIVERS_EMBEDDED +./ebuild.sh -gcc131 -fr -n 5 -mc --no-usb -D NO_GRUB_DRIVERS_EMBEDDED +./ebuild.sh -gcc131 -fr -n 5 -D NO_GRUB_DRIVERS_EMBEDDED cd CloverPackage #./makepkg ./makeiso diff --git a/rEFIt_UEFI/refit/main.cpp b/rEFIt_UEFI/refit/main.cpp index 7a5513bb9..25159561c 100644 --- a/rEFIt_UEFI/refit/main.cpp +++ b/rEFIt_UEFI/refit/main.cpp @@ -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]->Comment, ""); 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]->Strategy, "Exclude"); #endif mOpenCoreConfiguration.Uefi.Output.ProvideConsoleGop = gSettings.GUI.ProvideConsoleGop;