Add an ability to use a regular directory for overlaying. If it doesn't exist, the tarball is still used

This commit is contained in:
Anton Maklakov
2018-06-13 13:41:13 +08:00
parent 2808fdb6a3
commit b36e89d294

View File

@ -2146,11 +2146,15 @@ CT_DoExtractPatch()
if [ "${CT_TARGET_USE_OVERLAY}" = "y" -a ! -d "${CT_BUILD_DIR}/overlay" ]; then if [ "${CT_TARGET_USE_OVERLAY}" = "y" -a ! -d "${CT_BUILD_DIR}/overlay" ]; then
CT_DoExecLog ALL mkdir -p "${CT_BUILD_DIR}/overlay" CT_DoExecLog ALL mkdir -p "${CT_BUILD_DIR}/overlay"
overlay="${CT_OVERLAY_LOCATION}/${CT_ARCH}_${CT_OVERLAY_NAME:-overlay}" overlay="${CT_OVERLAY_LOCATION}/${CT_ARCH}_${CT_OVERLAY_NAME:-overlay}"
ext=`CT_GetFileExtension "${overlay}"` if [ -d "${overlay}" ]; then
if [ ! -r "${overlay}${ext}" ]; then CT_DoExecLog ALL cp -av "${overlay}/." "${CT_BUILD_DIR}/overlay"
CT_Abort "Overlay ${overlay} not found" else
ext=`CT_GetFileExtension "${overlay}"`
if [ ! -r "${overlay}${ext}" ]; then
CT_Abort "Overlay ${overlay} not found"
fi
CT_Extract "${overlay}${ext}" "${CT_BUILD_DIR}/overlay"
fi fi
CT_Extract "${overlay}${ext}" "${CT_BUILD_DIR}/overlay"
fi fi
# Can use common location only if using non-custom source, only bundled patches # Can use common location only if using non-custom source, only bundled patches