From b36e89d29460c57edb731253ab30d6db6d29e313 Mon Sep 17 00:00:00 2001 From: Anton Maklakov Date: Wed, 13 Jun 2018 13:41:13 +0800 Subject: Add an ability to use a regular directory for overlaying. If it doesn't exist, the tarball is still used diff --git a/scripts/functions b/scripts/functions index ab235d8..b71734b 100644 --- a/scripts/functions +++ b/scripts/functions @@ -2146,11 +2146,15 @@ CT_DoExtractPatch() if [ "${CT_TARGET_USE_OVERLAY}" = "y" -a ! -d "${CT_BUILD_DIR}/overlay" ]; then CT_DoExecLog ALL mkdir -p "${CT_BUILD_DIR}/overlay" overlay="${CT_OVERLAY_LOCATION}/${CT_ARCH}_${CT_OVERLAY_NAME:-overlay}" - ext=`CT_GetFileExtension "${overlay}"` - if [ ! -r "${overlay}${ext}" ]; then - CT_Abort "Overlay ${overlay} not found" + if [ -d "${overlay}" ]; then + CT_DoExecLog ALL cp -av "${overlay}/." "${CT_BUILD_DIR}/overlay" + 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 - CT_Extract "${overlay}${ext}" "${CT_BUILD_DIR}/overlay" fi # Can use common location only if using non-custom source, only bundled patches -- cgit v0.10.2-6-g49f6