diff --git a/package.cmake b/package.cmake index fccff14e46..7ec1cc291c 100644 --- a/package.cmake +++ b/package.cmake @@ -161,17 +161,10 @@ if(UNIX) endif() if(NEO__IGC_FOUND) - string(REPLACE "." ";" NEO__IGC_VERSION_list ${NEO__IGC_VERSION}) - list(GET NEO__IGC_VERSION_list 0 NEO__IGC_VERSION_MAJOR) - list(GET NEO__IGC_VERSION_list 1 NEO__IGC_VERSION_MINOR) - math(EXPR NEO__IGC_VERSION_MINOR_UPPER "${NEO__IGC_VERSION_MINOR} + 5") - set(NEO__IGC_VERSION_LOWER "${NEO__IGC_VERSION_MAJOR}.${NEO__IGC_VERSION_MINOR}") - set(NEO__IGC_VERSION_UPPER "${NEO__IGC_VERSION_MAJOR}.${NEO__IGC_VERSION_MINOR_UPPER}") - - list(APPEND _external_package_dependencies_debian "intel-igc-opencl-2 (>=${NEO__IGC_VERSION_LOWER}), intel-igc-opencl-2 (<<${NEO__IGC_VERSION_UPPER})") - list(APPEND _external_package_dependencies_rpm "intel-igc-opencl-2 >= ${NEO__IGC_VERSION_LOWER}, intel-igc-opencl-2 < ${NEO__IGC_VERSION_UPPER}") - list(APPEND _igc_package_dependencies_debian "intel-igc-opencl-2 (>=${NEO__IGC_VERSION_LOWER}), intel-igc-opencl-2 (<<${NEO__IGC_VERSION_UPPER})") - list(APPEND _igc_package_dependencies_rpm "intel-igc-opencl-2 >= ${NEO__IGC_VERSION_LOWER}, intel-igc-opencl-2 < ${NEO__IGC_VERSION_UPPER}") + list(APPEND _external_package_dependencies_debian "intel-igc-opencl-2(=${NEO__IGC_VERSION})") + list(APPEND _external_package_dependencies_rpm "intel-igc-opencl-2 = ${NEO__IGC_VERSION}") + list(APPEND _igc_package_dependencies_debian "intel-igc-opencl-2(=${NEO__IGC_VERSION})") + list(APPEND _igc_package_dependencies_rpm "intel-igc-opencl-2 = ${NEO__IGC_VERSION}") else() list(APPEND _external_package_dependencies_debian "intel-igc-opencl-2") list(APPEND _external_package_dependencies_rpm "intel-igc-opencl-2") diff --git a/scripts/packaging/build_deb.sh b/scripts/packaging/build_deb.sh index 2bd18eae54..de7fade644 100755 --- a/scripts/packaging/build_deb.sh +++ b/scripts/packaging/build_deb.sh @@ -95,26 +95,17 @@ if [[ -z "${BRANCH_SUFFIX}" ]] && [[ "${NEO_STRICT_DEPENDENCIES}" == "TRUE" ]]; if [ ! -z "${GMM_DEVEL_VERSION}" ]; then perl -pi -e "s/^ libigdgmm-dev(?=,|$)/ libigdgmm-dev (>=$GMM_DEVEL_VERSION)/" "$BUILD_DIR/debian/control" fi - IGC_CORE_VERSION_LOWER=$(apt-cache policy intel-igc-core-2 | grep Installed | cut -f2- -d ':' | cut -f1-2 -d'.' | xargs) - if [ ! -z "${IGC_CORE_VERSION_LOWER}" ]; then - IGC_CORE_VERSION_MAJOR="${IGC_CORE_VERSION_LOWER%%.*}" - IGC_CORE_VERSION_MINOR="${IGC_CORE_VERSION_LOWER##*.}" - IGC_CORE_VERSION_UPPER="${IGC_CORE_VERSION_MAJOR}.$((IGC_CORE_VERSION_MINOR + 5))" - perl -pi -e "s/^ intel-igc-core-2(?=,|$)/ intel-igc-core-2 (>=$IGC_CORE_VERSION_LOWER), intel-igc-core-2 (<<$IGC_CORE_VERSION_UPPER)/" "$BUILD_DIR/debian/control" + IGC_CORE_VERSION=$(apt-cache policy intel-igc-core-2 | grep Installed | cut -f2- -d ':' | xargs) + if [ ! -z "${IGC_CORE_VERSION}" ]; then + perl -pi -e "s/^ intel-igc-core-2(?=,|$)/ intel-igc-core-2 (>=$IGC_CORE_VERSION), intel-igc-core-2 (<<$IGC_CORE_VERSION+~)/" "$BUILD_DIR/debian/control" fi - IGC_VERSION_LOWER=$(apt-cache policy intel-igc-opencl-2 | grep Installed | cut -f2- -d ':' | cut -f1-2 -d'.' | xargs) - if [ ! -z "${IGC_VERSION_LOWER}" ]; then - IGC_VERSION_MAJOR="${IGC_VERSION_LOWER%%.*}" - IGC_VERSION_MINOR="${IGC_VERSION_LOWER##*.}" - IGC_VERSION_UPPER="${IGC_VERSION_MAJOR}.$((IGC_VERSION_MINOR + 5))" - perl -pi -e "s/^ intel-igc-opencl-2(?=,|$)/ intel-igc-opencl-2 (>=$IGC_VERSION_LOWER), intel-igc-opencl-2 (<<$IGC_VERSION_UPPER)/" "$BUILD_DIR/debian/control" + IGC_VERSION=$(apt-cache policy intel-igc-opencl-2 | grep Installed | cut -f2- -d ':' | xargs) + if [ ! -z "${IGC_VERSION}" ]; then + perl -pi -e "s/^ intel-igc-opencl-2(?=,|$)/ intel-igc-opencl-2 (>=$IGC_VERSION), intel-igc-opencl-2 (<<$IGC_VERSION+~)/" "$BUILD_DIR/debian/control" fi - IGC_DEVEL_VERSION_LOWER=$(apt-cache policy intel-igc-opencl-devel | grep Installed | cut -f2- -d ':' | cut -f1-2 -d'.' | xargs) - if [ ! -z "${IGC_DEVEL_VERSION_LOWER}" ]; then - IGC_DEVEL_VERSION_MAJOR="${IGC_DEVEL_VERSION_LOWER%%.*}" - IGC_DEVEL_VERSION_MINOR="${IGC_DEVEL_VERSION_LOWER##*.}" - IGC_DEVEL_VERSION_UPPER="${IGC_DEVEL_VERSION_MAJOR}.$((IGC_DEVEL_VERSION_MINOR + 5))" - perl -pi -e "s/^ intel-igc-opencl-devel(?=,|$)/ intel-igc-opencl-devel (>=$IGC_DEVEL_VERSION_LOWER), intel-igc-opencl-devel (<<$IGC_DEVEL_VERSION_UPPER)/" "$BUILD_DIR/debian/control" + IGC_DEVEL_VERSION=$(apt-cache policy intel-igc-opencl-devel | grep Installed | cut -f2- -d ':' | xargs) + if [ ! -z "${IGC_DEVEL_VERSION}" ]; then + perl -pi -e "s/^ intel-igc-opencl-devel(?=,|$)/ intel-igc-opencl-devel (>=$IGC_DEVEL_VERSION), intel-igc-opencl-devel (<<$IGC_DEVEL_VERSION+~)/" "$BUILD_DIR/debian/control" fi fi diff --git a/scripts/packaging/l0_gpu_driver/build_l0_gpu_driver_deb.sh b/scripts/packaging/l0_gpu_driver/build_l0_gpu_driver_deb.sh index 5cb31744d4..ccfb39fd65 100755 --- a/scripts/packaging/l0_gpu_driver/build_l0_gpu_driver_deb.sh +++ b/scripts/packaging/l0_gpu_driver/build_l0_gpu_driver_deb.sh @@ -83,13 +83,9 @@ if [[ -z "${BRANCH_SUFFIX}" ]] && [[ "${NEO_STRICT_DEPENDENCIES}" == "TRUE" ]]; if [ ! -z "${GMM_DEVEL_VERSION}" ]; then perl -pi -e "s/^ libigdgmm-dev(?=,|$)/ libigdgmm-dev (>=$GMM_DEVEL_VERSION)/" "$BUILD_DIR/debian/control" fi - - IGC_VERSION_LOWER=$(apt-cache policy intel-igc-core-2 | grep Installed | cut -f2- -d ':' | cut -f1-2 -d'.' | xargs) - if [ ! -z "${IGC_VERSION_LOWER}" ]; then - IGC_VERSION_MAJOR="${IGC_VERSION_LOWER%%.*}" - IGC_VERSION_MINOR="${IGC_VERSION_LOWER##*.}" - IGC_VERSION_UPPER="${IGC_VERSION_MAJOR}.$((IGC_VERSION_MINOR + 5))" - perl -pi -e "s/^ intel-igc-core-2(?=,|$)/ intel-igc-core-2 (>=$IGC_VERSION_LOWER), intel-igc-core-2 (<<$IGC_VERSION_UPPER)/" "$BUILD_DIR/debian/control" + IGC_CORE_VERSION=$(apt-cache policy intel-igc-core-2 | grep Installed | cut -f2- -d ':' | xargs) + if [ ! -z "${IGC_CORE_VERSION}" ]; then + perl -pi -e "s/^ intel-igc-core-2(?=,|$)/ intel-igc-core-2 (>=$IGC_CORE_VERSION), intel-igc-core-2 (<<$IGC_CORE_VERSION+~)/" "$BUILD_DIR/debian/control" fi fi diff --git a/scripts/packaging/opencl/build_opencl_deb.sh b/scripts/packaging/opencl/build_opencl_deb.sh index 302da2e639..dbdd3014fa 100755 --- a/scripts/packaging/opencl/build_opencl_deb.sh +++ b/scripts/packaging/opencl/build_opencl_deb.sh @@ -78,19 +78,13 @@ if [[ -z "${BRANCH_SUFFIX}" ]] && [[ "${NEO_STRICT_DEPENDENCIES}" == "TRUE" ]]; if [ ! -z "${GMM_DEVEL_VERSION}" ]; then perl -pi -e "s/^ libigdgmm-dev(?=,|$)/ libigdgmm-dev (>=$GMM_DEVEL_VERSION)/" "$BUILD_DIR/debian/control" fi - IGC_VERSION_LOWER=$(apt-cache policy intel-igc-opencl-2 | grep Installed | cut -f2- -d ':' | cut -f1-2 -d'.' | xargs) - if [ ! -z "${IGC_VERSION_LOWER}" ]; then - IGC_VERSION_MAJOR="${IGC_VERSION_LOWER%%.*}" - IGC_VERSION_MINOR="${IGC_VERSION_LOWER##*.}" - IGC_VERSION_UPPER="${IGC_VERSION_MAJOR}.$((IGC_VERSION_MINOR + 5))" - perl -pi -e "s/^ intel-igc-opencl-2(?=,|$)/ intel-igc-opencl-2 (>=$IGC_VERSION_LOWER), intel-igc-opencl-2 (<<$IGC_VERSION_UPPER)/" "$BUILD_DIR/debian/control" + IGC_VERSION=$(apt-cache policy intel-igc-opencl-2 | grep Installed | cut -f2- -d ':' | xargs) + if [ ! -z "${IGC_VERSION}" ]; then + perl -pi -e "s/^ intel-igc-opencl-2(?=,|$)/ intel-igc-opencl-2 (>=$IGC_VERSION), intel-igc-opencl-2 (<<$IGC_VERSION+~)/" "$BUILD_DIR/debian/control" fi - IGC_DEVEL_VERSION_LOWER=$(apt-cache policy intel-igc-opencl-devel | grep Installed | cut -f2- -d ':' | cut -f1-2 -d'.' | xargs) - if [ ! -z "${IGC_DEVEL_VERSION_LOWER}" ]; then - IGC_DEVEL_VERSION_MAJOR="${IGC_DEVEL_VERSION_LOWER%%.*}" - IGC_DEVEL_VERSION_MINOR="${IGC_DEVEL_VERSION_LOWER##*.}" - IGC_DEVEL_VERSION_UPPER="${IGC_DEVEL_VERSION_MAJOR}.$((IGC_DEVEL_VERSION_MINOR + 5))" - perl -pi -e "s/^ intel-igc-opencl-devel(?=,|$)/ intel-igc-opencl-devel (>=$IGC_DEVEL_VERSION_LOWER), intel-igc-opencl-devel (<<$IGC_DEVEL_VERSION_UPPER)/" "$BUILD_DIR/debian/control" + IGC_DEVEL_VERSION=$(apt-cache policy intel-igc-opencl-devel | grep Installed | cut -f2- -d ':' | xargs) + if [ ! -z "${IGC_DEVEL_VERSION}" ]; then + perl -pi -e "s/^ intel-igc-opencl-devel(?=,|$)/ intel-igc-opencl-devel (>=$IGC_DEVEL_VERSION), intel-igc-opencl-devel (<<$IGC_DEVEL_VERSION+~)/" "$BUILD_DIR/debian/control" fi fi