[packages/openvswitch] - updated to 1.10.0 - brcompat has been removed - require running kernel > 3.3 - module has been ren
baggins
baggins at pld-linux.org
Thu Aug 22 20:22:58 CEST 2013
commit 84dc02235215f14912912c289d6df8552c8c3a25
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Thu Aug 22 20:22:00 2013 +0200
- updated to 1.10.0
- brcompat has been removed
- require running kernel > 3.3
- module has been renamed (openvswitch_mod -> openvswitch)
- removed outdated patches
fix-man-typo.patch | 11 +++++++
linux-3.3.patch | 32 -------------------
openvswitch.init | 3 +-
openvswitch.service | 1 -
openvswitch.spec | 28 +++++++++-------
openvswitch.sysconfig | 5 ++-
ovsdbmonitor-move-to-its-own-data-directory.patch | 39 -----------------------
7 files changed, 30 insertions(+), 89 deletions(-)
---
diff --git a/openvswitch.spec b/openvswitch.spec
index ee41af7..7b71cb3 100644
--- a/openvswitch.spec
+++ b/openvswitch.spec
@@ -23,17 +23,17 @@
%define _enable_debug_packages 0
%endif
-%define rel 4
+%define rel 1
%define pname openvswitch
Summary: Production Quality, Multilayer Open Virtual Switch
#Summary(pl.UTF-8): -
Name: %{pname}%{_alt_kernel}
-Version: 1.6.1
+Version: 1.10.0
Release: %{rel}
License: Apache v2.0
Group: Networking/Daemons
Source0: http://openvswitch.org/releases/%{pname}-%{version}.tar.gz
-# Source0-md5: 1e4c4ccf55096c8dbf5d35b9725447a3
+# Source0-md5: fe8b49efe9f86b57abab00166b971106
Source1: ifdown-ovs
Source2: ifup-ovs
Source3: README.PLD
@@ -45,8 +45,7 @@ Source7: %{pname}.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
+Patch0: fix-man-typo.patch
URL: http://openvswitch.org/
BuildRequires: Zope-Interface
BuildRequires: automake
@@ -65,6 +64,8 @@ BuildRequires: rpm-pythonprov
BuildRequires: rpmbuild(macros) >= 1.647
%if %{with kernel}
%{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build >= 3:2.6.20.2}
+%else
+Requires: uname(release) >= 3.3
%endif
Requires(post,preun): /sbin/chkconfig
Requires(post,preun,postun): systemd-units >= 38
@@ -144,7 +145,6 @@ Ten pakiet zawiera moduł jądra Linuksa.
%prep
%setup -q -n %{pname}-%{version}
%patch0 -p1
-%patch1 -p1
cp %{SOURCE3} .
%build
@@ -191,8 +191,7 @@ install -p %{SOURCE11} $RPM_BUILD_ROOT%{_desktopdir}
%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
+%install_kernel_modules -m openvswitch -d kernel/net/openvswitch
%endif
%clean
@@ -222,8 +221,9 @@ fi
%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 INSTALL INSTALL.KVM INSTALL.SSL INSTALL.Libvirt INSTALL.XenServer INSTALL.userspace
+%doc AUTHORS DESIGN NEWS README IntegrationGuide OPENFLOW-1.1+
+%doc REPORTING-BUGS WHY-OVS README.PLD FAQ
%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
@@ -243,7 +243,9 @@ fi
%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-l3ping
%attr(755,root,root) %{_bindir}/ovs-ofctl
+%attr(755,root,root) %{_bindir}/ovs-parse-backtrace
%attr(755,root,root) %{_bindir}/ovs-parse-leaks
%attr(755,root,root) %{_bindir}/ovs-pcap
%attr(755,root,root) %{_bindir}/ovs-pki
@@ -251,7 +253,6 @@ fi
%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
@@ -264,12 +265,13 @@ fi
%{_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-l3ping.8*
%{_mandir}/man8/ovs-ofctl.8*
+%{_mandir}/man8/ovs-parse-backtrace.8*
%{_mandir}/man8/ovs-parse-leaks.8*
%{_mandir}/man8/ovs-pki.8*
%{_mandir}/man8/ovs-vlan-bug-workaround.8*
@@ -283,6 +285,8 @@ fi
%{py_sitescriptdir}/ovs/*.py*
%dir %{py_sitescriptdir}/ovs/db
%{py_sitescriptdir}/ovs/db/*.py*
+%dir %{py_sitescriptdir}/ovs/unixctl
+%{py_sitescriptdir}/ovs/unixctl/*.py*
%files -n ovsdbmonitor
%defattr(644,root,root,755)
diff --git a/fix-man-typo.patch b/fix-man-typo.patch
new file mode 100644
index 0000000..dffaab7
--- /dev/null
+++ b/fix-man-typo.patch
@@ -0,0 +1,11 @@
+--- openvswitch-1.10.0/utilities/ovs-controller.8.in~ 2013-04-09 23:06:04.000000000 +0200
++++ openvswitch-1.10.0/utilities/ovs-controller.8.in 2013-08-22 20:14:21.272439899 +0200
+@@ -140,7 +140,7 @@
+ .so lib/vlog.man
+ .so lib/unixctl.man
+ .so lib/common.man
+-.so so lib/ofp-version.man
++.so lib/ofp-version.man
+ .
+ .SH EXAMPLES
+ .PP
diff --git a/linux-3.3.patch b/linux-3.3.patch
deleted file mode 100644
index a571387..0000000
--- a/linux-3.3.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- openvswitch-1.4.0/utilities/ovs-ctl.in~ 2012-01-31 08:08:18.000000000 +0100
-+++ openvswitch-1.4.0/utilities/ovs-ctl.in 2012-03-24 20:56:17.184407921 +0100
-@@ -33,9 +33,10 @@
- insert_openvswitch_mod_if_required () {
- # If openvswitch_mod is already loaded then we're done.
- test -e /sys/module/openvswitch_mod && return 0
-+ test -e /sys/module/openvswitch && return 0
-
- # Load openvswitch_mod. If that's successful then we're done.
-- action "Inserting openvswitch module" modprobe openvswitch_mod && return 0
-+ action "Inserting openvswitch module" modprobe openvswitch_mod || modprobe openvswitch && return 0
-
- # If the bridge module is loaded, then that might be blocking
- # openvswitch_mod. Try to unload it, if there are no bridges.
-@@ -48,15 +49,16 @@
- action "removing bridge module" rmmod bridge || return 1
-
- # Try loading openvswitch_mod again.
-- action "Inserting openvswitch module" modprobe openvswitch_mod
-+ action "Inserting openvswitch module" modprobe openvswitch_mod || modprobe openvswitch
- }
-
- insert_brcompat_mod_if_required () {
- if test -e /sys/module/bridge; then
- log_warning_msg "bridge module is loaded, not loading brcompat_mod"
- return 1
- fi
- test -e /sys/module/brcompat_mod && return 0
-+ test -e /sys/module/openvswitch && return 0
- action "Inserting brcompat module" modprobe brcompat_mod
- }
-
diff --git a/openvswitch.init b/openvswitch.init
index 2761df9..82d4915 100644
--- a/openvswitch.init
+++ b/openvswitch.init
@@ -8,7 +8,7 @@
### BEGIN INIT INFO
# Provides: openvswitch-switch
# Required-Start: $syslog
-# Required-Stop:
+# Required-Stop:
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# Short-Description: Open vSwitch switch
@@ -25,7 +25,6 @@
FORCE_COREFILES="yes"
OVSDB_SERVER_PRIORITY="-10"
VSWITCHD_PRIORITY="-10"
-BRCOMPATD_PRIORITY="-10"
VSWITCHD_MLOCKALL="yes"
[ -f /etc/sysconfig/openvswitch ] && . /etc/sysconfig/openvswitch
diff --git a/openvswitch.service b/openvswitch.service
index a137c18..7375d21 100644
--- a/openvswitch.service
+++ b/openvswitch.service
@@ -8,7 +8,6 @@ Type=forking
Environment=FORCE_COREFILES=yes
Environment=OVSDB_SERVER_PRIORITY=-10
Environment=VSWITCHD_PRIORITY=-10
-Environment=BRCOMPATD_PRIORITY=-10
Environment=VSWITCHD_MLOCKALL=yes
EnvironmentFile=-/etc/sysconfig/openvswitch
ExecStart=/usr/share/openvswitch/scripts/ovs-ctl start --system-id=random --force-corefiles=${FORCE_COREFILES} --ovsdb-server-priority=${OVSDB_SERVER_PRIORITY} --ovs-vswitchd-priority=${VSWITCHD_PRIORITY} --mlockall=${VSWITCHD_MLOCKALL} $OPENVSWITCH_OPTIONS
diff --git a/openvswitch.sysconfig b/openvswitch.sysconfig
index 715716c..156fe71 100644
--- a/openvswitch.sysconfig
+++ b/openvswitch.sysconfig
@@ -17,6 +17,5 @@
# concurrent VM import operations.
# VSWITCHD_MLOCKALL=yes
-# Other openvswitch options, --brcompat will enable bridge compatibility mode,
-# --ovs-brcompatd-priority is "nice" priority at which to run brcompatd
-# OPENVSWITCH_OPTIONS="--brcompat --ovs-brcompatd-priority=-10"
+# Other openvswitch options
+# OPENVSWITCH_OPTIONS=""
diff --git a/ovsdbmonitor-move-to-its-own-data-directory.patch b/ovsdbmonitor-move-to-its-own-data-directory.patch
deleted file mode 100644
index f1d67e8..0000000
--- a/ovsdbmonitor-move-to-its-own-data-directory.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 748dca871d1f8a06d33a1002e1dfabb74b16c9b6 Mon Sep 17 00:00:00 2001
-From: Chris Wright <chrisw at sous-sol.org>
-Date: Thu, 1 Mar 2012 15:25:14 -0800
-Subject: [PATCH] ovsdbmonitor: move to its own data directory
-
-It doesn't have dependencies on any packages that would install into
-pkgdatadir, and for Fedora it makes directory ownership work better.
-So move ovsdbmonitor python internals to its own data directory.
-
-Signed-off-by: Chris Wright <chrisw at sous-sol.org>
-Signed-off-by: Ben Pfaff <blp at nicira.com>
----
- debian/ovsdbmonitor.install | 2 +-
- ovsdb/ovsdbmonitor/automake.mk | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/debian/ovsdbmonitor.install b/debian/ovsdbmonitor.install
-index 4f19ecb..0572be4 100644
---- a/debian/ovsdbmonitor.install
-+++ b/debian/ovsdbmonitor.install
-@@ -1,2 +1,2 @@
- usr/bin/ovsdbmonitor
--usr/share/openvswitch/ovsdbmonitor
-+usr/share/ovsdbmonitor
-diff --git a/ovsdb/ovsdbmonitor/automake.mk b/ovsdb/ovsdbmonitor/automake.mk
-index 59d2e2c..ec63cc7 100644
---- a/ovsdb/ovsdbmonitor/automake.mk
-+++ b/ovsdb/ovsdbmonitor/automake.mk
-@@ -28,7 +28,7 @@ EXTRA_DIST += \
- ovsdb/ovsdbmonitor/ovsdbmonitor.in
- MAN_ROOTS += ovsdb/ovsdbmonitor/ovsdbmonitor.1
-
--ovsdbmonitordir = ${pkgdatadir}/ovsdbmonitor
-+ovsdbmonitordir = ${datadir}/ovsdbmonitor
- if BUILD_OVSDBMONITOR
- noinst_SCRIPTS += ovsdb/ovsdbmonitor/ovsdbmonitor
- ovsdbmonitor_DATA = $(ovsdbmonitor_pyfiles)
---
-1.7.7.4
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/openvswitch.git/commitdiff/84dc02235215f14912912c289d6df8552c8c3a25
More information about the pld-cvs-commit
mailing list