From 212774e6dc3e3f74b100ac4f66420146e8f2472c Mon Sep 17 00:00:00 2001 From: Marek Gradzki Date: Tue, 28 Mar 2017 09:15:42 +0200 Subject: 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 --- packaging/rpm/honeycomb.spec | 3 ++- packaging/rpm/vpp_dependencies | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100755 packaging/rpm/vpp_dependencies (limited to 'packaging/rpm') diff --git a/packaging/rpm/honeycomb.spec b/packaging/rpm/honeycomb.spec index 7047a340c..3c4e7efde 100644 --- a/packaging/rpm/honeycomb.spec +++ b/packaging/rpm/honeycomb.spec @@ -2,6 +2,7 @@ %define __jar_repack 0 %define _version %(./version) %define _release %(./release) +%define _vpp_dependencies %(./vpp_dependencies) Name: honeycomb Version: %{_version} @@ -18,7 +19,7 @@ License: Apache-1.0 URL: http://www.fd.io Source0: vpp-integration-distribution-%{_version}-SNAPSHOT-hc.zip Source1: honeycomb.service -Requires: vpp >= 17.04, vpp < 17.08, vpp-plugins >= 17.04, vpp-plugins < 17.08, java >= 1:1.8.0 +Requires: %{_vpp_dependencies}, java >= 1:1.8.0 # Required for creating honeycomb group Requires(pre): shadow-utils # Required for configuring systemd diff --git a/packaging/rpm/vpp_dependencies b/packaging/rpm/vpp_dependencies new file mode 100755 index 000000000..5090544b6 --- /dev/null +++ b/packaging/rpm/vpp_dependencies @@ -0,0 +1,6 @@ +#!/bin/bash +# defines vpp and vpp-plugins dependencies for rpm packages +# using range +echo "vpp >= 17.04, vpp < 17.07, vpp-plugins >= 17.04, vpp-plugins < 17.07" +# or specific vpp version +#echo "vpp = 17.04-rc1, vpp-plugins = 17.04-rc1" -- cgit 1.2.3-korg