diff options
| author |   Marek Gradzki <mgradzki@cisco.com> | 2017-10-30 15:13:37 +0100 |
|---|---|---|
| committer | Marek Gradzki <mgradzki@cisco.com> | 2017-10-31 14:35:02 +0100 |
| commit | 7758b80f96ce03b475c94be49b259bf0a2dd40dd (patch) | |
| tree | 53d607e3937d8f507ae449f93c24488c65e06853 /packaging/rpm | |
| parent | 4ab125c86db6885c1e9c37f19b6a2b483e9c8c63 (diff) | |
Bump Hc2vpp version to 1.17.10v1.17.10
Also updates honeycomb dependencies.
Change-Id: I2f04e80f2c1da3d9ac82425f517e8fd3d5cd4213
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 |
3 files changed, 7 insertions, 7 deletions
diff --git a/packaging/rpm/honeycomb.spec b/packaging/rpm/honeycomb.spec index 3c4e7efde..d759d8bb7 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}-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} %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}/* $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 258792295..3ec80eac1 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 -# $(expr $BUILD_NUMBER + 2000) +# echo $(expr $BUILD_NUMBER + 2000) # echo RC1~$(expr $BUILD_NUMBER + 2000) -echo RC2~$(expr $BUILD_NUMBER + 2000) +# echo RC2~$(expr $BUILD_NUMBER + 2000) # 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 d3f90feec..583b8a429 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-hc.zip mkdir -p ${DIR}/SOURCES/ cp $ZIPFILE ${DIR}/SOURCES/ cp ${DIR}/honeycomb.spec ${DIR}/SOURCES/ |