diff options
| author |   Marek Gradzki <mgradzki@cisco.com> | 2017-03-28 09:15:42 +0200 |
|---|---|---|
| committer |   Jan Srnicek <jsrnicek@cisco.com> | 2017-03-29 06:11:23 +0000 |
| commit | 212774e6dc3e3f74b100ac4f66420146e8f2472c (patch) | |
| tree | afc76d6ced7d91199066760e1d356bde6ceed3df /packaging/deb/xenial | |
| parent | 539dafd91d6c58400ff2623d85df28f40a11ffe5 (diff) | |
HC2VPP-102: allow to configure vpp dependencies in deb/rpm build scripts
Debian:
VPP dependencies can be specified in deb/common/vpp_dependencies file,
used to generated debian/control file. Can be verified with:
dpkg -I honeycomb_package.deb
Centos:
VPP dependencies can be specified in rpmvpp_dependencies file,
referenced in honeycomb.spec. Can be verified with:
rpm -i honeycomb_package.rpm
Change-Id: Ide4ff3888085f714467fa1c1543b24b3c1b9f14b
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
Diffstat (limited to 'packaging/deb/xenial')
| -rwxr-xr-x | packaging/deb/xenial/build_dependencies | 2 | ||||
| -rw-r--r-- | packaging/deb/xenial/debian/control | 14 | ||||
| -rwxr-xr-x | packaging/deb/xenial/debuild.sh | 2 |
3 files changed, 3 insertions, 15 deletions
diff --git a/packaging/deb/xenial/build_dependencies b/packaging/deb/xenial/build_dependencies new file mode 100755 index 000000000..fdd065180 --- /dev/null +++ b/packaging/deb/xenial/build_dependencies @@ -0,0 +1,2 @@ +#!/bin/bash +echo "debhelper (>= 9), dh-systemd" diff --git a/packaging/deb/xenial/debian/control b/packaging/deb/xenial/debian/control deleted file mode 100644 index 5a66f9cfe..000000000 --- a/packaging/deb/xenial/debian/control +++ /dev/null @@ -1,14 +0,0 @@ -Source: honeycomb -Section: misc -Priority: optional -Maintainer: fd.io/hc2vpp <hc2vpp@lists.fd.io> -Build-Depends: debhelper (>= 9), dh-systemd -Standards-Version: 3.9.6 -Homepage: https://wiki.fd.io/view/Hc2vpp -Vcs-Browser: https://git.fd.io/cgit/hc2vpp/tree/ - -Package: honeycomb -Architecture: all -Depends: vpp (>= 17.04), vpp (<< 17.08), vpp-plugins (>= 17.04), vpp-plugins (<< 17.08), openjdk-8-jre-headless -Suggests: vpp-nsh-plugin -Description: Honeycomb agent for VPP diff --git a/packaging/deb/xenial/debuild.sh b/packaging/deb/xenial/debuild.sh index 21e3b7a84..08d9b1974 100755 --- a/packaging/deb/xenial/debuild.sh +++ b/packaging/deb/xenial/debuild.sh @@ -3,6 +3,6 @@ set -xe DIR=$(dirname $0) DIR=$(readlink -f ${DIR}) -BUILD_FOLDER=$(${DIR}/../common/prepare.sh ${DIR} ${DIR}/../trusty/debian honeycomb.service /lib/systemd/system) +BUILD_FOLDER=$(${DIR}/../common/prepare.sh ${DIR} ${DIR}/../trusty/debian honeycomb.service /lib/systemd/system ${DIR}/build_dependencies) cp -r ${DIR}/debian/* ${BUILD_FOLDER}/debian/ ${DIR}/../common/debuild.sh ${BUILD_FOLDER}
\ No newline at end of file |