summaryrefslogtreecommitdiffstats
path: root/packaging
diff options
context:
space:
mode:
authorMarek Gradzki <mgradzki@cisco.com>2017-07-28 15:10:26 +0200
committerMarek Gradzki <mgradzki@cisco.com>2017-07-28 15:52:36 +0200
commit7a480f0d3e0df69f306479e5ee11e4430e4d92ad (patch)
tree699a5c6596533eceb6a9a333e5ed8702bfa105fd /packaging
parent80fb3f28456adff99b9212add3c53a21cbf0967d (diff)
Set Hc2vpp version to 1.17.07.1-SNAPSHOT
Change-Id: I53e12a6e48130455e6b2c1e395517041f728f7a7 Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
Diffstat (limited to 'packaging')
-rwxr-xr-xpackaging/deb/common/prepare.sh10
-rw-r--r--packaging/rpm/honeycomb.spec6
-rwxr-xr-xpackaging/rpm/release4
-rwxr-xr-xpackaging/rpm/rpmbuild.sh2
-rwxr-xr-xpackaging/rpm/version2
5 files changed, 12 insertions, 12 deletions
diff --git a/packaging/deb/common/prepare.sh b/packaging/deb/common/prepare.sh
index 10282f929..229160f5b 100755
--- a/packaging/deb/common/prepare.sh
+++ b/packaging/deb/common/prepare.sh
@@ -14,9 +14,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}-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}-hc.tar.gz
+ARCHIVE=${SOURCE_DIR}/vpp-integration-distribution-${VERSION}-SNAPSHOT-hc.tar.gz
tar -xf ${ARCHIVE} -C ${SOURCE_DIR}/
# Create packaging root
@@ -24,7 +24,7 @@ rm -rf ${BUILD_DIR}
mkdir ${BUILD_DIR}
# Copy contents of tar.gz
-mv ${SOURCE_DIR}/vpp-integration-distribution-${VERSION}/ ${BUILD_DIR}/
+mv ${SOURCE_DIR}/vpp-integration-distribution-${VERSION}-SNAPSHOT/ ${BUILD_DIR}/
cp -r $2 ${BUILD_DIR}
# OS service definition
@@ -34,14 +34,14 @@ cp ${SOURCE_DIR}/$3 ${BUILD_DIR}
cat <<EOT >> ${BUILD_DIR}/debian/changelog
honeycomb (${VERSION}-${RELEASE}) unstable; urgency=low
- * 17.07 release
+ * 17.07.1 release
-- mgradzki <mgradzki@cisco.com> Mon, 23 Feb 2016 09:41:37 +0200
EOT
# Install instructions
cat <<EOT >> ${BUILD_DIR}/debian/install
-vpp-integration-distribution-${VERSION}/* /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 d759d8bb7..3c4e7efde 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}-hc.zip
+Source0: vpp-integration-distribution-%{_version}-SNAPSHOT-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}
+%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}/* $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 620dff261..8cc7608ca 100755
--- a/packaging/rpm/release
+++ b/packaging/rpm/release
@@ -1,10 +1,10 @@
#!/bin/bash
# release version
-echo RELEASE
+# echo RELEASE
#
# 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 RC2~$(expr $BUILD_NUMBER + 2000) \ No newline at end of file
+echo RELEASE~$(expr $BUILD_NUMBER + 2000) \ No newline at end of file
diff --git a/packaging/rpm/rpmbuild.sh b/packaging/rpm/rpmbuild.sh
index b00e82216..121737352 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.07-hc.zip
+ZIPFILE=${ZIPDIR}/vpp-integration-distribution-1.17.07.1-SNAPSHOT-hc.zip
mkdir -p ${DIR}/SOURCES/
cp $ZIPFILE ${DIR}/SOURCES/
cp ${DIR}/honeycomb.spec ${DIR}/SOURCES/
diff --git a/packaging/rpm/version b/packaging/rpm/version
index 6c61e2ba4..ae4023939 100755
--- a/packaging/rpm/version
+++ b/packaging/rpm/version
@@ -1,2 +1,2 @@
#!/bin/bash
-echo 1.17.07
+echo 1.17.07.1