summaryrefslogtreecommitdiffstats
path: root/recipes-networking/openvswitch/files/python-switch-remaining-scripts-to-use-python3.patch
diff options
context:
space:
mode:
authorMark Asselstine <mark.asselstine@windriver.com>2018-09-04 16:12:39 -0400
committerBruce Ashfield <bruce.ashfield@windriver.com>2018-09-04 16:14:18 -0400
commite47cd6f12e91dfef4c874193b516869fbac4abda (patch)
tree7e8ea19a349b0a09120e4e8afbd591c0b988dca4 /recipes-networking/openvswitch/files/python-switch-remaining-scripts-to-use-python3.patch
parent5fe3950136d2db42c97cee245b88a893784ab4bc (diff)
downloadmeta-virtualization-e47cd6f12e91dfef4c874193b516869fbac4abda.tar.gz
openvswitch: uprev to v2.10.0
The current version (v2.9.3) started to fail to build due to changes in openssl. Upstream must have run into similar issues as this was identified and addressed in v2.10.0 by including a copy of 'dhparams.c' instead of relying on it being generated. (see commit "dhparams: Add pregenerated .c file to the repository.") Additionally v2.10.0 is better aligned for our kernel and dpdk versions: kernel === 2.10.x 3.10 to 4.17 dpdk === 2.10.x 17.11.3 The changes in this commit allow for the building of v2.10.0. A second commit will be necessary to deal with a few runtime changes which prevent ovsdb-server from starting correctly. Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'recipes-networking/openvswitch/files/python-switch-remaining-scripts-to-use-python3.patch')
-rw-r--r--recipes-networking/openvswitch/files/python-switch-remaining-scripts-to-use-python3.patch12
1 files changed, 6 insertions, 6 deletions
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 540bda6d..64e0e3f4 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
@@ -1,4 +1,4 @@
1From 39d1af836d844c89e625cfc908545e93977af8be Mon Sep 17 00:00:00 2001 1From 098d3927e928362f0ac60ea97e9c39b73871be21 Mon Sep 17 00:00:00 2001
2From: Mark Asselstine <mark.asselstine@windriver.com> 2From: Mark Asselstine <mark.asselstine@windriver.com>
3Date: Wed, 3 May 2017 10:39:12 -0400 3Date: Wed, 3 May 2017 10:39:12 -0400
4Subject: [PATCH] python: switch remaining scripts to use python3 4Subject: [PATCH] python: switch remaining scripts to use python3
@@ -39,15 +39,15 @@ index d7854a1..f09defb 100755
39 # 39 #
40 # Licensed under the Apache License, Version 2.0 (the "License"); 40 # Licensed under the Apache License, Version 2.0 (the "License");
41diff --git a/utilities/checkpatch.py b/utilities/checkpatch.py 41diff --git a/utilities/checkpatch.py b/utilities/checkpatch.py
42index 26eb5c3..2e1932b 100755 42index f929714..e17a1cf 100755
43--- a/utilities/checkpatch.py 43--- a/utilities/checkpatch.py
44+++ b/utilities/checkpatch.py 44+++ b/utilities/checkpatch.py
45@@ -1,4 +1,4 @@ 45@@ -1,4 +1,4 @@
46-#!/usr/bin/env python 46-#!/usr/bin/env python
47+#!/usr/bin/env python3 47+#!/usr/bin/env python3
48 # Copyright (c) 2016, 2017 Red Hat, Inc. 48 # Copyright (c) 2016, 2017 Red Hat, Inc.
49 # Copyright (c) 2018 Nicira, Inc.
49 # 50 #
50 # Licensed under the Apache License, Version 2.0 (the "License");
51diff --git a/utilities/ovs-dev.py b/utilities/ovs-dev.py 51diff --git a/utilities/ovs-dev.py b/utilities/ovs-dev.py
52index 9ce0f04..839e13e 100755 52index 9ce0f04..839e13e 100755
53--- a/utilities/ovs-dev.py 53--- a/utilities/ovs-dev.py
@@ -59,7 +59,7 @@ index 9ce0f04..839e13e 100755
59 # 59 #
60 # Licensed under the Apache License, Version 2.0 (the "License"); 60 # Licensed under the Apache License, Version 2.0 (the "License");
61diff --git a/utilities/ovs-pipegen.py b/utilities/ovs-pipegen.py 61diff --git a/utilities/ovs-pipegen.py b/utilities/ovs-pipegen.py
62index 4bf240f..2a8f13e 100755 62index ee57972..e9b99f5 100755
63--- a/utilities/ovs-pipegen.py 63--- a/utilities/ovs-pipegen.py
64+++ b/utilities/ovs-pipegen.py 64+++ b/utilities/ovs-pipegen.py
65@@ -1,4 +1,4 @@ 65@@ -1,4 +1,4 @@
@@ -79,7 +79,7 @@ index e7404e3..5edad76 100755
79 # xapi plugin script to update the cache of configuration items in the 79 # xapi plugin script to update the cache of configuration items in the
80 # ovs-vswitchd configuration that are managed in the xapi database when 80 # ovs-vswitchd configuration that are managed in the xapi database when
81diff --git a/xenserver/opt_xensource_libexec_interface-reconfigure b/xenserver/opt_xensource_libexec_interface-reconfigure 81diff --git a/xenserver/opt_xensource_libexec_interface-reconfigure b/xenserver/opt_xensource_libexec_interface-reconfigure
82index ea4a742..c6745ee 100755 82index a82043f..9c20725 100755
83--- a/xenserver/opt_xensource_libexec_interface-reconfigure 83--- a/xenserver/opt_xensource_libexec_interface-reconfigure
84+++ b/xenserver/opt_xensource_libexec_interface-reconfigure 84+++ b/xenserver/opt_xensource_libexec_interface-reconfigure
85@@ -1,4 +1,4 @@ 85@@ -1,4 +1,4 @@
@@ -89,7 +89,7 @@ index ea4a742..c6745ee 100755
89 # Copyright (c) 2008,2009 Citrix Systems, Inc. 89 # Copyright (c) 2008,2009 Citrix Systems, Inc.
90 # 90 #
91diff --git a/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync b/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync 91diff --git a/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync b/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync
92index a776c00..d5ff8af 100755 92index ecd6f6d..b8f2a42 100755
93--- a/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync 93--- a/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync
94+++ b/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync 94+++ b/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync
95@@ -1,4 +1,4 @@ 95@@ -1,4 +1,4 @@