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 -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