summaryrefslogtreecommitdiffstats
path: root/packaging/rpm
diff options
context:
space:
mode:
authorMarek Gradzki <mgradzki@cisco.com>2017-10-04 08:25:55 +0200
committerMarek Gradzki <mgradzki@cisco.com>2017-10-19 08:11:20 +0200
commitd6e4e3261ade27f6b630bdc3134ad8e14886d70d (patch)
treee30236d6e4092265487d4656c04ee781ca9d6f68 /packaging/rpm
parent5895bd9d450f0232a60be43fd7f4bc4d2ed7b82e (diff)
Bump hc2vpp version to 1.17.10-RC2v1.17.10-RC2
Also updates honeycomb dependencies Change-Id: Ifc6b3233b141236c3d2d70930e3a711a20344411 Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
Diffstat (limited to 'packaging/rpm')
-rw-r--r--packaging/rpm/honeycomb.spec6
-rwxr-xr-xpackaging/rpm/release4
-rwxr-xr-xpackaging/rpm/rpmbuild.sh2
-rwxr-xr-xpackaging/rpm/vpp_dependencies2
4 files changed, 7 insertions, 7 deletions
diff --git a/packaging/rpm/honeycomb.spec b/packaging/rpm/honeycomb.spec
index 3c4e7efde..ff01f4a07 100644
--- a/packaging/rpm/honeycomb.spec
+++ b/packaging/rpm/honeycomb.spec
@@ -17,7 +17,7 @@ Summary: fd.io Honeycomb
Group: Applications/Communications
License: Apache-1.0
URL: http://www.fd.io
-Source0: vpp-integration-distribution-%{_version}-SNAPSHOT-hc.zip
+Source0: vpp-integration-distribution-%{_version}-RC2-hc.zip
Source1: honeycomb.service
Requires: %{_vpp_dependencies}, java >= 1:1.8.0
# Required for creating honeycomb group
@@ -38,13 +38,13 @@ fd.io Honeycomb
%prep
# Extract Source0 (Honeycomb archive)
-%autosetup -n vpp-integration-distribution-%{_version}-SNAPSHOT
+%autosetup -n vpp-integration-distribution-%{_version}-RC2
%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}-SNAPSHOT/* $RPM_BUILD_ROOT/opt/%name
+cp -r ../vpp-integration-distribution-%{_version}-RC2/* $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 4de82e41c..deab7dcff 100755
--- a/packaging/rpm/release
+++ b/packaging/rpm/release
@@ -1,10 +1,10 @@
#!/bin/bash
# release version
-# echo RELEASE
+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 d3f90feec..611b64df8 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.10-SNAPSHOT-hc.zip
+ZIPFILE=${ZIPDIR}/vpp-integration-distribution-1.17.10-RC2-hc.zip
mkdir -p ${DIR}/SOURCES/
cp $ZIPFILE ${DIR}/SOURCES/
cp ${DIR}/honeycomb.spec ${DIR}/SOURCES/
diff --git a/packaging/rpm/vpp_dependencies b/packaging/rpm/vpp_dependencies
index 0ac35028a..f79c5edc0 100755
--- a/packaging/rpm/vpp_dependencies
+++ b/packaging/rpm/vpp_dependencies
@@ -3,4 +3,4 @@
# using range
echo "vpp >= 17.10, vpp < 17.11, vpp-plugins >= 17.10, vpp-plugins < 17.11"
# or specific vpp version
-#echo "vpp = 17.10-rc1, vpp-plugins = 17.10-rc1"
+#echo "vpp = 17.10-rc2, vpp-plugins = 17.10-rc2"