+# TODO:
+# - verify all init scripts still work
+#
+# warning: Installed (but unpackaged) file(s) found:
+# /etc/bash_completion.d/ovs-appctl-bashcomp.bash
+# /etc/bash_completion.d/ovs-vsctl-bashcomp.bash
+# /usr/bin/ovn-controller
+# /usr/bin/ovn-controller-vtep
+# /usr/bin/ovn-detrace
+# /usr/bin/ovn-docker-overlay-driver
+# /usr/bin/ovn-docker-underlay-driver
+# /usr/bin/ovn-nbctl
+# /usr/bin/ovn-northd
+# /usr/bin/ovn-sbctl
+# /usr/bin/ovn-trace
+# /usr/bin/ovs-docker
+# /usr/bin/ovs-tcpdump
+# /usr/bin/ovs-testcontroller
+# /usr/bin/vtep-ctl
+# /usr/share/man/man1/ovn-detrace.1.gz
+# /usr/share/man/man5/ovn-nb.5.gz
+# /usr/share/man/man5/ovn-sb.5.gz
+# /usr/share/man/man5/vtep.5.gz
+# /usr/share/man/man7/ovn-architecture.7.gz
+# /usr/share/man/man7/ovs-fields.7.gz
+# /usr/share/man/man8/ovn-controller-vtep.8.gz
+# /usr/share/man/man8/ovn-controller.8.gz
+# /usr/share/man/man8/ovn-ctl.8.gz
+# /usr/share/man/man8/ovn-nbctl.8.gz
+# /usr/share/man/man8/ovn-northd.8.gz
+# /usr/share/man/man8/ovn-sbctl.8.gz
+# /usr/share/man/man8/ovn-trace.8.gz
+# /usr/share/man/man8/ovs-tcpdump.8.gz
+# /usr/share/man/man8/ovs-testcontroller.8.gz
+# /usr/share/man/man8/vtep-ctl.8.gz
+# /usr/share/openvswitch/ovn-nb.ovsschema
+# /usr/share/openvswitch/ovn-sb.ovsschema
+# /usr/share/openvswitch/vtep.ovsschema
+
#
# Conditional build:
-%bcond_without dist_kernel # allow non-distribution kernel
-%bcond_without kernel # don't build kernel modules
+%bcond_with kernel # build kernel module for flow-based switching for kernels < 4.11
%bcond_without userspace # don't build userspace programs
%bcond_with verbose # verbose build (V=1)
-# set kernel_builtin to true for kernels with openvswitch module (>= 3.3)
-%define kernel_builtin %(echo %{_kernel_ver} | awk '{ split($0, v, "."); vv=v[1]*1000+v[2]; if (vv >= 3003) print 1; else print 0 }')
-#'
-%if %{kernel_builtin} == 1
-%undefine with_kernel
+%if 0%{?_pld_builder:1} && %{with kernel} && %{with userspace}
+%{error:kernel and userspace cannot be built at the same time on PLD builders}
+exit 1
%endif
-%if %{without kernel}
-%undefine with_dist_kernel
-%endif
-%if "%{_alt_kernel}" != "%{nil}"
-%undefine with_userspace
-%endif
%if %{without userspace}
# nothing to be placed to debuginfo package
%define _enable_debug_packages 0
%endif
-%define rel 1
+%define rel 0.1
%define pname openvswitch
Summary: Production Quality, Multilayer Open Virtual Switch
#Summary(pl.UTF-8): -
-Name: %{pname}%{_alt_kernel}
-Version: 1.4.0
-Release: %{rel}
+Name: %{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel}
+Version: 2.8.1
+Release: %{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}}
License: Apache v2.0
Group: Networking/Daemons
Source0: http://openvswitch.org/releases/%{pname}-%{version}.tar.gz
-# Source0-md5: 3847c60af329bfe81ff7220b9f489fa5
+# Source0-md5: 837e291cfd60af0fc455e77deb2e1172
Source1: ifdown-ovs
Source2: ifup-ovs
Source3: README.PLD
#Source8: openvswitch-controller.init
#Source9: openvswitch-ipsec.init
Source10: %{pname}.service
-Source11: ovsdbmonitor.desktop
-Patch0: linux-3.3.patch
-Patch1: ovsdbmonitor-move-to-its-own-data-directory.patch
URL: http://openvswitch.org/
BuildRequires: Zope-Interface
-BuildRequires: automake
BuildRequires: autoconf
+BuildRequires: automake
BuildRequires: graphviz
BuildRequires: groff
BuildRequires: openssl-devel
BuildRequires: openssl-tools
BuildRequires: pkgconfig
-BuildRequires: python-PyQt4-devel
BuildRequires: python-PyQt4-devel-tools
BuildRequires: python-TwistedConch
BuildRequires: python-TwistedCore
BuildRequires: python-distribute
BuildRequires: rpm-pythonprov
-BuildRequires: rpmbuild(macros) >= 1.647
+BuildRequires: rpmbuild(macros) >= 1.701
+BuildRequires: sip-PyQt4
%if %{with kernel}
-%{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build >= 3:2.6.20.2}
+%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:3.11}
+%else
+Requires: uname(release) >= 3.11
%endif
Requires(post,preun): /sbin/chkconfig
+Requires(post,preun,postun): systemd-units >= 38
Requires: python-modules
Requires: rc-scripts
-Requires: systemd-units
+Requires: systemd-units >= 38
+Obsoletes: ovsdbmonitor < 2.3.0-1
BuildRoot: %{tmpdir}/%{pname}-%{version}-root-%(id -u -n)
%description
servers similar to VMware's vNetwork distributed vswitch or Cisco's
Nexus 1000V.
-#%description -l pl.UTF-8
+%package devel
+Summary: Header files and development libraries for openvswitch
+Group: Development/Libraries
+
+%description devel
+Header files and development libraries for openvswitch.
%package -n python-openvswitch
Summary: Open vSwitch python bindings
%description -n python-openvswitch
Python bindings for the Open vSwitch database
-%package -n ovsdbmonitor
-Summary: Open vSwitch graphical monitoring tool
-Group: Networking/Admin
-Requires: Zope-Interface
-Requires: python-PyQt4-devel-tools
-Requires: python-TwistedConch
-Requires: python-TwistedCore
-Requires: python-modules
-Requires: python-openvswitch = %{version}-%{release}
-
-%description -n ovsdbmonitor
-A GUI tool for monitoring and troubleshooting local or remote Open
-vSwitch installations. It presents GUI tables that graphically
-represent an Open vSwitch kernel flow table (similar to "ovs-dpctl
-dump-flows") and Open vSwitch database contents (similar to "ovs-vsctl
-list <table>").
-
%package test
Summary: Open vSwitch test package
Group: Networking/Admin
This package contains utilities that are useful to diagnose
performance and connectivity issues in Open vSwitch setup.
-%package -n kernel%{_alt_kernel}-net-openvswitch
-Summary: Linux driver for openvswitch
-Summary(pl.UTF-8): Sterownik dla Linuksa do openvswitch
-Release: %{rel}@%{_kernel_ver_str}
-Group: Base/Kernel
-Requires(post,postun): /sbin/depmod
-%if %{with dist_kernel}
-%requires_releq_kernel
-Requires(postun): %releq_kernel
-%endif
-
-%description -n kernel%{_alt_kernel}-net-openvswitch
-This is driver for openvswitch for Linux.
-
-This package contains Linux module.
-
-%description -n kernel%{_alt_kernel}-net-openvswitch -l pl.UTF-8
-Sterownik dla Linuksa do openvswitch.
-
-Ten pakiet zawiera moduł jądra Linuksa.
+%define kernel_pkg()\
+%package -n kernel%{_alt_kernel}-net-openvswitch\
+Summary: Linux driver for openvswitch\
+Summary(pl.UTF-8): Sterownik dla Linuksa do openvswitch\
+Release: %{rel}@%{_kernel_ver_str}\
+Group: Base/Kernel\
+Requires(post,postun): /sbin/depmod\
+%requires_releq_kernel\
+Requires(postun): %releq_kernel\
+\
+%description -n kernel%{_alt_kernel}-net-openvswitch\
+This is driver for openvswitch for Linux.\
+\
+This package contains Linux module.\
+\
+%description -n kernel%{_alt_kernel}-net-openvswitch -l pl.UTF-8\
+Sterownik dla Linuksa do openvswitch.\
+\
+Ten pakiet zawiera moduł jądra Linuksa.\
+\
+%if %{with kernel}\
+%files -n kernel%{_alt_kernel}-net-openvswitch\
+%defattr(644,root,root,755)\
+/etc/modprobe.d/%{_kernel_ver}/openvswitch.conf\
+%dir /lib/modules/%{_kernel_ver}/kernel/net/openvswitch\
+/lib/modules/%{_kernel_ver}/kernel/net/openvswitch/*.ko*\
+%endif\
+\
+%post -n kernel%{_alt_kernel}-net-openvswitch\
+%depmod %{_kernel_ver}\
+\
+%postun -n kernel%{_alt_kernel}-net-openvswitch\
+%depmod %{_kernel_ver}\
+%{nil}
+
+%define build_kernel_pkg()\
+%configure \\\
+ --with-linux=%{_kernelsrcdir} \\\
+ --with-linux-source=%{_kernelsrcdir}\
+\
+%{__make} clean\
+%{__make} -C datapath/linux %{?with_verbose:V=1}\
+%install_kernel_modules -D installed -s %{version} -n openvswitch -m datapath/linux/openvswitch,datapath/linux/vport-geneve,datapath/linux/vport-gre,datapath/linux/vport-lisp,datapath/linux/vport-stt,datapath/linux/vport-vxlan -d kernel/net/openvswitch\
+%{nil}
+
+%{?with_kernel:%{expand:%create_kernel_packages}}
%prep
-%setup -q
-%patch0 -p1
-%patch1 -p1
+%setup -q -n %{pname}-%{version}
cp %{SOURCE3} .
%build
-%{__aclocal} -I m4
-%{__automake}
-%{__autoconf}
-%configure \
-%if %{with kernel}
- --with-linux=%{_kernelsrcdir} \
- --with-linux-source=%{_kernelsrcdir}
-%endif
+%{?with_kernel:%{expand:%build_kernel_packages}}
+%if %{with userspace}
+%configure
+%{__make} clean
%{__make}
+%endif
%install
rm -rf $RPM_BUILD_ROOT
%if %{with userspace}
install -d $RPM_BUILD_ROOT{%{py_sitescriptdir},%{systemdunitdir},%{systemdtmpfilesdir}} \
$RPM_BUILD_ROOT{/etc/{sysconfig,rc.d/init.d,logrotate.d},/lib/rc-scripts} \
- $RPM_BUILD_ROOT%{_desktopdir}
+ $RPM_BUILD_ROOT%{_datadir}/%{pname}/pki
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
install -p %{SOURCE6} $RPM_BUILD_ROOT/etc/sysconfig/openvswitch
install -p %{SOURCE7} $RPM_BUILD_ROOT/etc/rc.d/init.d/openvswitch
install -p %{SOURCE10} $RPM_BUILD_ROOT%{systemdunitdir}/openvswitch.service
-install -p %{SOURCE11} $RPM_BUILD_ROOT%{_desktopdir}
%{__mv} $RPM_BUILD_ROOT%{_datadir}/%{pname}/python/{ovs,ovstest} $RPM_BUILD_ROOT%{py_sitescriptdir}
%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/%{pname}/python
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
+
%py_ocomp $RPM_BUILD_ROOT%{py_sitescriptdir}
%py_comp $RPM_BUILD_ROOT%{py_sitescriptdir}
%endif
%if %{with kernel}
-cd datapath/linux
-%install_kernel_modules -m brcompat_mod -d kernel/net/openvswitch
-%install_kernel_modules -m openvswitch_mod -d kernel/net/openvswitch
+cp -a installed/* $RPM_BUILD_ROOT
%endif
%clean
%post
/sbin/chkconfig --add openvswitch
-%service openvswitch restart
+%service -n openvswitch restart
+NORESTART=1
%systemd_post openvswitch.service
%preun
%postun
%systemd_reload
-%post -n kernel%{_alt_kernel}-net-openvswitch
-%depmod %{_kernel_ver}
-
-%postun -n kernel%{_alt_kernel}-net-openvswitch
-%depmod %{_kernel_ver}
-
%if %{with userspace}
%files
%defattr(644,root,root,755)
-%doc AUTHORS DESIGN INSTALL.KVM INSTALL.SSL INSTALL.bridge INSTALL.userspace NEWS README
-%doc REPORTING-BUGS WHY-OVS README.PLD
+%doc AUTHORS.rst CONTRIBUTING.rst MAINTAINERS.rst NEWS NOTICE README.rst
+%doc README.PLD
%attr(755,root,root) /lib/rc-scripts/ifdown-ovs
%attr(755,root,root) /lib/rc-scripts/ifup-ovs
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/openvswitch
%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/openvswitch
%attr(755,root,root) %{_bindir}/ovs-appctl
-%attr(755,root,root) %{_bindir}/ovs-benchmark
-%attr(755,root,root) %{_bindir}/ovs-controller
%attr(755,root,root) %{_bindir}/ovs-dpctl
+%attr(755,root,root) %{_bindir}/ovs-dpctl-top
+%attr(755,root,root) %{_bindir}/ovs-l3ping
%attr(755,root,root) %{_bindir}/ovs-ofctl
-%attr(755,root,root) %{_bindir}/ovs-parse-leaks
+%attr(755,root,root) %{_bindir}/ovs-parse-backtrace
%attr(755,root,root) %{_bindir}/ovs-pcap
%attr(755,root,root) %{_bindir}/ovs-pki
%attr(755,root,root) %{_bindir}/ovs-tcpundump
%attr(755,root,root) %{_bindir}/ovs-vsctl
%attr(755,root,root) %{_bindir}/ovsdb-client
%attr(755,root,root) %{_bindir}/ovsdb-tool
-%attr(755,root,root) %{_sbindir}/ovs-brcompatd
%attr(755,root,root) %{_sbindir}/ovs-bugtool
%attr(755,root,root) %{_sbindir}/ovs-vlan-bug-workaround
%attr(755,root,root) %{_sbindir}/ovs-vswitchd
%attr(755,root,root) %{_sbindir}/ovsdb-server
-%{_mandir}/man1/ovs-benchmark.1*
%{_mandir}/man1/ovs-pcap.1*
%{_mandir}/man1/ovs-tcpundump.1*
%{_mandir}/man1/ovsdb-client.1*
%{_mandir}/man1/ovsdb-tool.1*
%{_mandir}/man5/ovs-vswitchd.conf.db.5*
%{_mandir}/man8/ovs-appctl.8*
-%{_mandir}/man8/ovs-brcompatd.8*
%{_mandir}/man8/ovs-bugtool.8*
-%{_mandir}/man8/ovs-controller.8*
%{_mandir}/man8/ovs-ctl.8*
%{_mandir}/man8/ovs-dpctl.8*
+%{_mandir}/man8/ovs-dpctl-top.8*
+%{_mandir}/man8/ovs-l3ping.8*
%{_mandir}/man8/ovs-ofctl.8*
-%{_mandir}/man8/ovs-parse-leaks.8*
+%{_mandir}/man8/ovs-parse-backtrace.8*
%{_mandir}/man8/ovs-pki.8*
%{_mandir}/man8/ovs-vlan-bug-workaround.8*
%{_mandir}/man8/ovs-vlan-test.8*
%{_mandir}/man8/ovs-vsctl.8*
%{_mandir}/man8/ovs-vswitchd.8*
+%files devel
+%defattr(644,root,root,755)
+%{_includedir}/openflow
+%{_includedir}/openvswitch
+%{_includedir}/ovn
+%{_libdir}/libofproto.a
+%{_libdir}/libopenvswitch.a
+%{_libdir}/libovn.a
+%{_libdir}/libovsdb.a
+%{_libdir}/libsflow.a
+%{_libdir}/libvtep.a
+%{_pkgconfigdir}/libofproto.pc
+%{_pkgconfigdir}/libopenvswitch.pc
+%{_pkgconfigdir}/libovsdb.pc
+%{_pkgconfigdir}/libsflow.pc
+
%files -n python-openvswitch
%defattr(644,root,root,755)
%dir %{py_sitescriptdir}/ovs
%{py_sitescriptdir}/ovs/*.py*
%dir %{py_sitescriptdir}/ovs/db
%{py_sitescriptdir}/ovs/db/*.py*
-
-%files -n ovsdbmonitor
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/ovsdbmonitor
-%{_datadir}/ovsdbmonitor
-%{_desktopdir}/ovsdbmonitor.desktop
-%{_mandir}/man1/ovsdbmonitor.1*
+%dir %{py_sitescriptdir}/ovs/unixctl
+%{py_sitescriptdir}/ovs/unixctl/*.py*
%files test
%defattr(644,root,root,755)
%{py_sitescriptdir}/ovstest
%{_mandir}/man8/ovs-test.8*
%endif
-
-%if %{with kernel}
-%files -n kernel%{_alt_kernel}-net-openvswitch
-%defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}/kernel/net/openvswitch/*.ko*
-%endif
projects / packages / openvswitch.git / blobdiff