summaryrefslogtreecommitdiffstats
path: root/packaging
diff options
context:
space:
mode:
authorMarek Gradzki <mgradzki@cisco.com>2017-01-19 17:38:42 +0100
committerMarek Gradzki <mgradzki@cisco.com>2017-01-24 13:55:45 +0100
commit9db53630c6033bba49a6da4e4ecd511047d53f25 (patch)
treef35c2091809763a2b9b28c869915b9e378ce09e4 /packaging
parent9813b4e4047e1226198bf215d89417a2dfc7f664 (diff)
Set hc2vpp version back to 1.17.01-SNAPSHOT
Change-Id: I4503dbc1f8737ca4d780e180a7c279c980f6a80e Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
Diffstat (limited to 'packaging')
-rwxr-xr-xpackaging/deb/common/prepare.sh8
-rw-r--r--packaging/rpm/honeycomb.spec6
-rwxr-xr-xpackaging/rpm/release4
-rwxr-xr-xpackaging/rpm/rpmbuild.sh2
4 files changed, 10 insertions, 10 deletions
diff --git a/packaging/deb/common/prepare.sh b/packaging/deb/common/prepare.sh
index 7e54151d0..901b3574d 100755
--- a/packaging/deb/common/prepare.sh
+++ b/packaging/deb/common/prepare.sh
@@ -11,9 +11,9 @@ BUILD_DIR=${SOURCE_DIR}/honeycomb-${VERSION}
# 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}-RC2-hc.tar.gz
+ARCHIVE=${ARCHIVE_DIR}/vpp-integration-distribution-${VERSION}-SNAPSHOT-hc.tar.gz
cp ${ARCHIVE} ${SOURCE_DIR}
-ARCHIVE=${SOURCE_DIR}/vpp-integration-distribution-${VERSION}-RC2-hc.tar.gz
+ARCHIVE=${SOURCE_DIR}/vpp-integration-distribution-${VERSION}-SNAPSHOT-hc.tar.gz
tar -xf ${ARCHIVE} -C ${SOURCE_DIR}/
# Create packaging root
@@ -21,7 +21,7 @@ rm -rf ${BUILD_DIR}
mkdir ${BUILD_DIR}
# Copy contents of tar.gz
-mv ${SOURCE_DIR}/vpp-integration-distribution-${VERSION}-RC2/ ${BUILD_DIR}/
+mv ${SOURCE_DIR}/vpp-integration-distribution-${VERSION}-SNAPSHOT/ ${BUILD_DIR}/
cp -r $2 ${BUILD_DIR}
# OS service definition
@@ -38,7 +38,7 @@ EOT
# Install instructions
cat <<EOT >> ${BUILD_DIR}/debian/install
-vpp-integration-distribution-${VERSION}-RC2/* /opt/honeycomb/
+vpp-integration-distribution-${VERSION}-SNAPSHOT/* /opt/honeycomb/
$3 $4
EOT
diff --git a/packaging/rpm/honeycomb.spec b/packaging/rpm/honeycomb.spec
index ee21b164f..f702904dd 100644
--- a/packaging/rpm/honeycomb.spec
+++ b/packaging/rpm/honeycomb.spec
@@ -16,7 +16,7 @@ Summary: fd.io Honeycomb
Group: Applications/Communications
License: Apache-1.0
URL: http://www.fd.io
-Source0: vpp-integration-distribution-%{_version}-RC2-hc.zip
+Source0: vpp-integration-distribution-%{_version}-SNAPSHOT-hc.zip
Source1: honeycomb.service
Requires: vpp >= 17.01, vpp < 17.04, vpp-plugins >= 17.01, vpp-plugins < 17.04, java >= 1:1.8.0
# Required for creating honeycomb group
@@ -37,13 +37,13 @@ fd.io Honeycomb
%prep
# Extract Source0 (Honeycomb archive)
-%autosetup -n vpp-integration-distribution-%{_version}-RC2
+%autosetup -n vpp-integration-distribution-%{_version}-SNAPSHOT
%install
# Create directory in build root for Honeycomb
mkdir -p $RPM_BUILD_ROOT/opt/%name
# Copy Honeycomb from archive to its dir in build root
-cp -r ../vpp-integration-distribution-%{_version}-RC2/* $RPM_BUILD_ROOT/opt/%name
+cp -r ../vpp-integration-distribution-%{_version}-SNAPSHOT/* $RPM_BUILD_ROOT/opt/%name
# Create directory in build root for systemd .service file
mkdir -p $RPM_BUILD_ROOT/%{_unitdir}
# Copy Honeycomb's systemd .service file to correct dir in build root
diff --git a/packaging/rpm/release b/packaging/rpm/release
index 6d685d2d4..e459ded30 100755
--- a/packaging/rpm/release
+++ b/packaging/rpm/release
@@ -1,10 +1,10 @@
#!/bin/bash
# release version
-echo RC2
+# echo RC2
#
# snapshot version
#
# Increasing the build number by a certain margin.
# Necessary due to honeycomb - hc2vpp split. Build_number counter was reset
# rewriting older packages
-# echo $(expr $BUILD_NUMBER + 2000) \ No newline at end of file
+echo $(expr $BUILD_NUMBER + 2000) \ No newline at end of file
diff --git a/packaging/rpm/rpmbuild.sh b/packaging/rpm/rpmbuild.sh
index 82fc1ab92..2607d4c11 100755
--- a/packaging/rpm/rpmbuild.sh
+++ b/packaging/rpm/rpmbuild.sh
@@ -3,7 +3,7 @@ set -xe
DIR=$(dirname $0)
DIR=$(readlink -f $DIR)
ZIPDIR=${DIR}/../../vpp-integration/minimal-distribution/target/
-ZIPFILE=${ZIPDIR}/vpp-integration-distribution-1.17.01-RC2-hc.zip
+ZIPFILE=${ZIPDIR}/vpp-integration-distribution-1.17.01-SNAPSHOT-hc.zip
mkdir -p ${DIR}/SOURCES/
cp $ZIPFILE ${DIR}/SOURCES/
cp ${DIR}/honeycomb.spec ${DIR}/SOURCES/