IntenseWebs/openvino
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compile_tool is excluded from Debian / RPM (#13911)

Browse Source 
* Compile_tool is excluded from Debian / RPM

* Removed warnings related to compile_tool

* Removed noarch for core-dev
This commit is contained in:
Ilya Lavrenov 2022-11-10 12:30:11 +04:00 committed by GitHub
parent c478f7b266
commit 473bded2b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/developer_package/packaging/common-libraries.cmake
View File

@ -65,7 +65,7 @@ macro(ov_override_component_names)
# move requirements.txt to core-dev
set(OV_CPACK_COMP_DEV_REQ_FILES "${OV_CPACK_COMP_CORE_DEV}")
# move core_tools to core-dev
set(OV_CPACK_COMP_CORE_TOOLS "${OV_CPACK_COMP_CORE_DEV}")
# set(OV_CPACK_COMP_CORE_TOOLS "${OV_CPACK_COMP_CORE_DEV}")
endmacro()
ov_override_component_names()

2
cmake/developer_package/packaging/debian/debian.cmake
View File

@ -61,7 +61,7 @@ macro(ov_override_component_names)
# move requirements.txt to core-dev
set(OV_CPACK_COMP_DEV_REQ_FILES "${OV_CPACK_COMP_CORE_DEV}")
# move core_tools to core-dev
set(OV_CPACK_COMP_CORE_TOOLS "${OV_CPACK_COMP_CORE_DEV}")
# set(OV_CPACK_COMP_CORE_TOOLS "${OV_CPACK_COMP_CORE_DEV}")
endmacro()
ov_override_component_names()

2
cmake/developer_package/packaging/rpm/rpm.cmake
View File

@ -66,7 +66,7 @@ macro(ov_override_component_names)
# move requirements.txt to core-dev
set(OV_CPACK_COMP_DEV_REQ_FILES "${OV_CPACK_COMP_CORE_DEV}")
# move core_tools to core-dev
set(OV_CPACK_COMP_CORE_TOOLS "${OV_CPACK_COMP_CORE_DEV}")
# set(OV_CPACK_COMP_CORE_TOOLS "${OV_CPACK_COMP_CORE_DEV}")
endmacro()
ov_override_component_names()

2
cmake/developer_package/target_flags.cmake
View File

@ -65,7 +65,7 @@ elseif(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^(arm64.*|aarch64.*|AARCH64.*)")
set(HOST_AARCH64 ON)
elseif(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^(arm.*|ARM.*)")
set(HOST_ARM ON)
elseif(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^(arm.*|ARM.*)")
elseif(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^riscv64$")
set(HOST_RISCV64 ON)
endif()

2
cmake/packaging/common-libraries.cmake
View File

@ -26,6 +26,8 @@ macro(ov_cpack_settings)
NOT item STREQUAL "tensorflow" AND
# we have `license_file` field in conda meta.yml
NOT item STREQUAL OV_CPACK_COMP_LICENSING AND
# compile_tool is not needed
NOT item STREQUAL OV_CPACK_COMP_CORE_TOOLS AND
# not appropriate components
NOT item STREQUAL OV_CPACK_COMP_DEPLOYMENT_MANAGER AND
NOT item STREQUAL OV_CPACK_COMP_INSTALL_DEPENDENCIES AND

8
cmake/packaging/debian.cmake
View File

@ -61,6 +61,8 @@ macro(ov_cpack_settings)
NOT item STREQUAL "tensorflow" AND
# we have copyright file for debian package
NOT item STREQUAL OV_CPACK_COMP_LICENSING AND
# compile_tool is not needed
NOT item STREQUAL OV_CPACK_COMP_CORE_TOOLS AND
# not appropriate components
NOT item STREQUAL OV_CPACK_COMP_DEPLOYMENT_MANAGER AND
NOT item STREQUAL OV_CPACK_COMP_INSTALL_DEPENDENCIES AND
@ -278,13 +280,7 @@ 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 "${OV_CPACK_COMP_CORE};${frontends}")
set(CPACK_DEBIAN_CORE_DEV_PACKAGE_NAME "libopenvino-dev-${cpack_name_ver}")
# TODO: update once compile_tool is excluded from the package
# set(CPACK_DEBIAN_CORE_DEV_PACKAGE_ARCHITECTURE "all")
ov_debian_generate_conflicts("${OV_CPACK_COMP_CORE_DEV}" ${conflicting_versions})
ov_debian_add_lintian_suppression("${OV_CPACK_COMP_CORE_DEV}"
# CVS-79409: create man page for compile_tool
"binary-without-manpage")
set(${OV_CPACK_COMP_CORE_DEV}_copyright "${OV_CPACK_COMP_CORE_DEV}")
#

8
cmake/packaging/rpm.cmake
View File

@ -61,6 +61,8 @@ macro(ov_cpack_settings)
NOT item STREQUAL "tensorflow" AND
# we have copyright file for rpm package
NOT item STREQUAL OV_CPACK_COMP_LICENSING AND
# compile_tool is not needed
NOT item STREQUAL OV_CPACK_COMP_CORE_TOOLS AND
# not appropriate components
NOT item STREQUAL OV_CPACK_COMP_DEPLOYMENT_MANAGER AND
NOT item STREQUAL OV_CPACK_COMP_INSTALL_DEPENDENCIES AND
@ -258,8 +260,6 @@ 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 "${OV_CPACK_COMP_CORE};${frontends}")
set(CPACK_RPM_CORE_DEV_PACKAGE_NAME "libopenvino-devel-${cpack_name_ver}")
# TODO: update once compile_tool is excluded from the package
# set(CPACK_RPM_CORE_DEV_PACKAGE_ARCHITECTURE "noarch")
ov_rpm_generate_conflicts("${OV_CPACK_COMP_CORE_DEV}" ${conflicting_versions})
ov_rpm_add_rpmlint_suppression("${OV_CPACK_COMP_CORE_DEV}"
@ -268,9 +268,7 @@ macro(ov_cpack_settings)
"devel-file-in-non-devel-package /usr/${OV_CPACK_INCLUDEDIR}/ie"
"devel-file-in-non-devel-package /usr/${OV_CPACK_INCLUDEDIR}/openvino"
"devel-file-in-non-devel-package /usr/${OV_CPACK_RUNTIMEDIR}/libopenvino*"
"devel-file-in-non-devel-package /usr/${OV_CPACK_RUNTIMEDIR}/pkgconfig/openvino.pc"
# CVS-79409: create man page for compile_tool, remove together with compile_tool
"no-manual-page-for-binary compile_tool")
"devel-file-in-non-devel-package /usr/${OV_CPACK_RUNTIMEDIR}/pkgconfig/openvino.pc")
set(${OV_CPACK_COMP_CORE_DEV}_copyright "${OV_CPACK_COMP_CORE_DEV}")
#