Fix error Build Clover Pack

espfinder is exclude (Out) from Makefile
793e0ef05b
We need also exclude from EFI Folder build
This commit is contained in:
chris1111 2023-06-28 18:20:37 -04:00 committed by GitHub
parent 7a9a1f4868
commit e85108dca7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -596,14 +596,15 @@ fi
packagesidentity="$clover_package_identity"
choiceId="Utils"
# Utils
# ditto --noextattr --noqtn ${SYMROOT}/utils/bdmesg ${PKG_BUILD_DIR}/${choiceId}/Root/Private/tmp/usr/local/bin/
ditto --noextattr --noqtn ${SYMROOT}/utils/bdmesg ${PKG_BUILD_DIR}/${choiceId}/Root/usr/local/bin/
# ditto --noextattr --noqtn ${SYMROOT}/utils/clover-genconfig ${PKG_BUILD_DIR}/${choiceId}/Root/Private/tmp/usr/local/bin/
ditto --noextattr --noqtn ${SYMROOT}/utils/partutil ${PKG_BUILD_DIR}/${choiceId}/Root/Private/tmp/usr/local/bin/
fixperms "${PKG_BUILD_DIR}/${choiceId}/Root/"
# ditto --noextattr --noqtn ${SYMROOT}/utils/bdmesg ${PKG_BUILD_DIR}/${choiceId}/Root/Private/tmp/usr/local/bin/
ditto --noextattr --noqtn ${SYMROOT}/utils/bdmesg ${PKG_BUILD_DIR}/${choiceId}/Root/usr/local/bin/
# ditto --noextattr --noqtn ${SYMROOT}/utils/clover-genconfig ${PKG_BUILD_DIR}/${choiceId}/Root/Private/tmp/usr/local/bin/
ditto --noextattr --noqtn ${SYMROOT}/utils/partutil ${PKG_BUILD_DIR}/${choiceId}/Root/Private/tmp/usr/local/bin/
# ditto --noextattr --noqtn ${SYMROOT}/utils/espfinder ${PKG_BUILD_DIR}/${choiceId}/Root/Private/tmp/usr/local/bin/
fixperms "${PKG_BUILD_DIR}/${choiceId}/Root/"
#chmod 755 "${PKG_BUILD_DIR}/${choiceId}"/Root/Private/tmp/usr/local/bin/{bdmesg,clover-genconfig,partutil,espfinder}
# chmod 755 "${PKG_BUILD_DIR}/${choiceId}"/Root/Private/tmp/usr/local/bin/{bdmesg,partutil}
chmod 755 "${PKG_BUILD_DIR}/${choiceId}"/Root/Private/tmp/usr/local/bin/{partutil}
# chmod 755 "${PKG_BUILD_DIR}/${choiceId}"/Root/Private/tmp/usr/local/bin/{bdmesg,partutil}
chmod 755 "${PKG_BUILD_DIR}/${choiceId}"/Root/Private/tmp/usr/local/bin/partutil
chmod 755 "${PKG_BUILD_DIR}/${choiceId}"/Root/usr/local/bin/bdmesg
packageRefId=$(getPackageRefId "${packagesidentity}" "${choiceId}")
packageUtilsRefId=$packageRefId
@ -621,8 +622,6 @@ fi
mkdir -p ${PKG_BUILD_DIR}/${choiceId}/Scripts
# Add the partutil binary as a helper to mount ESP
ditto --noextattr --noqtn ${SYMROOT}/utils/partutil ${PKG_BUILD_DIR}/${choiceId}/Scripts/
# Add the espfinder binary as a helper to mount ESP when target is apfs, corestorage, Fusion or RAID
ditto --noextattr --noqtn ${SYMROOT}/utils/espfinder ${PKG_BUILD_DIR}/${choiceId}/Scripts/
addTemplateScripts --pkg-rootdir="${PKG_BUILD_DIR}/${choiceId}" \
--subst="CLOVER_PACKAGE_IDENTITY=$clover_package_identity" \
--subst="INSTALLER_TARGET_ESP_REFID=$installer_target_esp_refid" \