diff options
| author |   Marek Gradzki <mgradzki@cisco.com> | 2017-10-31 20:32:29 +0100 |
|---|---|---|
| committer | Marek Gradzki <mgradzki@cisco.com> | 2017-10-31 20:56:26 +0100 |
| commit | 9543c6f3ac4a4c7e12f51b2816e8d4c743a57b3e (patch) | |
| tree | 97974b3a0bef68b83b3843d7931f8a6938adc63a /packaging/rpm | |
| parent | 7758b80f96ce03b475c94be49b259bf0a2dd40dd (diff) | |
Set hc2vpp version to 1.17.10.1-SNAPSHOT
Change-Id: Ic1cca03f4375df306dca3bfe946cc2287a4ac44e
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
Diffstat (limited to 'packaging/rpm')
| -rw-r--r-- | packaging/rpm/honeycomb.spec | 6 | ||||
| -rwxr-xr-x | packaging/rpm/release | 6 | ||||
| -rwxr-xr-x | packaging/rpm/rpmbuild.sh | 2 | ||||
| -rwxr-xr-x | packaging/rpm/version | 2 |
4 files changed, 8 insertions, 8 deletions
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 3ec80eac1..c5672830e 100755 --- a/packaging/rpm/release +++ b/packaging/rpm/release @@ -1,13 +1,13 @@ #!/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 $(expr $BUILD_NUMBER + 2000) +# $(expr $BUILD_NUMBER + 2000) # echo RC1~$(expr $BUILD_NUMBER + 2000) # echo RC2~$(expr $BUILD_NUMBER + 2000) -# echo RELEASE~$(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 583b8a429..b98e81dcf 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-hc.zip +ZIPFILE=${ZIPDIR}/vpp-integration-distribution-1.17.10.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 98c4fc6ac..2f2d44db2 100755 --- a/packaging/rpm/version +++ b/packaging/rpm/version @@ -1,2 +1,2 @@ #!/bin/bash -echo 1.17.10 +echo 1.17.10.1 |