use quilt to handle patches

diff --git a/Makefile b/Makefile
index d8bd577e53f572e7082eb53fbecd88fe80477669..567a71892a6ba33b99ce094cf2b2254682bf1f14 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,8 @@ all: ${DEBS}
 ${DEBS}: ${OVSSRC}
        rm -rf ${OVSDIR}
        tar xf ${OVSSRC}
-       cd  ${OVSDIR}; patch -p1 <../remove-unneeded-from-control.patch
+       cd  ${OVSDIR}; ln -s ../pvepatches patches
+       cd  ${OVSDIR};  quilt push -a
        echo "git clone git://git.proxmox.com/git/openvswitch.git\\ngit checkout ${GITVERSION}" > ${OVSDIR}/debian/SOURCE
        echo "debian/SOURCE" >> ${OVSDIR}/debian/openvswitch-common.docs
        echo "debian/SOURCE" >> ${OVSDIR}/debian/openvswitch-switch.docs

diff --git a/pvepatches/fix-init-script-patch b/pvepatches/fix-init-script-patch
new file mode 100644 (file)
index 0000000..014896f
--- /dev/null
+++ b/pvepatches/fix-init-script-patch
@@ -0,0 +1,24 @@
+Index: new/debian/openvswitch-switch.init
+===================================================================
+--- new.orig/debian/openvswitch-switch.init    2013-12-18 07:59:19.000000000 +0100
++++ new/debian/openvswitch-switch.init 2013-12-18 09:16:04.138935573 +0100
+@@ -85,17 +85,14 @@
+ 
+         if [ -e /sys/module/openvswitch ]; then
+             LOADED_SRCVERSION=`cat /sys/module/openvswitch/srcversion`
+-            LOADED_VERSION=`cat /sys/module/openvswitch/version`
+         elif [ -e /sys/module/openvswitch_mod ]; then
+             LOADED_SRCVERSION=`cat /sys/module/openvswitch_mod/srcversion`
+-            LOADED_VERSION=`cat /sys/module/openvswitch_mod/version`
+         fi
+         SRCVERSION=`modinfo -F srcversion openvswitch 2>/dev/null`
+-        VERSION=`modinfo -F version openvswitch 2>/dev/null`
+ 
+         ovs_ctl_log "Package upgrading:\n"\
+-                    "Loaded version: ${LOADED_VERSION} ${LOADED_SRCVERSION}.\n"\
+-                    "Version on disk: ${VERSION} ${SRCVERSION}."
++                    "Loaded version: ${LOADED_SRCVERSION}.\n"\
++                    "Version on disk: ${SRCVERSION}."
+ 
+         # If the kernel module was previously loaded and it is different than
+         # the kernel module on disk, then do a 'force-reload-kmod'.

diff --git a/pvepatches/remove-unneeded-from-control.patch b/pvepatches/remove-unneeded-from-control.patch
new file mode 100644 (file)
index 0000000..3ad7bf2
--- /dev/null
+++ b/pvepatches/remove-unneeded-from-control.patch
@@ -0,0 +1,63 @@
+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 @@
+ 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
+ Standards-Version: 3.9.3
+ Homepage: http://openvswitch.org/
+ 
+@@ -29,22 +28,6 @@
+  from it using module-assistant or make-kpkg.  README.Debian in this
+  package provides further instructions.
+ 
+-Package: openvswitch-datapath-dkms
+-Architecture: all
+-Depends: dkms (>= 1.95), make, libc6-dev, ${misc:Depends}, ${python:Depends}
+-Description: Open vSwitch datapath module source - DKMS version
+- 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 provides the Open vSwitch datapath module source code
+- that is needed by openvswitch-switch.  DKMS can built the kernel
+- module from it.
+-
+ 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/series b/pvepatches/series
new file mode 100644 (file)
index 0000000..3871d47
--- /dev/null
+++ b/pvepatches/series
@@ -0,0 +1,2 @@
+remove-unneeded-from-control.patch
+fix-init-script-patch

diff --git a/remove-unneeded-from-control.patch b/remove-unneeded-from-control.patch
deleted file mode 100644 (file)
index 1c3c23e..0000000
--- a/remove-unneeded-from-control.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- new/debian/control.org     2013-12-18 07:35:33.078896314 +0100
-+++ new/debian/control 2013-12-18 07:49:35.738844600 +0100
-@@ -6,8 +6,7 @@
- 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
- Standards-Version: 3.9.3
- Homepage: http://openvswitch.org/
- 
-@@ -29,22 +28,6 @@
-  from it using module-assistant or make-kpkg.  README.Debian in this
-  package provides further instructions.
- 
--Package: openvswitch-datapath-dkms
--Architecture: all
--Depends: dkms (>= 1.95), make, libc6-dev, ${misc:Depends}, ${python:Depends}
--Description: Open vSwitch datapath module source - DKMS version
-- 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 provides the Open vSwitch datapath module source code
-- that is needed by openvswitch-switch.  DKMS can built the kernel
-- module from it.
--
- 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