From 1fd1ff3720140baa3680d795f6d97597e5113e90 Mon Sep 17 00:00:00 2001 From: Mark Asselstine Date: Wed, 30 May 2018 11:47:10 -0400 Subject: openvswitch: uprev to v2.9.2 This brings us up to date with the latest upstream release. I suspect there will be an upcoming release to add compatibility with DPDK v18.05 (the DPDK release is due out any day now) but getting this fairly large release bump out of the way first will facilitate any upcoming uprev. We are able to drop they python3 patches as they have been merged upstream. Some scripts which needed to be updated to use python3 disappeared, new ones appeared so the 'use python3' patches are updated accordingly. Beyond this the biggest change is related to the systemd unit files, the ovsdb-server has been updated upstream to be generated on the fly via the spec file, we mimic this in the install_prepend. We also add the various configuration files which the unit files source before launching the services. As usual this was tested against out typical usecases including usage in meta-overc. As well the ptests have been run and the results are no better or worse. Previous version: ERROR: 2332 tests were run, 21 failed unexpectedly. 3 tests were skipped. New version: ERROR: 2527 tests were run, 29 failed unexpectedly. 3 tests were skipped. Signed-off-by: Mark Asselstine Signed-off-by: Bruce Ashfield --- .../python-switch-remaining-scripts-to-use-python3.patch | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'recipes-networking/openvswitch/files/python-switch-remaining-scripts-to-use-python3.patch') diff --git a/recipes-networking/openvswitch/files/python-switch-remaining-scripts-to-use-python3.patch b/recipes-networking/openvswitch/files/python-switch-remaining-scripts-to-use-python3.patch index 6a1b8320..540bda6d 100644 --- a/recipes-networking/openvswitch/files/python-switch-remaining-scripts-to-use-python3.patch +++ b/recipes-networking/openvswitch/files/python-switch-remaining-scripts-to-use-python3.patch @@ -13,11 +13,10 @@ Signed-off-by: Mark Asselstine utilities/checkpatch.py | 2 +- utilities/ovs-dev.py | 2 +- utilities/ovs-pipegen.py | 2 +- - vtep/ovs-vtep | 2 +- xenserver/etc_xapi.d_plugins_openvswitch-cfg-update | 2 +- xenserver/opt_xensource_libexec_interface-reconfigure | 2 +- xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync | 2 +- - 9 files changed, 9 insertions(+), 9 deletions(-) + 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ofproto/ipfix-gen-entities b/ofproto/ipfix-gen-entities index 0be7199..d2cce42 100755 @@ -46,7 +45,7 @@ index 26eb5c3..2e1932b 100755 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - # Copyright (c) 2016 Red Hat, Inc. + # Copyright (c) 2016, 2017 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/utilities/ovs-dev.py b/utilities/ovs-dev.py @@ -69,16 +68,6 @@ index 4bf240f..2a8f13e 100755 # Copyright (c) 2013, 2014, 2015 Nicira, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); -diff --git a/vtep/ovs-vtep b/vtep/ovs-vtep -index fd652d4..19d63f9 100755 ---- a/vtep/ovs-vtep -+++ b/vtep/ovs-vtep -@@ -1,4 +1,4 @@ --#! /usr/bin/env python -+#! /usr/bin/env python3 - # Copyright (C) 2013 Nicira, Inc. All Rights Reserved. - # - # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update b/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update index e7404e3..5edad76 100755 --- a/xenserver/etc_xapi.d_plugins_openvswitch-cfg-update -- cgit v1.2.3-54-g00ecf