Updated to Open vSwitch 2.7.0

Resolves: #1426596
Also enabled DPDK support
f38
Timothy Redaelli 8 years ago
parent 93756602c1
commit 2cacd7451f

1
.gitignore vendored

@ -19,3 +19,4 @@
/openvswitch-2.5.0.tar.gz /openvswitch-2.5.0.tar.gz
/openvswitch-2.6.0.tar.gz /openvswitch-2.6.0.tar.gz
/openvswitch-2.6.1.tar.gz /openvswitch-2.6.1.tar.gz
/openvswitch-2.7.0.tar.gz

@ -9,12 +9,15 @@
# option. For example: # option. For example:
# rpmbuild -bb --with check openvswitch.spec # rpmbuild -bb --with check openvswitch.spec
# To disable DPDK support, specify '--without dpdk' when building
%bcond_without dpdk
# Enable PIE, bz#955181 # Enable PIE, bz#955181
%global _hardened_build 1 %global _hardened_build 1
Name: openvswitch Name: openvswitch
Version: 2.6.1 Version: 2.7.0
Release: 2%{?snapshot}%{?dist} Release: 0%{?snapshot}%{?dist}
Summary: Open vSwitch daemon/database/utilities Summary: Open vSwitch daemon/database/utilities
# Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the
@ -25,7 +28,11 @@ URL: http://openvswitch.org
Source0: http://openvswitch.org/releases/%{name}-%{version}%{?snap_gitsha}.tar.gz Source0: http://openvswitch.org/releases/%{name}-%{version}%{?snap_gitsha}.tar.gz
Source1: ovs-snapshot.sh Source1: ovs-snapshot.sh
%if %{with dpdk}
ExclusiveArch: x86_64 i686 aarch64 ppc64le
%else
ExcludeArch: ppc ExcludeArch: ppc
%endif
BuildRequires: autoconf automake libtool BuildRequires: autoconf automake libtool
BuildRequires: systemd-units openssl openssl-devel BuildRequires: systemd-units openssl openssl-devel
@ -38,6 +45,11 @@ BuildRequires: groff graphviz
BuildRequires: python2-twisted python2-zope-interface python2-six BuildRequires: python2-twisted python2-zope-interface python2-six
BuildRequires: procps-ng BuildRequires: procps-ng
%endif %endif
%if %{with dpdk}
# DPDK driver dependencies
BuildRequires: libpcap-devel numactl-devel
BuildRequires: dpdk-devel >= 16.11
%endif
Requires: openssl iproute module-init-tools Requires: openssl iproute module-init-tools
#Upstream kernel commit 4f647e0a3c37b8d5086214128614a136064110c3 #Upstream kernel commit 4f647e0a3c37b8d5086214128614a136064110c3
@ -157,7 +169,13 @@ sed -i.old -e "s/^AC_INIT(openvswitch,.*,/AC_INIT(openvswitch, %{version},/" con
./boot.sh ./boot.sh
%endif %endif
%configure --enable-ssl --with-pkidir=%{_sharedstatedir}/openvswitch/pki %configure \
--enable-ssl \
%if %{with dpdk}
--with-dpdk=$(dirname %{_datadir}/dpdk/*/.config) \
%endif
--with-pkidir=%{_sharedstatedir}/openvswitch/pki
make %{?_smp_mflags} make %{?_smp_mflags}
%install %install
@ -426,6 +444,7 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/ovsdb-tool.1* %{_mandir}/man1/ovsdb-tool.1*
%{_mandir}/man5/ovs-vswitchd.conf.db.5* %{_mandir}/man5/ovs-vswitchd.conf.db.5*
%{_mandir}/man5/vtep.5* %{_mandir}/man5/vtep.5*
%{_mandir}/man7/ovs-fields.7*
%{_mandir}/man8/vtep-ctl.8* %{_mandir}/man8/vtep-ctl.8*
%{_mandir}/man8/ovs-appctl.8* %{_mandir}/man8/ovs-appctl.8*
%{_mandir}/man8/ovs-bugtool.8* %{_mandir}/man8/ovs-bugtool.8*
@ -438,8 +457,7 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man8/ovs-vswitchd.8* %{_mandir}/man8/ovs-vswitchd.8*
%{_mandir}/man8/ovs-parse-backtrace.8* %{_mandir}/man8/ovs-parse-backtrace.8*
%{_mandir}/man8/ovs-testcontroller.8* %{_mandir}/man8/ovs-testcontroller.8*
%doc COPYING DESIGN.md INSTALL.SSL.md NOTICE README.md WHY-OVS.md %doc COPYING NOTICE README.rst NEWS rhel/README.RHEL.rst
%doc FAQ.md NEWS INSTALL.DPDK.md rhel/README.RHEL
/var/lib/openvswitch /var/lib/openvswitch
/var/log/openvswitch /var/log/openvswitch
%ghost %attr(755,root,root) %{_rundir}/openvswitch %ghost %attr(755,root,root) %{_rundir}/openvswitch
@ -453,6 +471,7 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/ovn-sbctl %{_bindir}/ovn-sbctl
%{_bindir}/ovn-trace %{_bindir}/ovn-trace
%{_datadir}/openvswitch/scripts/ovn-ctl %{_datadir}/openvswitch/scripts/ovn-ctl
%{_datadir}/openvswitch/scripts/ovndb-servers.ocf
%{_datadir}/openvswitch/scripts/ovn-bugtool-nbctl-show %{_datadir}/openvswitch/scripts/ovn-bugtool-nbctl-show
%{_datadir}/openvswitch/scripts/ovn-bugtool-sbctl-lflow-list %{_datadir}/openvswitch/scripts/ovn-bugtool-sbctl-lflow-list
%{_datadir}/openvswitch/scripts/ovn-bugtool-sbctl-show %{_datadir}/openvswitch/scripts/ovn-bugtool-sbctl-show
@ -482,6 +501,10 @@ rm -rf $RPM_BUILD_ROOT
%{_unitdir}/ovn-controller-vtep.service %{_unitdir}/ovn-controller-vtep.service
%changelog %changelog
* Fri Feb 24 2017 Timothy Redaelli <tredaelli@redhat.com> - 2.7.0-0
- Updated to Open vSwitch 2.7.0 (#1426596)
- Enable DPDK support
* Thu Feb 16 2017 Timothy Redaelli <tredaelli@redhat.com> - 2.6.1-2 * Thu Feb 16 2017 Timothy Redaelli <tredaelli@redhat.com> - 2.6.1-2
- Added python3-openvswitch and renamed python-openvswitch to python2-openvswitch - Added python3-openvswitch and renamed python-openvswitch to python2-openvswitch

@ -1 +1 @@
59216437f24ce9bf2d643b760f1f692a openvswitch-2.6.1.tar.gz SHA512 (openvswitch-2.7.0.tar.gz) = d0c61fa149f5279182de561ed82125e7ddd4ecd4278eba3c5e6a7221840c8cbb70581269afdf4ff2508b8e5baeb8783b1a196d6e6f747e3a21aacdf778d6d190

Loading…
Cancel
Save