From e007da2fb925fbacdd5b4f2dbc89875d82600e1b Mon Sep 17 00:00:00 2001
From: James Page <james.page@ubuntu.com>
Date: Fri, 6 Sep 2019 10:55:07 +0100
Subject: [PATCH] Align ovs version with Stein UCA

Bump ovs to 2.11.1 to ensure alignment with Stein Cloud Archive.

This also means that the patches for OVS can be dropped as the
change was included in the 2.11.1 release.

Change-Id: I9896f1dbd80a2344565a752d6c697f0a3219c210
---
 ...-kmod-ctl-source-ovs-lib-dynamically.patch | 31 -------------------
 snapcraft.yaml                                | 15 +--------
 2 files changed, 1 insertion(+), 45 deletions(-)
 delete mode 100644 patches/openvswitch/0001-ovs-kmod-ctl-source-ovs-lib-dynamically.patch

diff --git a/patches/openvswitch/0001-ovs-kmod-ctl-source-ovs-lib-dynamically.patch b/patches/openvswitch/0001-ovs-kmod-ctl-source-ovs-lib-dynamically.patch
deleted file mode 100644
index d94a207..0000000
--- a/patches/openvswitch/0001-ovs-kmod-ctl-source-ovs-lib-dynamically.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From fdf38dcad424c00d39b5c128ddb06b93606a639b Mon Sep 17 00:00:00 2001
-From: James Page <james.page@ubuntu.com>
-Date: Wed, 19 Sep 2018 09:13:48 +0200
-Subject: [PATCH] ovs-kmod-ctl: source ovs-lib dynamically
-
-Determine installation location of ovs-lib using runtime location
-of script, rather than build-time parameters.
----
- utilities/ovs-kmod-ctl.in | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/utilities/ovs-kmod-ctl.in b/utilities/ovs-kmod-ctl.in
-index 13ccfcf73..19f100964 100644
---- a/utilities/ovs-kmod-ctl.in
-+++ b/utilities/ovs-kmod-ctl.in
-@@ -14,7 +14,11 @@
- # See the License for the specific language governing permissions and
- # limitations under the License.
- 
--. "@pkgdatadir@/scripts/ovs-lib" || exit 1
-+case $0 in
-+    */*) dir0=`echo "$0" | sed 's,/[^/]*$,,'` ;;
-+    *) dir0=./ ;;
-+esac
-+. "$dir0/ovs-lib" || exit 1
- 
- for dir in "$sbindir" "$bindir" /sbin /bin /usr/sbin /usr/bin; do
-     case :$PATH: in
--- 
-2.17.1
-
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 36455e7..47583a5 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -485,8 +485,7 @@ parts:
       - -*
 
   openvswitch:
-    # TODO: figure out a better way to fetch the version
-    source: http://openvswitch.org/releases/openvswitch-2.10.2.tar.gz
+    source: http://openvswitch.org/releases/openvswitch-2.11.1.tar.gz
     plugin: autotools
     build-packages:
       - libssl-dev
@@ -505,18 +504,6 @@ parts:
       - "--sysconfdir=/var/snap/$SNAPCRAFT_PROJECT_NAME/etc"
     after:
       - patches
-    override-build: |
-      # Apply patches
-      for patch in ${SNAPCRAFT_STAGE}/patches/openvswitch/*.patch; do
-        echo "Applying $(basename "$patch") ..."
-        patch \
-          --batch \
-          --forward \
-          --strip 1 \
-          --input "$patch"
-        echo
-      done
-      snapcraftctl build
 
   ovs-wrapper:
     source: ./snap-wrappers/ovs