-
Notifications
You must be signed in to change notification settings - Fork 9
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixed Xcode compiling and drivers (OcQuirks)
- Loading branch information
Showing
10 changed files
with
174 additions
and
31 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| --- buildpkg.sh | ||
| +++ buildpkg.sh | ||
| @@ -12,6 +12,15 @@ | ||
| # Prevent the script from doing bad things | ||
| set -u # Abort with unset variables | ||
| #set -x | ||
| + | ||
| +isDefaultPackage () { | ||
| + local packageRefId="${1}" | ||
| + if [[ $packageRefId =~ ^(.*)(apfsdriverloader|aptiomemoryfix|hfsplus)(.*)$ ]]; then | ||
| + return 0 | ||
| + else | ||
| + return 1 | ||
| + fi | ||
| +} | ||
|
|
||
| usage () { | ||
| printf "\n\e[1m%s\e[0m" "Usage: $0 --srcroot <path> --symroot <name> --builddir <path> [flag1 flag2...]" | ||
| @@ -530,7 +539,7 @@ | ||
| --subst="INSTALLER_CHOICE=$packageRefId" MarkChoice | ||
| buildpackage "$packageRefId" "${choiceId}" "${PKG_BUILD_DIR}/${choiceId}" "/EFIROOTDIR" | ||
| if [[ ${NOEXTRAS} != *"CloverEFI"* ]]; then | ||
| - addChoice --start-visible="true" --start-selected="choicePreviouslySelected('$packageRefId')" \ | ||
| + addChoice --start-visible="true" --start-selected="cloverPackageFirstRun() || choicePreviouslySelected('$packageRefId')" \ | ||
| --pkg-refs="$packageRefId" "${choiceId}" | ||
| else | ||
| addChoice --start-visible="false" --start-selected="true" \ | ||
| @@ -850,12 +859,22 @@ | ||
| # (i.e. Clover package never run on that target partition). | ||
| # Otherwise each single choice start selected only for legacy Clover and only if you previously selected it | ||
| buildpackage "$packageRefId" "${driverChoice}" "${PKG_BUILD_DIR}/${driverChoice}" "${driverDestDir}" | ||
| - addChoice --group="Recommended64" \ | ||
| + if isDefaultPackage "$packageRefId"; then | ||
| + addChoice --group="Recommended64" \ | ||
| --start-visible="true" \ | ||
| --enabled="!choices['UEFI.only'].selected" \ | ||
| - --start-selected="!choices['UEFI.only'].selected && (cloverPackageFirstRun() || choicePreviouslySelected('$packageRefId'))" \ | ||
| + --start-selected="!choices['UEFI.only'].selected" \ | ||
| --visible="!choices['UEFI.only'].selected" \ | ||
| --pkg-refs="$packageRefId" "${driverChoice}" | ||
| + else | ||
| + addChoice --group="Recommended64" \ | ||
| + --start-visible="true" \ | ||
| + --enabled="!choices['UEFI.only'].selected" \ | ||
| + --start-selected="!choices['UEFI.only'].selected && (choicePreviouslySelected('$packageRefId'))" \ | ||
| + --visible="!choices['UEFI.only'].selected" \ | ||
| + --pkg-refs="$packageRefId" "${driverChoice}" | ||
| + fi | ||
| + | ||
| rm -R -f "${PKG_BUILD_DIR}/${driverChoice}" | ||
| done | ||
| fi | ||
| @@ -992,7 +1011,7 @@ | ||
| addGroupChoices --title="Drivers64UEFI" --description="Drivers64UEFI" "Drivers64UEFI" | ||
| addGroupChoices --title="Recommended64UEFI" --description="Recommended64UEFI" --parent=Drivers64UEFI "Recommended64UEFI" | ||
| packagesidentity="${clover_package_identity}".drivers64UEFI.mandatory | ||
| - local drivers=($( find "${SRCROOT}/CloverV2/EFI/CLOVER/drivers/$DRIVERS_UEFI" -type f -name '*.efi' -depth 1 | sort -f )) | ||
| + local drivers=($( find "${SRCROOT}/CloverV2/EFI/CLOVER/drivers/$DRIVERS_UEFI" -type f -name '*.efi' -o -name '*.plist' -depth 1 | sort -f )) | ||
| local driverDestDir="/EFIROOTDIR/EFI/CLOVER/drivers/$DRIVERS_UEFI" | ||
| for (( i = 0 ; i < ${#drivers[@]} ; i++ )) | ||
| do | ||
| @@ -1016,10 +1035,17 @@ | ||
| fi | ||
|
|
||
| buildpackage "$packageRefId" "${driverChoice}" "${PKG_BUILD_DIR}/${driverChoice}" "${driverDestDir}" | ||
| - addChoice --group="Recommended64UEFI" \ | ||
| + if isDefaultPackage "$packageRefId"; then | ||
| + addChoice --group="Recommended64UEFI" \ | ||
| --start-visible="true" \ | ||
| - --start-selected="cloverPackageFirstRun() || choicePreviouslySelected('$packageRefId')" \ | ||
| + --start-selected="true" \ | ||
| --pkg-refs="$packageRefId" "${driverChoice}" | ||
| + else | ||
| + addChoice --group="Recommended64UEFI" \ | ||
| + --start-visible="true" \ | ||
| + --start-selected="choicePreviouslySelected('$packageRefId')" \ | ||
| + --pkg-refs="$packageRefId" "${driverChoice}" | ||
| + fi | ||
| rm -R -f "${PKG_BUILD_DIR}/${driverChoice}" | ||
| done | ||
| fi | ||
| @@ -1369,7 +1395,6 @@ | ||
| for (( i = 0 ; i < ${#specialThemes[@]} ; i++ )); do | ||
| local themeName=${specialThemes[$i]##*/} | ||
| # Don't add christmas and newyear themes if month < 11 | ||
| - [[ $currentMonth -lt 11 ]] && [[ "$themeName" == christmas || "$themeName" == newyear ]] && continue | ||
| mkdir -p "${PKG_BUILD_DIR}/${themeName}/Root/" | ||
| rsync -r --exclude=.svn --exclude="*~" "$artwork/${specialThemes[$i]}/" "${PKG_BUILD_DIR}/${themeName}/Root/${themeName}" | ||
| packageRefId=$(getPackageRefId "${packagesidentity}" "${themeName}") | ||
| @@ -1379,7 +1404,7 @@ | ||
| InstallTheme | ||
|
|
||
| buildpackage "$packageRefId" "${themeName}" "${PKG_BUILD_DIR}/${themeName}" "${themeDestDir}" | ||
| - addChoice --start-visible="false" --start-selected="true" --pkg-refs="$packageRefId" "${themeName}" | ||
| + addChoice --group="Themes" --start-visible="true" --start-selected="choicePreviouslySelected('$packageRefId')" --pkg-refs="$packageRefId" "${themeName}" | ||
| done | ||
| fi |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters