diff options
| author |   Chris Packham <judge.packham@gmail.com> | 2021-07-18 07:37:16 (GMT) |
|---|---|---|
| committer | Chris Packham <judge.packham@gmail.com> | 2021-07-18 07:37:16 (GMT) |
| commit | 26ce3b335ed0b9cbf297303644cd2c635a9b3949 (patch) | |
| tree | ddfb2fa817194a6897993516f5b5daebc3e13b0c /scripts | |
| parent | e33843744fad1c2bd15cdc7f86a16bff9a7fedb4 (diff) | |
| parent | b48e1a31f335ff2f96e4475d4ae56f8734941cb9 (diff) | |
Merge pull request #1560 from stephanosio/upstream_local_common_patch_dir
Support common local patch directory
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/functions | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/scripts/functions b/scripts/functions index 11717e4..da90980 100644 --- a/scripts/functions +++ b/scripts/functions @@ -2240,6 +2240,7 @@ CT_DoExtractPatch() local bundled_patch_dir local bundled_common_patch_dir local local_patch_dir + local local_common_patch_dir local overlay # Inherit global value if requested @@ -2315,12 +2316,13 @@ CT_DoExtractPatch() bundled_patch_dir="${CT_LIB_DIR}/packages/${pkg_dir}" bundled_common_patch_dir="${CT_LIB_DIR}/packages/${pkg_name}" local_patch_dir="${CT_LOCAL_PATCH_DIR}/${pkg_dir}" + local_common_patch_dir="${CT_LOCAL_PATCH_DIR}/${pkg_name}" case "${patch_order}" in bundled) patch_dirs=("${bundled_patch_dir}" "${bundled_common_patch_dir}");; - local) patch_dirs=("${local_patch_dir}");; - bundled,local) patch_dirs=("${bundled_patch_dir}" "${bundled_common_patch_dir}" "${local_patch_dir}");; - local,bundled) patch_dirs=("${local_patch_dir}" "${bundled_patch_dir}" "${bundled_common_patch_dir}");; + local) patch_dirs=("${local_patch_dir}" "${local_common_patch_dir}");; + bundled,local) patch_dirs=("${bundled_patch_dir}" "${bundled_common_patch_dir}" "${local_patch_dir}" "${local_common_patch_dir}");; + local,bundled) patch_dirs=("${local_patch_dir}" "${local_common_patch_dir}" "${bundled_patch_dir}" "${bundled_common_patch_dir}");; none) patch_dirs=;; esac |