diff options
author | Mark Asselstine <mark.asselstine@windriver.com> | 2017-06-20 16:25:54 -0400 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2017-06-21 14:25:14 -0400 |
commit | e86ae39489f1c17405d557f9204747594af29e6a (patch) | |
tree | 19896072691430242d237adbb7cf64bdeff5cbd1 /recipes-networking/openvswitch/files/python-make-remaining-scripts-use-usr-bin-env.patch | |
parent | b263370eebd1df8befb9533da53c5ff8439607cc (diff) | |
download | meta-virtualization-e86ae39489f1c17405d557f9204747594af29e6a.tar.gz |
openvswitch: switch to depending on python3
As far as I can tell openvswitch has been updated to work with python3
as well as with python(2). Switch to depend on python3 and use python3
for associated scripts. For the most part openvswitch will bind at
runtime to either py2 or py3 regardless of these changes, with these
changes we just do a better job of setting up the dependencies to
facilitate py3 bindings. The openvswitch autotests results are mostly
identical before and after this switch (failures move from python3 to
python(2) test cases as expected, with some exceptions see below).
When running the autotests/ptest with python(2) vs python3 we see a
slightly higher failure rate (334 failures vs. 284 failures). I do not
believe this higher fail rate reflects actual errors in the runtime,
rather the tests are not adapted to python3. At any rate like the rest
of openvswitch it is fairly straightforward to hack the logic for
autotests to be run using py2 as long as it is available in the image,
so these changes don't prevent falling back to py2 for autotests. This
should facilitate any debugging we need to do based on us switching to
favor py3.
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-make-remaining-scripts-use-usr-bin-env.patch')
-rw-r--r-- | recipes-networking/openvswitch/files/python-make-remaining-scripts-use-usr-bin-env.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/recipes-networking/openvswitch/files/python-make-remaining-scripts-use-usr-bin-env.patch b/recipes-networking/openvswitch/files/python-make-remaining-scripts-use-usr-bin-env.patch index 68f46ff5..4441c1ea 100644 --- a/recipes-networking/openvswitch/files/python-make-remaining-scripts-use-usr-bin-env.patch +++ b/recipes-networking/openvswitch/files/python-make-remaining-scripts-use-usr-bin-env.patch | |||
@@ -33,7 +33,7 @@ index f79f235..c7b8730 100755 | |||
33 | +++ b/build-aux/check-structs | 33 | +++ b/build-aux/check-structs |
34 | @@ -1,4 +1,4 @@ | 34 | @@ -1,4 +1,4 @@ |
35 | -#! /usr/bin/python | 35 | -#! /usr/bin/python |
36 | +#! /usr/bin/env python | 36 | +#! /usr/bin/env python3 |
37 | 37 | ||
38 | import os.path | 38 | import os.path |
39 | import sys | 39 | import sys |
@@ -43,7 +43,7 @@ index 184447b..92ea18d 100755 | |||
43 | +++ b/build-aux/extract-ofp-actions | 43 | +++ b/build-aux/extract-ofp-actions |
44 | @@ -1,4 +1,4 @@ | 44 | @@ -1,4 +1,4 @@ |
45 | -#! /usr/bin/python | 45 | -#! /usr/bin/python |
46 | +#! /usr/bin/env python | 46 | +#! /usr/bin/env python3 |
47 | 47 | ||
48 | import sys | 48 | import sys |
49 | import os.path | 49 | import os.path |
@@ -53,7 +53,7 @@ index 9642593..11e6de7 100755 | |||
53 | +++ b/build-aux/extract-ofp-errors | 53 | +++ b/build-aux/extract-ofp-errors |
54 | @@ -1,4 +1,4 @@ | 54 | @@ -1,4 +1,4 @@ |
55 | -#! /usr/bin/python | 55 | -#! /usr/bin/python |
56 | +#! /usr/bin/env python | 56 | +#! /usr/bin/env python3 |
57 | 57 | ||
58 | import sys | 58 | import sys |
59 | import os.path | 59 | import os.path |
@@ -63,7 +63,7 @@ index 498b887..5d6bcec 100755 | |||
63 | +++ b/build-aux/extract-ofp-fields | 63 | +++ b/build-aux/extract-ofp-fields |
64 | @@ -1,4 +1,4 @@ | 64 | @@ -1,4 +1,4 @@ |
65 | -#! /usr/bin/python | 65 | -#! /usr/bin/python |
66 | +#! /usr/bin/env python | 66 | +#! /usr/bin/env python3 |
67 | 67 | ||
68 | import getopt | 68 | import getopt |
69 | import sys | 69 | import sys |
@@ -73,7 +73,7 @@ index 1813638..e9e3c25 100755 | |||
73 | +++ b/build-aux/extract-ofp-msgs | 73 | +++ b/build-aux/extract-ofp-msgs |
74 | @@ -1,4 +1,4 @@ | 74 | @@ -1,4 +1,4 @@ |
75 | -#! /usr/bin/python | 75 | -#! /usr/bin/python |
76 | +#! /usr/bin/env python | 76 | +#! /usr/bin/env python3 |
77 | 77 | ||
78 | import sys | 78 | import sys |
79 | import os.path | 79 | import os.path |
@@ -83,7 +83,7 @@ index bd4e879..9d81503 100755 | |||
83 | +++ b/build-aux/xml2nroff | 83 | +++ b/build-aux/xml2nroff |
84 | @@ -1,4 +1,4 @@ | 84 | @@ -1,4 +1,4 @@ |
85 | -#! /usr/bin/python | 85 | -#! /usr/bin/python |
86 | +#! /usr/bin/env python | 86 | +#! /usr/bin/env python3 |
87 | 87 | ||
88 | # Copyright (c) 2010, 2011, 2012, 2013, 2014, 2015, 2016 Nicira, Inc. | 88 | # Copyright (c) 2010, 2011, 2012, 2013, 2014, 2015, 2016 Nicira, Inc. |
89 | # | 89 | # |
@@ -93,7 +93,7 @@ index 52de3db..c90f02b 100755 | |||
93 | +++ b/ovn/utilities/ovn-docker-overlay-driver | 93 | +++ b/ovn/utilities/ovn-docker-overlay-driver |
94 | @@ -1,4 +1,4 @@ | 94 | @@ -1,4 +1,4 @@ |
95 | -#! /usr/bin/python | 95 | -#! /usr/bin/python |
96 | +#! /usr/bin/env python | 96 | +#! /usr/bin/env python3 |
97 | # Copyright (C) 2015 Nicira, Inc. | 97 | # Copyright (C) 2015 Nicira, Inc. |
98 | # | 98 | # |
99 | # Licensed under the Apache License, Version 2.0 (the "License"); | 99 | # Licensed under the Apache License, Version 2.0 (the "License"); |
@@ -103,7 +103,7 @@ index 2c9c4b6..89b804c 100755 | |||
103 | +++ b/ovn/utilities/ovn-docker-underlay-driver | 103 | +++ b/ovn/utilities/ovn-docker-underlay-driver |
104 | @@ -1,4 +1,4 @@ | 104 | @@ -1,4 +1,4 @@ |
105 | -#! /usr/bin/python | 105 | -#! /usr/bin/python |
106 | +#! /usr/bin/env python | 106 | +#! /usr/bin/env python3 |
107 | # Copyright (C) 2015 Nicira, Inc. | 107 | # Copyright (C) 2015 Nicira, Inc. |
108 | # | 108 | # |
109 | # Licensed under the Apache License, Version 2.0 (the "License"); | 109 | # Licensed under the Apache License, Version 2.0 (the "License"); |
@@ -113,7 +113,7 @@ index 5cf26ee..f76f4bd 100755 | |||
113 | +++ b/ovsdb/ovsdb-doc | 113 | +++ b/ovsdb/ovsdb-doc |
114 | @@ -1,4 +1,4 @@ | 114 | @@ -1,4 +1,4 @@ |
115 | -#! /usr/bin/python | 115 | -#! /usr/bin/python |
116 | +#! /usr/bin/env python | 116 | +#! /usr/bin/env python3 |
117 | 117 | ||
118 | # Copyright (c) 2010, 2011, 2012, 2013, 2014, 2015 Nicira, Inc. | 118 | # Copyright (c) 2010, 2011, 2012, 2013, 2014, 2015 Nicira, Inc. |
119 | # | 119 | # |