diff options
| author |   Alexey Neyman <stilor@att.net> | 2017-05-07 22:51:28 (GMT) |
|---|---|---|
| committer | Alexey Neyman <stilor@att.net> | 2017-07-08 17:56:29 (GMT) |
| commit | 85599c47431a3c6bf50a7b12b8e37c741b4c8e81 (patch) | |
| tree | 61f3564e59cc2ee5065b1a47cbe1abf46c858280 /scripts/functions | |
| parent | 0a654319f9a1d0ebaacb5572139f72c7f236b100 (diff) | |
Point bundled patches location to packages/
Also disable per-arch patch application: this doesn't play well with the
reuse of the sources in .build/src
Signed-off-by: Alexey Neyman <stilor@att.net>
Diffstat (limited to 'scripts/functions')
| -rw-r--r-- | scripts/functions | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/scripts/functions b/scripts/functions index c1b99ce..972403f 100644 --- a/scripts/functions +++ b/scripts/functions @@ -1251,15 +1251,14 @@ CT_Patch() { CT_DoLog EXTRA "Patching '${pkgdir}'" - bundled_patch_dir="${CT_LIB_DIR}/patches/${pkgname}/${version}" - bundled_patch_arch_dir="${bundled_patch_dir}/${CT_ARCH}" + bundled_patch_dir="${CT_LIB_DIR}/packages/${pkgname}/${version}" local_patch_dir="${CT_LOCAL_PATCH_DIR}/${pkgname}/${version}" case "${CT_PATCH_ORDER}" in - bundled) patch_dirs=("${bundled_patch_dir}" "${bundled_patch_arch_dir}");; + bundled) patch_dirs=("${bundled_patch_dir}");; local) patch_dirs=("${local_patch_dir}");; - bundled,local) patch_dirs=("${bundled_patch_dir}" "${bundled_patch_arch_dir}" "${local_patch_dir}");; - local,bundled) patch_dirs=("${local_patch_dir}" "${bundled_patch_dir}" "${bundled_patch_arch_dir}");; + bundled,local) patch_dirs=("${bundled_patch_dir}" "${local_patch_dir}");; + local,bundled) patch_dirs=("${local_patch_dir}" "${bundled_patch_dir}");; none) patch_dirs=;; esac |