diff options
| author |   Maros Marsalek <mmarsale@cisco.com> | 2016-08-12 13:51:56 +0200 |
|---|---|---|
| committer | Maros Marsalek <mmarsale@cisco.com> | 2016-08-19 12:49:56 +0200 |
| commit | 23a5fe799bb20911f32b5574c71cc26446db493b (patch) | |
| tree | d3eeb9f6296d80b51d6f4c477daf9d9368de297f | |
| parent | 0b68673abd4eac5bb15091e5074ad28b6bbf6c30 (diff) | |
HONEYCOMB-137: Put minimal distribution into RPM
Change-Id: I163be0361f75a29aac569b019892433b12bfb0a6
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
| -rw-r--r-- | packaging/rpm/honeycomb.service | 6 | ||||
| -rw-r--r-- | packaging/rpm/honeycomb.spec | 6 | ||||
| -rw-r--r-- | packaging/rpm/persist/config/data.json | 0 | ||||
| -rw-r--r-- | packaging/rpm/persist/context/data.json | 0 | ||||
| -rwxr-xr-x | packaging/rpm/rpmbuild.sh | 4 |
5 files changed, 7 insertions, 9 deletions
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 --- /dev/null +++ b/packaging/rpm/persist/config/data.json diff --git a/packaging/rpm/persist/context/data.json b/packaging/rpm/persist/context/data.json new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/packaging/rpm/persist/context/data.json 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/ |