From: Panu Matilainen <pmatilai@redhat.com>
Date: Thu, 28 Jan 2016 12:23:52 +0000 (+0200)
Subject: rhel: Add '--with dpdk' spec option to build DPDK-enabled packages
X-Git-Tag: v2.5.0~26
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=4a627d495771488628b5f1f1783c02375d7e2cbb;hp=790526bf7150df084c445d140cfdc86c3a0672fd;p=cascardo%2Fovs.git

rhel: Add '--with dpdk' spec option to build DPDK-enabled packages

Requires DPDK >= 2.2 as that is the first version to have a standard
install layout which we can discover without help from user.
Additionally document the option in INSTALL.Fedora.md.

Signed-off-by: Panu Matilainen <pmatilai@redhat.com>
Acked-by: Flavio Leitner <fbl@sysclose.org>
Signed-off-by: Ben Pfaff <blp@ovn.org>
---

diff --git a/INSTALL.Fedora.md b/INSTALL.Fedora.md
index 75b6375c6..d8153edbf 100644
--- a/INSTALL.Fedora.md
+++ b/INSTALL.Fedora.md
@@ -61,6 +61,9 @@ $HOME/rpmbuild/SOURCES.
 
    This produces one RPM: "openvswitch".
 
+   To enable DPDK support in the resulting openvswitch package,
+   add `--with dpdk` to the build command.
+
    The above command automatically runs the Open vSwitch unit tests.
    To disable the unit tests, run:
 
diff --git a/rhel/openvswitch-fedora.spec.in b/rhel/openvswitch-fedora.spec.in
index 15f5c6082..1bf4c12d4 100644
--- a/rhel/openvswitch-fedora.spec.in
+++ b/rhel/openvswitch-fedora.spec.in
@@ -16,6 +16,8 @@
 # If libcap-ng isn't available and there is no need for running OVS
 # as regular user, specify the '--without libcapng'
 %bcond_without libcapng
+# To enable DPDK support, specify '--with dpdk' when building
+%bcond_with dpdk
 
 # Enable PIE, bz#955181
 %global _hardened_build 1
@@ -49,6 +51,10 @@ BuildRequires: procps-ng
 %if %{with libcapng}
 BuildRequires: libcap-ng libcap-ng-devel
 %endif
+%if %{with dpdk}
+BuildRequires: dpdk-devel >= 2.2.0
+Provides: %{name}-dpdk = %{version}-%{release}
+%endif
 
 Requires: openssl iproute module-init-tools
 #Upstream kernel commit 4f647e0a3c37b8d5086214128614a136064110c3
@@ -116,6 +122,9 @@ overlays and security groups.
 	--enable-libcapng \
 %else
 	--disable-libcapng \
+%endif
+%if %{with dpdk}
+	--with-dpdk=$(dirname %{_datadir}/dpdk/*/.config) \
 %endif
 	--enable-ssl \
 	--with-pkidir=%{_sharedstatedir}/openvswitch/pki