From dcd507eff53e7c0abd659da416aac91a7d29e3d3 Mon Sep 17 00:00:00 2001
From: Maros Marsalek <mmarsale@cisco.com>
Date: Fri, 12 Aug 2016 13:51:56 +0200
Subject: HONEYCOMB-137: Put minimal distribution into RPM

Change-Id: I163be0361f75a29aac569b019892433b12bfb0a6
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
---
 packaging/rpm/honeycomb.service         | 6 ++----
 packaging/rpm/honeycomb.spec            | 6 +++---
 packaging/rpm/persist/config/data.json  | 0
 packaging/rpm/persist/context/data.json | 0
 packaging/rpm/rpmbuild.sh               | 4 ++--
 5 files changed, 7 insertions(+), 9 deletions(-)
 create mode 100644 packaging/rpm/persist/config/data.json
 create mode 100644 packaging/rpm/persist/context/data.json

(limited to 'packaging/rpm')

diff --git a/packaging/rpm/honeycomb.service b/packaging/rpm/honeycomb.service
index 4752c1313..8a2a46864 100644
--- a/packaging/rpm/honeycomb.service
+++ b/packaging/rpm/honeycomb.service
@@ -5,9 +5,7 @@ After=vpp.service
 
 [Service]
 Type=forking
-ExecStart=/opt/honeycomb/bin/start
-User=honeycomb
-Group=honeycomb
+ExecStart=/opt/honeycomb/honeycomb
 
 [Install]
-WantedBy=multi-user.target
\ No newline at end of file
+WantedBy=multi-user.target
diff --git a/packaging/rpm/honeycomb.spec b/packaging/rpm/honeycomb.spec
index cac0ecfa1..f15d7e133 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:     vpp-integration-karaf-%{_version}-SNAPSHOT.zip
+Source0:     vpp-integration-distribution-%{_version}-SNAPSHOT-hc.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 vpp-integration-karaf-%{_version}-SNAPSHOT
+%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-karaf-%{_version}-SNAPSHOT/* $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/persist/config/data.json b/packaging/rpm/persist/config/data.json
new file mode 100644
index 000000000..e69de29bb
diff --git a/packaging/rpm/persist/context/data.json b/packaging/rpm/persist/context/data.json
new file mode 100644
index 000000000..e69de29bb
diff --git a/packaging/rpm/rpmbuild.sh b/packaging/rpm/rpmbuild.sh
index 62f375fd3..2cbb20482 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}/../../vpp-integration/karaf/target/
-ZIPFILE=${ZIPDIR}/vpp-integration-karaf-1.0.0-SNAPSHOT.zip
+ZIPDIR=${DIR}/../../vpp-integration/minimal-distribution/target/
+ZIPFILE=${ZIPDIR}/vpp-integration-distribution-1.0.0-SNAPSHOT-hc.zip
 mkdir -p ${DIR}/SOURCES/
 cp $ZIPFILE ${DIR}/SOURCES/
 cp ${DIR}/honeycomb.spec ${DIR}/SOURCES/
-- 
cgit 1.2.3-korg