diff options
| author |   Mikhail Falaleev <falaleev@synopsys.com> | 2020-09-04 10:57:11 (GMT) |
|---|---|---|
| committer | Mikhail Falaleev <falaleev@synopsys.com> | 2020-09-10 14:14:39 (GMT) |
| commit | 4c4e5ba0470c961cc377e13f4a6f99f852098877 (patch) | |
| tree | 227926862da1094d23256f9fd3a0c76e7cf82bad /scripts | |
| parent | e7da850fa2066c9f1adeba3d8525a7231d0e47bc (diff) | |
Patches: search package patches in the top package directory
Before patches for specific package were searched in
packages/${pkg_name}/${version}. This means that with usage of custom
version, patches wont be applied. This commit makes ct-ng search bundled
patches also in packages/${pkg_name} directory. That means that we can
put some patches in this directory, that will be applied to any version
of this component.
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 2227de7..4b3aab9 100644 --- a/scripts/functions +++ b/scripts/functions @@ -2233,6 +2233,7 @@ CT_DoExtractPatch() local archive ext local -a patch_dirs local bundled_patch_dir + local bundled_common_patch_dir local local_patch_dir local overlay @@ -2307,13 +2308,14 @@ CT_DoExtractPatch() CT_DoExecLog ALL touch "${src_dir}/.${basename}.patching" 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}" case "${patch_order}" in - bundled) patch_dirs=("${bundled_patch_dir}");; + bundled) patch_dirs=("${bundled_patch_dir}" "${bundled_common_patch_dir}");; local) patch_dirs=("${local_patch_dir}");; - bundled,local) patch_dirs=("${bundled_patch_dir}" "${local_patch_dir}");; - local,bundled) patch_dirs=("${local_patch_dir}" "${bundled_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}");; none) patch_dirs=;; esac |