diff options
| author |   Maros Marsalek <mmarsale@cisco.com> | 2016-08-01 07:02:13 -0400 |
|---|---|---|
| committer | Maros Marsalek <mmarsale@cisco.com> | 2016-08-01 13:12:47 +0200 |
| commit | 84eb5829ae847a08db1e6fd08de1be51762392a4 (patch) | |
| tree | c0dbc9ae3d5796f13d5d33329382e985fcd8c127 | |
| parent | 0fc295d4d3de55f888cc610ca6f0c6ade800372e (diff) | |
HONEYCOMB-130: Update rpm build to use vpp-integration karaf
Change-Id: Id808bc72887cfd40f322266d95d21a2ef77f59ce
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
| -rw-r--r-- | packaging/rpm/honeycomb.spec | 6 | ||||
| -rwxr-xr-x | packaging/rpm/rpmbuild.sh | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/packaging/rpm/honeycomb.spec b/packaging/rpm/honeycomb.spec index 1101a71ed..cac0ecfa1 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: v3po-karaf-%{_version}-SNAPSHOT.zip +Source0: vpp-integration-karaf-%{_version}-SNAPSHOT.zip Source1: honeycomb.service Requires: vpp, java >= 1:1.8.0 # Required for creating honeycomb group @@ -37,13 +37,13 @@ fd.io Honeycomb %prep # Extract Source0 (Honeycomb archive) -%autosetup -n v3po-karaf-%{_version}-SNAPSHOT +%autosetup -n vpp-integration-karaf-%{_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 ../v3po-karaf-%{_version}-SNAPSHOT/* $RPM_BUILD_ROOT/opt/%name +cp -r ../vpp-integration-karaf-%{_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/rpmbuild.sh b/packaging/rpm/rpmbuild.sh index 05015844c..62f375fd3 100755 --- a/packaging/rpm/rpmbuild.sh +++ b/packaging/rpm/rpmbuild.sh @@ -2,8 +2,8 @@ set -xe DIR=$(dirname $0) DIR=$(readlink -f $DIR) -ZIPDIR=${DIR}/../../v3po/karaf/target/ -ZIPFILE=${ZIPDIR}/v3po-karaf-1.0.0-SNAPSHOT.zip +ZIPDIR=${DIR}/../../vpp-integration/karaf/target/ +ZIPFILE=${ZIPDIR}/vpp-integration-karaf-1.0.0-SNAPSHOT.zip mkdir -p ${DIR}/SOURCES/ cp $ZIPFILE ${DIR}/SOURCES/ cp ${DIR}/honeycomb.spec ${DIR}/SOURCES/ |