From 4c4e5ba0470c961cc377e13f4a6f99f852098877 Mon Sep 17 00:00:00 2001
From: Mikhail Falaleev <falaleev@synopsys.com>
Date: Fri, 4 Sep 2020 13:57:11 +0300
Subject: 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.

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
 
-- 
cgit v0.10.2-6-g49f6