| Message ID | 6f2aae4ce76839218f2d7dc0eb68066821f8ab73.1453983832.git.pmatilai@redhat.com |
|---|---|
| State | Accepted |
| Headers | show |
On Thu, 28 Jan 2016 14:23:52 +0200 Panu Matilainen <pmatilai@redhat.com> wrote: > 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> > --- > INSTALL.Fedora.md | 3 +++ > rhel/openvswitch-fedora.spec.in | 9 +++++++++ > 2 files changed, 12 insertions(+) > Acked-by: Flavio Leitner <fbl@sysclose.org> It's safe to go in branch-2.5 too.
On Thu, Feb 04, 2016 at 09:12:25PM -0200, Flavio Leitner wrote: > On Thu, 28 Jan 2016 14:23:52 +0200 > Panu Matilainen <pmatilai@redhat.com> wrote: > > > 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> > > --- > > INSTALL.Fedora.md | 3 +++ > > rhel/openvswitch-fedora.spec.in | 9 +++++++++ > > 2 files changed, 12 insertions(+) > > > > Acked-by: Flavio Leitner <fbl@sysclose.org> > > It's safe to go in branch-2.5 too. Thanks, applied to master and branch-2.5.
diff --git a/INSTALL.Fedora.md b/INSTALL.Fedora.md index 75b6375..d8153ed 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 e655665..704b6bb 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 @@ -118,6 +124,9 @@ overlays and security groups. %else --disable-libcapng \ %endif +%if %{with dpdk} + --with-dpdk=$(dirname %{_datadir}/dpdk/*/.config) \ +%endif --enable-ssl \ --with-pkidir=%{_sharedstatedir}/openvswitch/pki
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> --- INSTALL.Fedora.md | 3 +++ rhel/openvswitch-fedora.spec.in | 9 +++++++++ 2 files changed, 12 insertions(+)