[pve-devel] [PATCH] bump to 2.3.0
Alexandre Derumier
aderumier at odiso.com
Wed Sep 17 12:19:10 CEST 2014
Signed-off-by: Alexandre Derumier <aderumier at odiso.com>
---
Makefile | 11 +++----
changelog.Debian | 6 ++++
pvepatches/remove-unneeded-from-control.patch | 42 +++++--------------------
pvepatches/use-log-cons-for-syslog.patch | 37 +++++++++++++---------
4 files changed, 41 insertions(+), 55 deletions(-)
diff --git a/Makefile b/Makefile
index 82df271..5a6c294 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
-RELEASE=3.2
+RELEASE=3.3
# also add entry in changelog.Debian
-OVSVER=2.0.90
-PKGRELEASE=4
+OVSVER=2.3.0
+PKGRELEASE=1
OVSDIR=openvswitch-${OVSVER}
OVSSRC=openvswitch-${OVSVER}.tar.gz
@@ -33,10 +33,7 @@ ${DEBS}: ${OVSSRC}
.PHONY: download
${OVSSRC} download:
rm -rf ${OVSDIR} ${OVSSRC}
- git clone git://git.openvswitch.org/openvswitch ${OVSDIR}
- rm -rf ${OVSDIR}/.git
- tar czf ${OVSSRC}.tmp ${OVSDIR}
- mv ${OVSSRC}.tmp ${OVSSRC}
+ wget http://openvswitch.org/releases/${OVSSRC}
.PHONY: upload
upload: ${DEBS}
diff --git a/changelog.Debian b/changelog.Debian
index ddb42ce..2b52ca3 100644
--- a/changelog.Debian
+++ b/changelog.Debian
@@ -1,3 +1,9 @@
+openvswitch (2.3.0) unstable; urgency=low
+
+ * Bump to 2.3.0
+
+ -- Proxmox Support Team <support at proxmox.com> Wed, 15 Sep 2014 18:55:00 +0200
+
openvswitch (2.0.90-4) unstable; urgency=low
* fix bug #528: start after $local_fs
diff --git a/pvepatches/remove-unneeded-from-control.patch b/pvepatches/remove-unneeded-from-control.patch
index 3ad7bf2..8083597 100644
--- a/pvepatches/remove-unneeded-from-control.patch
+++ b/pvepatches/remove-unneeded-from-control.patch
@@ -1,18 +1,18 @@
-Index: new/debian/control
-===================================================================
---- new.orig/debian/control 2013-12-18 07:59:19.000000000 +0100
-+++ new/debian/control 2013-12-18 09:13:33.433526213 +0100
-@@ -6,8 +6,7 @@
+diff --git a/debian/control b/debian/control
+index af4af4e..d75c863 100644
+--- a/debian/control
++++ b/debian/control
+@@ -6,8 +6,7 @@ Uploaders: Ben Pfaff <pfaffben at debian.org>, Simon Horman <horms at debian.org>
Build-Depends:
debhelper (>= 8), autoconf (>= 2.64), automake (>= 1.10) | automake1.10,
libssl-dev, bzip2, openssl, graphviz,
- python-all (>= 2.6.6-3~), procps, python-qt4,
-- python-zopeinterface, python-twisted-conch
-+ python-all (>= 2.6.6-3~), procps
+- python-zopeinterface, python-twisted-conch, libtool
++ python-all (>= 2.6.6-3~), procps, libtool
Standards-Version: 3.9.3
Homepage: http://openvswitch.org/
-@@ -29,22 +28,6 @@
+@@ -29,22 +28,6 @@ Description: Open vSwitch datapath module source - module-assistant version
from it using module-assistant or make-kpkg. README.Debian in this
package provides further instructions.
@@ -35,29 +35,3 @@ Index: new/debian/control
Package: openvswitch-common
Architecture: linux-any
Depends:
-@@ -152,25 +135,6 @@
- .
- This package contains the full Python bindings for Open vSwitch database.
-
--Package: ovsdbmonitor
--Architecture: all
--Section: utils
--Depends: ${python:Depends}, python-openvswitch, ${misc:Depends}
--Description: Open vSwitch graphical monitoring tool
-- Open vSwitch is a production quality, multilayer, software-based,
-- Ethernet virtual switch. It is designed to enable massive network
-- automation through programmatic extension, while still supporting
-- standard management interfaces and protocols (e.g. NetFlow, IPFIX,
-- sFlow, SPAN, RSPAN, CLI, LACP, 802.1ag). In addition, it is designed
-- to support distribution across multiple physical servers similar to
-- VMware's vNetwork distributed vswitch or Cisco's Nexus 1000V.
-- .
-- This package is 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: openvswitch-test
- Architecture: all
- Depends: ${misc:Depends}, ${python:Depends}, python-twisted-web, python (>= 2.7) | python-argparse
diff --git a/pvepatches/use-log-cons-for-syslog.patch b/pvepatches/use-log-cons-for-syslog.patch
index 48287de..1b34695 100644
--- a/pvepatches/use-log-cons-for-syslog.patch
+++ b/pvepatches/use-log-cons-for-syslog.patch
@@ -1,20 +1,29 @@
-use LOG_CONS for syslog
+From 46bc0dbeeb454966029151b00fbe2c64f57e448e Mon Sep 17 00:00:00 2001
+From: Alexandre Derumier <aderumier at odiso.com>
+Date: Mon, 15 Sep 2014 18:23:03 +0200
+Subject: [PATCH] use LOG_CONS for syslog
We start vswitch deamon early in runlevel S when syslog service is not
available. So we log to console if syslog fails.
---
+Signed-off-by: Alexandre Derumier <aderumier at odiso.com>
+---
+ lib/vlog.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
-Index: new/lib/vlog.c
-===================================================================
---- new.orig/lib/vlog.c 2013-12-18 07:59:19.000000000 +0100
-+++ new/lib/vlog.c 2013-12-21 06:12:18.760775259 +0100
-@@ -604,7 +604,7 @@
- * private copy to suppress memory leak warnings in case openlog() does
- * make its own copy.) */
- program_name_copy = program_name ? xstrdup(program_name) : NULL;
-- openlog(program_name_copy, LOG_NDELAY, LOG_DAEMON);
-+ openlog(program_name_copy, LOG_NDELAY|LOG_CONS, LOG_DAEMON);
+diff --git a/lib/vlog.c b/lib/vlog.c
+index 42e4869..5bc5282 100644
+--- a/lib/vlog.c
++++ b/lib/vlog.c
+@@ -613,7 +613,7 @@ vlog_init(void)
+ * a pointer to the private copy to suppress memory leak warnings in
+ * case openlog() does make its own copy.) */
+ program_name_copy = program_name ? xstrdup(program_name) : NULL;
+- openlog(program_name_copy, LOG_NDELAY, LOG_DAEMON);
++ openlog(program_name_copy, LOG_NDELAY|LOG_CONS, LOG_DAEMON);
+ ovsthread_once_done(&once);
- now = time_wall_msec();
- if (now < 0) {
+ /* Now do anything that we want to happen only once but doesn't have to
+--
+1.7.10.4
+
--
1.7.10.4
More information about the pve-devel
mailing list