diff options
| author |   Alexey Neyman <stilor@att.net> | 2018-11-07 07:01:44 (GMT) |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2018-11-07 07:01:44 (GMT) |
| commit | c00822f46804c333b02055b3ab374b97e50221a6 (patch) | |
| tree | fce9728dc3a2f7f4453ce2d10d828e860d73e436 | |
| parent | 45a88f046d533df256c1af7b8bcd8b0705f745c5 (diff) | |
| parent | b36e89d29460c57edb731253ab30d6db6d29e313 (diff) | |
Merge pull request #1085 from antmak/directory_overlay
Regular directory for overlaying
| -rw-r--r-- | scripts/functions | 12 |
1 files changed, 8 insertions, 4 deletions
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 |