summaryrefslogtreecommitdiffstats
path: root/packaging/deb/common
diff options
context:
space:
mode:
authorMarek Gradzki <mgradzki@cisco.com>2018-01-10 10:51:11 +0100
committerMarek Gradzki <mgradzki@cisco.com>2018-01-11 08:01:53 +0100
commit3dd06d40b35c5fc3a9e04a7314daf163647b0192 (patch)
treec151b2de1d2dbd67e62c341a2836acbb9a909377 /packaging/deb/common
parent0651fbe5d97b7eab72a0970fa4158c8019749dd7 (diff)
Introduce hc2vpp_version
Hc2vpp jar versioning is currently slightly different than honeycomb DEB/RPM versioning. This patch introduces hc2vpp_version to reflect that difference and simplify release process. In the future unification of versioning scheme should be considered. Change-Id: I6b6f3c39a7bee9de86163b107f5e6ba941c839ee Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
Diffstat (limited to 'packaging/deb/common')
-rwxr-xr-xpackaging/deb/common/prepare.sh9
1 files changed, 5 insertions, 4 deletions
diff --git a/packaging/deb/common/prepare.sh b/packaging/deb/common/prepare.sh
index 90853c262..b58b98ad6 100755
--- a/packaging/deb/common/prepare.sh
+++ b/packaging/deb/common/prepare.sh
@@ -7,6 +7,7 @@ set -xe
# $5 - build dependencies file
SOURCE_DIR=$1
VERSION=$(${SOURCE_DIR}/../../rpm/version)
+HC2VPP_VERSION=$(${SOURCE_DIR}/../../rpm/hc2vpp_version)
RELEASE=$(${SOURCE_DIR}/../../rpm/release)
BUILD_DIR=${SOURCE_DIR}/honeycomb-${VERSION}
VPP_DEPENDENCIES=$(${SOURCE_DIR}/../../deb/common/vpp_dependencies)
@@ -14,9 +15,9 @@ BUILD_DEPENDENCIES=$($5)
# Copy and unpack the archive with vpp-integration distribution
ARCHIVE_DIR=${SOURCE_DIR}/../../../vpp-integration/minimal-distribution/target/
-ARCHIVE=${ARCHIVE_DIR}/vpp-integration-distribution-${VERSION}-SNAPSHOT-hc.tar.gz
+ARCHIVE=${ARCHIVE_DIR}/vpp-integration-distribution-${HC2VPP_VERSION}-hc.tar.gz
cp ${ARCHIVE} ${SOURCE_DIR}
-ARCHIVE=${SOURCE_DIR}/vpp-integration-distribution-${VERSION}-SNAPSHOT-hc.tar.gz
+ARCHIVE=${SOURCE_DIR}/vpp-integration-distribution-${HC2VPP_VERSION}-hc.tar.gz
tar -xf ${ARCHIVE} -C ${SOURCE_DIR}/
# Create packaging root
@@ -24,7 +25,7 @@ rm -rf ${BUILD_DIR}
mkdir ${BUILD_DIR}
# Copy contents of tar.gz
-mv ${SOURCE_DIR}/vpp-integration-distribution-${VERSION}-SNAPSHOT/ ${BUILD_DIR}/
+mv ${SOURCE_DIR}/vpp-integration-distribution-${HC2VPP_VERSION}/ ${BUILD_DIR}/
cp -r $2 ${BUILD_DIR}
# OS service definition
@@ -41,7 +42,7 @@ EOT
# Install instructions
cat <<EOT >> ${BUILD_DIR}/debian/install
-vpp-integration-distribution-${VERSION}-SNAPSHOT/* /opt/honeycomb/
+vpp-integration-distribution-${HC2VPP_VERSION}/* /opt/honeycomb/
$3 $4
EOT