diff --git a/.github/dockerfiles/docker_tag b/.github/dockerfiles/docker_tag index 1143a81836c..67a7eec64a3 100644 --- a/.github/dockerfiles/docker_tag +++ b/.github/dockerfiles/docker_tag @@ -1 +1 @@ -pr-24742 \ No newline at end of file +pr-24878 diff --git a/install_build_dependencies.sh b/install_build_dependencies.sh index 073ed679388..4ee562c993b 100755 --- a/install_build_dependencies.sh +++ b/install_build_dependencies.sh @@ -89,11 +89,20 @@ if [ -f /etc/lsb-release ] || [ -f /etc/debian_version ] ; then else apt-get install -y --no-install-recommends nlohmann-json-dev fi -elif [ -f /etc/redhat-release ] || grep -q "rhel" /etc/os-release ; then - # RHEL 8 / CentOS 7 +elif [ -f /etc/redhat-release ] || grep -q "rhel\|tencentos\|opencloudos" /etc/os-release ; then yum update - yum install -y centos-release-scl - yum install -y epel-release + # RHEL 8 / CentOS 7 + if [ -f /etc/redhat-release ] || grep -q "rhel" /etc/os-release ; then + yum install -y centos-release-scl + yum install -y epel-release + yum install -y \ + `# to build and check pip packages` \ + patchelf \ + `# check bash scripts for correctness` \ + ShellCheck + else + yum install -y epol-release + fi yum install -y \ file \ `# build tools` \ @@ -106,14 +115,10 @@ elif [ -f /etc/redhat-release ] || grep -q "rhel" /etc/os-release ; then make \ `# to determine openvino version via git` \ git \ - `# to build and check pip packages` \ - patchelf \ fdupes \ `# to build and check rpm packages` \ rpm-build \ rpmlint \ - `# check bash scripts for correctness` \ - ShellCheck \ `# main openvino dependencies` \ tbb-devel \ pugixml-devel \ diff --git a/scripts/install_dependencies/install_openvino_dependencies.sh b/scripts/install_dependencies/install_openvino_dependencies.sh index fd3e2a5c887..cbf81e00c70 100755 --- a/scripts/install_dependencies/install_openvino_dependencies.sh +++ b/scripts/install_dependencies/install_openvino_dependencies.sh @@ -96,6 +96,8 @@ if [ "$os" == "auto" ] ; then case $os in centos7|centos8|centos9|\ rhel8|rhel9.1|\ + opencloudos8.5|opencloudos8.6|opencloudos8.8|opencloudos9.0|opencloudos9.2|\ + tencentos3.1|tencentos3.2|tencentos3.3|tencentos4.0|tencentos4.2|\ anolis8.6|anolis8.8|\ openEuler20.03|openEuler22.03|openEuler23.03|\ almalinux8.7|almalinux8.8|almalinux9.2|\ @@ -160,6 +162,10 @@ elif [ "$os" == "ubuntu20.04" ] || [ "$os" == "debian10" ] || [ "$os" == "raspbi elif [ "$os" == "centos7" ] || [ "$os" == "centos8" ] || [ "$os" == "centos9" ] || [ "$os" == "rhel8" ] || [ "$os" == "rhel9.1" ] || + [ "$os" == "opencloudos8.5" ] || [ "$os" == "opencloudos8.6" ] || [ "$os" == "opencloudos8.8" ] || + [ "$os" == "opencloudos9.0" ] || [ "$os" == "opencloudos9.2" ] || + [ "$os" == "tencentos3.1" ] || [ "$os" == "tencentos3.2" ] || [ "$os" == "tencentos3.3" ] || + [ "$os" == "tencentos4.0" ] || [ "$os" == "tencentos4.2" ] || [ "$os" == "anolis8.6" ] || [ "$os" == "anolis8.8" ] || [ "$os" == "openEuler20.03" ] || [ "$os" == "openEuler22.03" ] || [ "$os" == "openEuler23.03" ] || [ "$os" == "fedora29" ] || [ "$os" == "fedora30" ] || [ "$os" == "fedora31" ] || [ "$os" == "fedora32" ] ||