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

Debian conflicts (#12567)

Browse Source 
* Supported newer versions of shellcheck

* Fixed installation against conflicting versions
This commit is contained in:
Ilya Lavrenov 2022-08-16 11:12:57 +04:00 committed by GitHub
parent 752cce38ad
commit 5b40ef1982
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.ci/azure/linux_debian.yml
View File

@ -245,7 +245,7 @@ jobs:
sudo apt-get install --no-install-recommends gnupg -y
echo "deb https://apt.repos.intel.com/openvino/2022 focal main" | sudo tee /etc/apt/sources.list.d/intel-openvino-2022.list
sudo apt-get update -o Dir::Etc::sourcelist=/etc/apt/sources.list.d/intel-openvino-2022.list
# sudo apt-get install openvino -y
sudo apt-get install openvino -y
# install our local one and make sure the conflicts are resolved
sudo apt-get install --no-install-recommends dpkg-dev -y
rm -r _CPack_Packages

3
cmake/packaging/debian.cmake
View File

@ -263,7 +263,7 @@ macro(ov_cpack_settings)
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_DEBIAN_LIBRARIES_DEV_PACKAGE_NAME "openvino-libraries-dev-${cpack_name_ver}")
# ov_debian_generate_conflicts(libraries_dev ${conflicting_versions})
ov_debian_generate_conflicts(libraries_dev ${conflicting_versions})
ov_debian_add_lintian_suppression(libraries_dev
# it's umbrella package
"empty-binary-package")
@ -272,6 +272,7 @@ macro(ov_cpack_settings)
set(CPACK_COMPONENT_OPENVINO_DESCRIPTION "Intel(R) Distribution of OpenVINO(TM) Toolkit Libraries and Development files")
set(CPACK_COMPONENT_OPENVINO_DEPENDS "libraries_dev;samples;python_samples")
set(CPACK_DEBIAN_OPENVINO_PACKAGE_NAME "openvino-${cpack_name_ver}")
ov_debian_generate_conflicts(openvino ${conflicting_versions})
ov_debian_add_lintian_suppression(openvino
# it's umbrella package
"empty-binary-package")