From 230ae977dc8e7bbbac67f6bafdd23fce3e173a51 Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Fri, 2 Sep 2022 10:13:05 +0400 Subject: [PATCH] Replaced hardcoded core component with variable name (#12850) --- .../developer_package/packaging/debian.cmake | 2 +- cmake/packaging/debian.cmake | 42 +++++++++---------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/cmake/developer_package/packaging/debian.cmake b/cmake/developer_package/packaging/debian.cmake index 409c5723fd9..e978b46c642 100644 --- a/cmake/developer_package/packaging/debian.cmake +++ b/cmake/developer_package/packaging/debian.cmake @@ -251,7 +251,7 @@ macro(ov_debian_add_latest_component comp) set(CPACK_COMPONENT_${upper_case}_DESCRIPTION "${CPACK_COMPONENT_${ucomp}_DESCRIPTION}") set(CPACK_COMPONENT_${upper_case}_ARCHITECTURE "${CPACK_COMPONENT_${ucomp}_ARCHITECTURE}") - set(CPACK_COMPONENT_${upper_case}_DEPENDS "${ucomp}") + set(CPACK_COMPONENT_${upper_case}_DEPENDS "${comp}") # take package name if(DEFINED CPACK_DEBIAN_${ucomp}_PACKAGE_NAME) diff --git a/cmake/packaging/debian.cmake b/cmake/packaging/debian.cmake index f78a6da4181..7efa0067ff4 100644 --- a/cmake/packaging/debian.cmake +++ b/cmake/packaging/debian.cmake @@ -105,7 +105,7 @@ macro(ov_cpack_settings) set(CPACK_POST_BUILD_SCRIPTS "${IEDevScripts_DIR}/packaging/debian_post_build.cmake") # We currently don't have versioning for openvino core library - ov_debian_add_lintian_suppression(core + ov_debian_add_lintian_suppression("${OV_CPACK_COMP_CORE}" # package-name-doesnt-match-sonames libopenvino202230 libopenvino-c20223 "package-name-doesnt-match-sonames") @@ -116,7 +116,7 @@ macro(ov_cpack_settings) # hetero if(ENABLE_HETERO) set(CPACK_COMPONENT_HETERO_DESCRIPTION "OpenVINO Hetero plugin") - set(CPACK_COMPONENT_HETERO_DEPENDS "core") + set(CPACK_COMPONENT_HETERO_DEPENDS "${OV_CPACK_COMP_CORE}") set(CPACK_DEBIAN_HETERO_PACKAGE_NAME "libopenvino-hetero-${cpack_name_ver}") set(CPACK_DEBIAN_HETERO_PACKAGE_CONTROL_EXTRA "${def_postinst};${def_postrm}") _ov_add_plugin(hetero ON) @@ -125,7 +125,7 @@ macro(ov_cpack_settings) # auto batch if(ENABLE_AUTO_BATCH) set(CPACK_COMPONENT_BATCH_DESCRIPTION "OpenVINO Automatic Batching plugin") - set(CPACK_COMPONENT_BATCH_DEPENDS "core") + set(CPACK_COMPONENT_BATCH_DEPENDS "${OV_CPACK_COMP_CORE}") set(CPACK_DEBIAN_BATCH_PACKAGE_NAME "libopenvino-auto-batch-${cpack_name_ver}") set(CPACK_DEBIAN_BATCH_PACKAGE_CONTROL_EXTRA "${def_postinst};${def_postrm}") _ov_add_plugin(batch ON) @@ -138,13 +138,13 @@ macro(ov_cpack_settings) else() set(CPACK_COMPONENT_MULTI_DESCRIPTION "OpenVINO Multi plugin") endif() - set(CPACK_COMPONENT_MULTI_DEPENDS "core") + set(CPACK_COMPONENT_MULTI_DEPENDS "${OV_CPACK_COMP_CORE}") set(CPACK_DEBIAN_MULTI_PACKAGE_NAME "libopenvino-auto-${cpack_name_ver}") set(CPACK_DEBIAN_MULTI_PACKAGE_CONTROL_EXTRA "${def_postinst};${def_postrm}") _ov_add_plugin(multi ON) elseif(ENABLE_AUTO) set(CPACK_COMPONENT_AUTO_DESCRIPTION "OpenVINO Auto plugin") - set(CPACK_COMPONENT_AUTO_DEPENDS "core") + set(CPACK_COMPONENT_AUTO_DEPENDS "${OV_CPACK_COMP_CORE}") set(CPACK_DEBIAN_AUTO_PACKAGE_NAME "libopenvino-auto-${cpack_name_ver}") set(CPACK_DEBIAN_AUTO_PACKAGE_CONTROL_EXTRA "${def_postinst};${def_postrm}") _ov_add_plugin(auto ON) @@ -157,7 +157,7 @@ macro(ov_cpack_settings) else() set(CPACK_COMPONENT_CPU_DESCRIPTION "ARM CPU") endif() - set(CPACK_COMPONENT_CPU_DEPENDS "core") + set(CPACK_COMPONENT_CPU_DEPENDS "${OV_CPACK_COMP_CORE}") set(CPACK_DEBIAN_CPU_PACKAGE_NAME "libopenvino-intel-cpu-${cpack_name_ver}") set(CPACK_DEBIAN_CPU_PACKAGE_CONTROL_EXTRA "${def_postinst};${def_postrm}") _ov_add_plugin(cpu OFF) @@ -166,7 +166,7 @@ macro(ov_cpack_settings) # intel-gpu if(ENABLE_INTEL_GPU) set(CPACK_COMPONENT_GPU_DESCRIPTION "Intel® Processor Graphics") - set(CPACK_COMPONENT_GPU_DEPENDS "core") + set(CPACK_COMPONENT_GPU_DEPENDS "${OV_CPACK_COMP_CORE}") set(CPACK_DEBIAN_GPU_PACKAGE_NAME "libopenvino-intel-gpu-${cpack_name_ver}") set(CPACK_DEBIAN_GPU_PACKAGE_CONTROL_EXTRA "${def_postinst};${def_postrm}") # auto batch exhances GPU @@ -177,7 +177,7 @@ macro(ov_cpack_settings) # intel-myriad if(ENABLE_INTEL_MYRIAD) set(CPACK_COMPONENT_MYRIAD_DESCRIPTION "Intel® Movidius™ VPU") - set(CPACK_COMPONENT_MYRIAD_DEPENDS "core") + set(CPACK_COMPONENT_MYRIAD_DEPENDS "${OV_CPACK_COMP_CORE}") set(CPACK_DEBIAN_MYRIAD_PACKAGE_NAME "libopenvino-intel-vpu-${cpack_name_ver}") set(CPACK_DEBIAN_MYRIAD_PACKAGE_CONTROL_EXTRA "${def_postinst};${def_postrm}") _ov_add_plugin(myriad OFF) @@ -186,7 +186,7 @@ macro(ov_cpack_settings) # intel-gna if(ENABLE_INTEL_GNA AND "gna" IN_LIST CPACK_COMPONENTS_ALL) set(CPACK_COMPONENT_GNA_DESCRIPTION "Intel® Gaussian Neural Accelerator") - set(CPACK_COMPONENT_GNA_DEPENDS "core") + set(CPACK_COMPONENT_GNA_DEPENDS "${OV_CPACK_COMP_CORE}") set(CPACK_DEBIAN_GNA_PACKAGE_NAME "libopenvino-intel-gna-${cpack_name_ver}") # since we have libgna.so we need to call ldconfig and have `def_triggers` here set(CPACK_DEBIAN_GNA_PACKAGE_CONTROL_EXTRA "${def_postinst};${def_postrm};${def_triggers}") @@ -212,7 +212,7 @@ macro(ov_cpack_settings) if(ENABLE_OV_IR_FRONTEND) set(CPACK_COMPONENT_IR_DESCRIPTION "OpenVINO IR Frontend") - set(CPACK_COMPONENT_IR_DEPENDS "core") + set(CPACK_COMPONENT_IR_DEPENDS "${OV_CPACK_COMP_CORE}") set(CPACK_DEBIAN_IR_PACKAGE_NAME "libopenvino-ir-frontend-${cpack_name_ver}") set(CPACK_DEBIAN_IR_PACKAGE_CONTROL_EXTRA "${def_postinst};${def_postrm}") ov_debian_add_lintian_suppression(ir @@ -225,7 +225,7 @@ macro(ov_cpack_settings) if(ENABLE_OV_ONNX_FRONTEND) set(CPACK_COMPONENT_ONNX_DESCRIPTION "OpenVINO ONNX Frontend") - set(CPACK_COMPONENT_ONNX_DEPENDS "core") + set(CPACK_COMPONENT_ONNX_DEPENDS "${OV_CPACK_COMP_CORE}") set(CPACK_DEBIAN_ONNX_PACKAGE_NAME "libopenvino-onnx-frontend-${cpack_name_ver}") # since we ONNX FE is linkable target, we need to call ldconfig (i.e. `def_triggers`) set(CPACK_DEBIAN_ONNX_PACKAGE_CONTROL_EXTRA "${def_postinst};${def_postrm};${def_triggers}") @@ -237,7 +237,7 @@ macro(ov_cpack_settings) if(ENABLE_OV_TF_FRONTEND AND "tensorflow" IN_LIST CPACK_COMPONENTS_ALL) set(CPACK_COMPONENT_TENSORFLOW_DESCRIPTION "OpenVINO TensorFlow Frontend") - set(CPACK_COMPONENT_TENSORFLOW_DEPENDS "core") + set(CPACK_COMPONENT_TENSORFLOW_DEPENDS "${OV_CPACK_COMP_CORE}") set(CPACK_DEBIAN_TENSORFLOW_PACKAGE_NAME "libopenvino-tensorflow-frontend-${cpack_name_ver}") # since we TF FE is linkable target, we need to call ldconfig (i.e. `def_triggers`) set(CPACK_DEBIAN_TENSORFLOW_PACKAGE_CONTROL_EXTRA "${def_postinst};${def_postrm};${def_triggers}") @@ -249,7 +249,7 @@ macro(ov_cpack_settings) if(ENABLE_OV_PADDLE_FRONTEND) set(CPACK_COMPONENT_PADDLE_DESCRIPTION "OpenVINO Paddle Frontend") - set(CPACK_COMPONENT_PADDLE_DEPENDS "core") + set(CPACK_COMPONENT_PADDLE_DEPENDS "${OV_CPACK_COMP_CORE}") set(CPACK_DEBIAN_PADDLE_PACKAGE_NAME "libopenvino-paddle-frontend-${cpack_name_ver}") # since we PADDLE FE is linkable target, we need to call ldconfig (i.e. `def_triggers`) set(CPACK_DEBIAN_PADDLE_PACKAGE_CONTROL_EXTRA "${def_postinst};${def_postrm};${def_triggers}") @@ -264,11 +264,11 @@ macro(ov_cpack_settings) # set(CPACK_COMPONENT_CORE_DEV_DESCRIPTION "Intel(R) Distribution of OpenVINO(TM) Toolkit C / C++ Development files") - set(CPACK_COMPONENT_CORE_DEV_DEPENDS "core;${frontends}") + set(CPACK_COMPONENT_CORE_DEV_DEPENDS "${OV_CPACK_COMP_CORE};${frontends}") set(CPACK_DEBIAN_CORE_DEV_PACKAGE_NAME "libopenvino-dev-${cpack_name_ver}") - ov_debian_generate_conflicts(core_dev ${conflicting_versions}) + ov_debian_generate_conflicts("${OV_CPACK_COMP_CORE_DEV}" ${conflicting_versions}) - ov_debian_add_lintian_suppression(core_dev + ov_debian_add_lintian_suppression("${OV_CPACK_COMP_CORE_DEV}" # CVS-79409: create man page for compile_tool "binary-without-manpage") @@ -281,7 +281,7 @@ macro(ov_cpack_settings) if(installed_plugins) set(CPACK_COMPONENT_PYOPENVINO_PYTHON3.8_DEPENDS "${installed_plugins}") else() - set(CPACK_COMPONENT_PYOPENVINO_PYTHON3.8_DEPENDS "core") + set(CPACK_COMPONENT_PYOPENVINO_PYTHON3.8_DEPENDS "${OV_CPACK_COMP_CORE}") endif() set(CPACK_DEBIAN_PYOPENVINO_PYTHON3.8_PACKAGE_NAME "libopenvino-python-${cpack_name_ver}") set(CPACK_DEBIAN_PYOPENVINO_PYTHON3.8_PACKAGE_CONTROL_EXTRA "${def_postinst};${def_postrm}") @@ -296,7 +296,7 @@ macro(ov_cpack_settings) # c_samples / cpp_samples set(CPACK_COMPONENT_SAMPLES_DESCRIPTION "Intel(R) Distribution of OpenVINO(TM) Toolkit C / C++ Samples") - set(CPACK_COMPONENT_SAMPLES_DEPENDS "core_dev") + set(CPACK_COMPONENT_SAMPLES_DEPENDS "${OV_CPACK_COMP_CORE_DEV}") set(CPACK_DEBIAN_SAMPLES_PACKAGE_NAME "openvino-samples-${cpack_name_ver}") set(CPACK_DEBIAN_SAMPLES_PACKAGE_SUGGESTS "${samples_build_deps_suggest}, ${all_plugins_suggest}") set(CPACK_DEBIAN_SAMPLES_PACKAGE_DEPENDS "libgflags-dev, nlohmann-json3-dev, zlib1g-dev") @@ -319,7 +319,7 @@ macro(ov_cpack_settings) if(installed_plugins) set(CPACK_COMPONENT_LIBRARIES_DEPENDS "${installed_plugins}") else() - set(CPACK_COMPONENT_LIBRARIES_DEPENDS "core") + set(CPACK_COMPONENT_LIBRARIES_DEPENDS "${OV_CPACK_COMP_CORE}") endif() set(CPACK_DEBIAN_LIBRARIES_PACKAGE_NAME "openvino-libraries-${cpack_name_ver}") @@ -329,7 +329,7 @@ macro(ov_cpack_settings) # all libraries-dev set(CPACK_COMPONENT_LIBRARIES_DEV_DESCRIPTION "Intel(R) Distribution of OpenVINO(TM) Toolkit Libraries and Development files") - set(CPACK_COMPONENT_LIBRARIES_DEV_DEPENDS "core_dev;libraries") + set(CPACK_COMPONENT_LIBRARIES_DEV_DEPENDS "${OV_CPACK_COMP_CORE_DEV};libraries") set(CPACK_DEBIAN_LIBRARIES_DEV_PACKAGE_NAME "openvino-libraries-dev-${cpack_name_ver}") ov_debian_generate_conflicts(libraries_dev ${conflicting_versions}) ov_debian_add_lintian_suppression(libraries_dev @@ -338,7 +338,7 @@ macro(ov_cpack_settings) # all openvino set(CPACK_COMPONENT_OPENVINO_DESCRIPTION "Intel(R) Distribution of OpenVINO(TM) Toolkit Libraries and Development files") - set(CPACK_COMPONENT_OPENVINO_DEPENDS "libraries_dev;samples") + set(CPACK_COMPONENT_OPENVINO_DEPENDS "libraries_dev;${OV_CPACK_COMP_CPP_SAMPLES}") set(CPACK_DEBIAN_OPENVINO_PACKAGE_NAME "openvino-${cpack_name_ver}") ov_debian_generate_conflicts(openvino ${conflicting_versions}) ov_debian_add_lintian_suppression(openvino