From 418354574a1c4b5b64fffa4236de9e4fc4346ea9 Mon Sep 17 00:00:00 2001 From: Pawel Cieslak Date: Wed, 6 Oct 2021 17:55:15 +0000 Subject: [PATCH] Correct package name Signed-off-by: Pawel Cieslak --- scripts/packaging/functions.sh | 4 ++-- scripts/packaging/l0_gpu_driver/build_l0_gpu_driver_deb.sh | 7 ++++++- scripts/packaging/opencl/build_opencl_deb.sh | 7 ++++++- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/scripts/packaging/functions.sh b/scripts/packaging/functions.sh index a18b4f46bd..4fb1e502ac 100755 --- a/scripts/packaging/functions.sh +++ b/scripts/packaging/functions.sh @@ -9,8 +9,8 @@ set -ex get_api_version() { - API_VERSION="${API_VERSION:-0}" - API_VERSION_SRC="${API_VERSION_SRC:-master}" + API_VERSION="${API_VERSION:-}" + API_VERSION_SRC="${API_VERSION_SRC:-}" API_DEB_MODEL_LINK="" API_RPM_MODEL_LINK="" if [ "${COMPONENT_MODEL}" != "ci" ]; then 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 c550bcb181..1a0528b639 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 @@ -32,7 +32,12 @@ source "${REPO_DIR}/scripts/packaging/${BRANCH_SUFFIX}/l0_gpu_driver/l0_gpu_driv get_api_version # API_VERSION-API_VERSION_SRC and API_DEB_MODEL_LINK get_l0_gpu_driver_version # NEO_L0_VERSION_MAJOR.NEO_L0_VERSION_MINOR.NEO_L0_VERSION_PATCH -VERSION="${NEO_L0_VERSION_MAJOR}.${NEO_L0_VERSION_MINOR}.${NEO_L0_VERSION_PATCH}.${API_VERSION}-${API_VERSION_SRC}${API_DEB_MODEL_LINK}" +if [ -z "${BRANCH_SUFFIX}" ]; then + VERSION="${NEO_L0_VERSION_MAJOR}.${NEO_L0_VERSION_MINOR}.${NEO_L0_VERSION_PATCH}${API_DEB_MODEL_LINK}" +else + VERSION="${NEO_L0_VERSION_MAJOR}.${NEO_L0_VERSION_MINOR}.${NEO_L0_VERSION_PATCH}.${API_VERSION}-${API_VERSION_SRC}${API_DEB_MODEL_LINK}" +fi + PKG_VERSION=${VERSION} if [ "${CMAKE_BUILD_TYPE}" != "Release" ]; then diff --git a/scripts/packaging/opencl/build_opencl_deb.sh b/scripts/packaging/opencl/build_opencl_deb.sh index 957b280718..0a36982ae9 100755 --- a/scripts/packaging/opencl/build_opencl_deb.sh +++ b/scripts/packaging/opencl/build_opencl_deb.sh @@ -37,7 +37,12 @@ export NEO_OCL_VERSION_MAJOR export NEO_OCL_VERSION_MINOR export NEO_OCL_VERSION_BUILD -VERSION="${NEO_OCL_VERSION_MAJOR}.${NEO_OCL_VERSION_MINOR}.${NEO_OCL_VERSION_BUILD}.${API_VERSION}-${API_VERSION_SRC}${API_DEB_MODEL_LINK}" +if [ -z "${BRANCH_SUFFIX}" ]; then + VERSION="${NEO_OCL_VERSION_MAJOR}.${NEO_OCL_VERSION_MINOR}.${NEO_OCL_VERSION_BUILD}${API_DEB_MODEL_LINK}" +else + VERSION="${NEO_OCL_VERSION_MAJOR}.${NEO_OCL_VERSION_MINOR}.${NEO_OCL_VERSION_BUILD}.${API_VERSION}-${API_VERSION_SRC}${API_DEB_MODEL_LINK}" +fi + PKG_VERSION=${VERSION} if [ "${CMAKE_BUILD_TYPE}" != "Release" ]; then