summaryrefslogtreecommitdiffstats
path: root/packaging
diff options
context:
space:
mode:
authorMaros Marsalek <mmarsale@cisco.com>2016-08-01 07:02:13 -0400
committerMaros Marsalek <mmarsale@cisco.com>2016-08-01 13:12:47 +0200
commit174745fc4799f9f8e178e5583c34b08adbec7910 (patch)
tree7c82b86ddfa030ecf4b6f64073ca1ffc358e2990 /packaging
parentdd7fcea54bc00b63924a343db4605592489ff077 (diff)
HONEYCOMB-130: Update rpm build to use vpp-integration karaf
Change-Id: Id808bc72887cfd40f322266d95d21a2ef77f59ce Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
Diffstat (limited to 'packaging')
-rw-r--r--packaging/rpm/honeycomb.spec6
-rwxr-xr-xpackaging/rpm/rpmbuild.sh4
2 files changed, 5 insertions, 5 deletions
diff --git a/packaging/rpm/honeycomb.spec b/packaging/rpm/honeycomb.spec
index 1101a71..cac0ecf 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 0501584..62f375f 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/