Merge branch 'pr_1726' into 'main'

[GH_PR] fix(cluster_select): gate Thread clusters on OPENTHREAD_ENABLED (CON-1993)

See merge request app-frameworks/esp-matter!1444

components/esp_matter/utils/cluster_select/Kconfig.in

@@ -431,14 +431,17 @@ config SUPPORT_THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER
 
 config SUPPORT_THREAD_BORDER_ROUTER_MANAGEMENT_CLUSTER
 	bool "Support THREAD_BORDER_ROUTER_MANAGEMENT_CLUSTER"
+	depends on OPENTHREAD_ENABLED
 	default y
 
 config SUPPORT_THREAD_NETWORK_DIAGNOSTICS_CLUSTER
 	bool "Support THREAD_NETWORK_DIAGNOSTICS_CLUSTER"
+	depends on OPENTHREAD_ENABLED
 	default y
 
 config SUPPORT_THREAD_NETWORK_DIRECTORY_CLUSTER
 	bool "Support THREAD_NETWORK_DIRECTORY_CLUSTER"
+	depends on OPENTHREAD_ENABLED
 	default y
 
 config SUPPORT_TIME_FORMAT_LOCALIZATION_CLUSTER

components/esp_matter/utils/cluster_select/generate_cluster_select_files.py

@@ -46,15 +46,25 @@ def load_json(json_file):
     return {key: value for key, value in server_dirs.items() if value}
 
 
+# Clusters that require OpenThread support
+OPENTHREAD_CLUSTERS = {
+    'THREAD_BORDER_ROUTER_MANAGEMENT_CLUSTER',
+    'THREAD_NETWORK_DIAGNOSTICS_CLUSTER',
+    'THREAD_NETWORK_DIRECTORY_CLUSTER',
+}
+
+
 def generate_cluster_select_kconfig(cluster_list, output_dir):
     with open(os.path.join(output_dir, 'Kconfig.in'), 'w') as kconfig_file:
         write_file_header(kconfig_file)
         for cluster in cluster_list.keys():
-            kconfig_file.writelines(
-                [f'config SUPPORT_{cluster}\n',
-                 f'\tbool "Support {cluster}"\n',
-                 '\tdefault y\n'
-                 '\n'])
+            lines = [f'config SUPPORT_{cluster}\n',
+                     f'\tbool "Support {cluster}"\n']
+            if cluster in OPENTHREAD_CLUSTERS:
+                lines.append('\tdepends on OPENTHREAD_ENABLED\n')
+            lines.append('\tdefault y\n')
+            lines.append('\n')
+            kconfig_file.writelines(lines)
 
 
 def generate_cluster_select_cmake(cluster_list, output_dir):