diff options
| author | Hongzhi.Song <hongzhi.song@windriver.com> | 2019-01-30 02:46:52 -0500 |
|---|---|---|
| committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2019-02-03 03:49:55 +0000 |
| commit | f9acf9a26617fe3eb4aac5d648f488ad0023a6ff (patch) | |
| tree | 5f87f6b50a0edfb7a52b8f3a3a9a9ef1a1f46166 /recipes-networking/openvswitch/files/python-make-remaining-scripts-use-usr-bin-env.patch | |
| parent | 274a72a5dba083f1f09ffedf19ac6e7838e20a41 (diff) | |
| download | meta-virtualization-f9acf9a26617fe3eb4aac5d648f488ad0023a6ff.tar.gz | |
openvswitch: uprev from v2.10.1 to v2.11
The v2.11 version fixed a bug as follow.
Error info:
ovs|00002|db_ctl_base|ERR|external-ids:hostname=: argument does not
end in "=" followed by a value.
The result of ptest between v2.11 and v2.10.1 is similar.
v2.11:
ERROR: 2765 tests were run,
317 failed (1 expected failure).
85 tests were skipped.
v2.10.1:
ERROR: 2662 tests were run,
311 failed (1 expected failure).
85 tests were skipped.
I checked the detailed result. The failed tests were mostly related
to python2 as the image only use python3.
Signed-off-by: Hongzhi.Song <hongzhi.song@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.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 | 33 |
1 files changed, 17 insertions, 16 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 0dc6b11b..53e3103a 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 | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | From a0a2d829642e916bd5d1c498a3e6f3641ed717a0 Mon Sep 17 00:00:00 2001 | 1 | From a348e0162343f7d46443eb1fd2bcf0698460a780 Mon Sep 17 00:00:00 2001 |
| 2 | From: Mark Asselstine <mark.asselstine@windriver.com> | 2 | From: "Hongzhi.Song" <hongzhi.song@windriver.com> |
| 3 | Date: Fri, 13 Jan 2017 16:12:55 -0500 | 3 | Date: Wed, 23 Jan 2019 04:28:28 -0500 |
| 4 | Subject: [PATCH] python: make remaining scripts use /usr/bin/env | 4 | Subject: [PATCH] python: make remaining scripts use /usr/bin/env |
| 5 | 5 | ||
| 6 | Unfortunately there is no concept of a host python vs. target python | 6 | Unfortunately there is no concept of a host python vs. target python |
| @@ -12,6 +12,7 @@ PYTHON. To make this function smoothly all installed scripts should | |||
| 12 | make use of /usr/bin/env to increase the chances of finding python. | 12 | make use of /usr/bin/env to increase the chances of finding python. |
| 13 | 13 | ||
| 14 | Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> | 14 | Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> |
| 15 | Signed-off-by: Hongzhi.Song <hongzhi.song@windriver.com> | ||
| 15 | --- | 16 | --- |
| 16 | build-aux/check-structs | 2 +- | 17 | build-aux/check-structs | 2 +- |
| 17 | build-aux/dpdkstrip.py | 2 +- | 18 | build-aux/dpdkstrip.py | 2 +- |
| @@ -68,17 +69,17 @@ index 48c7f06..b8b8ba9 100755 | |||
| 68 | # | 69 | # |
| 69 | # Licensed under the Apache License, Version 2.0 (the "License"); | 70 | # Licensed under the Apache License, Version 2.0 (the "License"); |
| 70 | diff --git a/build-aux/extract-ofp-actions b/build-aux/extract-ofp-actions | 71 | diff --git a/build-aux/extract-ofp-actions b/build-aux/extract-ofp-actions |
| 71 | index bd7131f..4d05ef9 100755 | 72 | index 64de0f3..f6bca0b 100755 |
| 72 | --- a/build-aux/extract-ofp-actions | 73 | --- a/build-aux/extract-ofp-actions |
| 73 | +++ b/build-aux/extract-ofp-actions | 74 | +++ b/build-aux/extract-ofp-actions |
| 74 | @@ -1,4 +1,4 @@ | 75 | @@ -1,4 +1,4 @@ |
| 75 | -#! /usr/bin/python | 76 | -#! /usr/bin/python |
| 76 | +#! /usr/bin/env python3 | 77 | +#! /usr/bin/env python3 |
| 77 | 78 | ||
| 79 | import getopt | ||
| 78 | import sys | 80 | import sys |
| 79 | import os.path | ||
| 80 | diff --git a/build-aux/extract-ofp-errors b/build-aux/extract-ofp-errors | 81 | diff --git a/build-aux/extract-ofp-errors b/build-aux/extract-ofp-errors |
| 81 | index 71ae0bd..58ba006 100755 | 82 | index 6f64efd..c410fd4 100755 |
| 82 | --- a/build-aux/extract-ofp-errors | 83 | --- a/build-aux/extract-ofp-errors |
| 83 | +++ b/build-aux/extract-ofp-errors | 84 | +++ b/build-aux/extract-ofp-errors |
| 84 | @@ -1,4 +1,4 @@ | 85 | @@ -1,4 +1,4 @@ |
| @@ -88,7 +89,7 @@ index 71ae0bd..58ba006 100755 | |||
| 88 | import sys | 89 | import sys |
| 89 | import os.path | 90 | import os.path |
| 90 | diff --git a/build-aux/extract-ofp-fields b/build-aux/extract-ofp-fields | 91 | diff --git a/build-aux/extract-ofp-fields b/build-aux/extract-ofp-fields |
| 91 | index 184b75e..cf339f8 100755 | 92 | index 3592594..2fc8317 100755 |
| 92 | --- a/build-aux/extract-ofp-fields | 93 | --- a/build-aux/extract-ofp-fields |
| 93 | +++ b/build-aux/extract-ofp-fields | 94 | +++ b/build-aux/extract-ofp-fields |
| 94 | @@ -1,4 +1,4 @@ | 95 | @@ -1,4 +1,4 @@ |
| @@ -148,7 +149,7 @@ index bd4e879..db45c56 100755 | |||
| 148 | # Copyright (c) 2010, 2011, 2012, 2013, 2014, 2015, 2016 Nicira, Inc. | 149 | # Copyright (c) 2010, 2011, 2012, 2013, 2014, 2015, 2016 Nicira, Inc. |
| 149 | # | 150 | # |
| 150 | diff --git a/ovn/utilities/ovn-detrace.in b/ovn/utilities/ovn-detrace.in | 151 | diff --git a/ovn/utilities/ovn-detrace.in b/ovn/utilities/ovn-detrace.in |
| 151 | index e2e5b4c..5549219 100755 | 152 | index c842adc..9e95183 100755 |
| 152 | --- a/ovn/utilities/ovn-detrace.in | 153 | --- a/ovn/utilities/ovn-detrace.in |
| 153 | +++ b/ovn/utilities/ovn-detrace.in | 154 | +++ b/ovn/utilities/ovn-detrace.in |
| 154 | @@ -1,4 +1,4 @@ | 155 | @@ -1,4 +1,4 @@ |
| @@ -208,7 +209,7 @@ index 8eea617..38ba33a 100755 | |||
| 208 | from datetime import date | 209 | from datetime import date |
| 209 | import ovs.db.error | 210 | import ovs.db.error |
| 210 | diff --git a/ovsdb/ovsdb-idlc.in b/ovsdb/ovsdb-idlc.in | 211 | diff --git a/ovsdb/ovsdb-idlc.in b/ovsdb/ovsdb-idlc.in |
| 211 | index 1ea2115..4ecb2e2 100755 | 212 | index 40fef39..84c63a6 100755 |
| 212 | --- a/ovsdb/ovsdb-idlc.in | 213 | --- a/ovsdb/ovsdb-idlc.in |
| 213 | +++ b/ovsdb/ovsdb-idlc.in | 214 | +++ b/ovsdb/ovsdb-idlc.in |
| 214 | @@ -1,4 +1,4 @@ | 215 | @@ -1,4 +1,4 @@ |
| @@ -228,7 +229,7 @@ index b8027af..8f52803 100755 | |||
| 228 | # Copyright (c) 2008, 2017 Nicira, Inc. | 229 | # Copyright (c) 2008, 2017 Nicira, Inc. |
| 229 | # | 230 | # |
| 230 | diff --git a/tests/flowgen.py b/tests/flowgen.py | 231 | diff --git a/tests/flowgen.py b/tests/flowgen.py |
| 231 | index 221a8f2..5d96d76 100755 | 232 | index 976fe7a..7ef32d1 100755 |
| 232 | --- a/tests/flowgen.py | 233 | --- a/tests/flowgen.py |
| 233 | +++ b/tests/flowgen.py | 234 | +++ b/tests/flowgen.py |
| 234 | @@ -1,4 +1,4 @@ | 235 | @@ -1,4 +1,4 @@ |
| @@ -258,7 +259,7 @@ index ea72812..f1a9aff 100755 | |||
| 258 | import re | 259 | import re |
| 259 | import sys | 260 | import sys |
| 260 | diff --git a/utilities/bugtool/ovs-bugtool.in b/utilities/bugtool/ovs-bugtool.in | 261 | diff --git a/utilities/bugtool/ovs-bugtool.in b/utilities/bugtool/ovs-bugtool.in |
| 261 | index 8d220fd..76cedf4 100755 | 262 | index 288c34f..b5a6906 100755 |
| 262 | --- a/utilities/bugtool/ovs-bugtool.in | 263 | --- a/utilities/bugtool/ovs-bugtool.in |
| 263 | +++ b/utilities/bugtool/ovs-bugtool.in | 264 | +++ b/utilities/bugtool/ovs-bugtool.in |
| 264 | @@ -1,4 +1,4 @@ | 265 | @@ -1,4 +1,4 @@ |
| @@ -308,7 +309,7 @@ index 350cbd9..1960fb4 100755 | |||
| 308 | # Copyright (c) 2012 Nicira, Inc. | 309 | # Copyright (c) 2012 Nicira, Inc. |
| 309 | # | 310 | # |
| 310 | diff --git a/utilities/ovs-pcap.in b/utilities/ovs-pcap.in | 311 | diff --git a/utilities/ovs-pcap.in b/utilities/ovs-pcap.in |
| 311 | index fc15321..bd55a41 100755 | 312 | index 7bebc07..b4e5ca8 100755 |
| 312 | --- a/utilities/ovs-pcap.in | 313 | --- a/utilities/ovs-pcap.in |
| 313 | +++ b/utilities/ovs-pcap.in | 314 | +++ b/utilities/ovs-pcap.in |
| 314 | @@ -1,4 +1,4 @@ | 315 | @@ -1,4 +1,4 @@ |
| @@ -318,7 +319,7 @@ index fc15321..bd55a41 100755 | |||
| 318 | # Copyright (c) 2010 Nicira, Inc. | 319 | # Copyright (c) 2010 Nicira, Inc. |
| 319 | # | 320 | # |
| 320 | diff --git a/utilities/ovs-tcpdump.in b/utilities/ovs-tcpdump.in | 321 | diff --git a/utilities/ovs-tcpdump.in b/utilities/ovs-tcpdump.in |
| 321 | index 91fa14e..bad67b7 100755 | 322 | index 22f249f..ff2a51e 100755 |
| 322 | --- a/utilities/ovs-tcpdump.in | 323 | --- a/utilities/ovs-tcpdump.in |
| 323 | +++ b/utilities/ovs-tcpdump.in | 324 | +++ b/utilities/ovs-tcpdump.in |
| 324 | @@ -1,4 +1,4 @@ | 325 | @@ -1,4 +1,4 @@ |
| @@ -328,7 +329,7 @@ index 91fa14e..bad67b7 100755 | |||
| 328 | # Copyright (c) 2016 Red Hat, Inc. | 329 | # Copyright (c) 2016 Red Hat, Inc. |
| 329 | # | 330 | # |
| 330 | diff --git a/utilities/ovs-tcpundump.in b/utilities/ovs-tcpundump.in | 331 | diff --git a/utilities/ovs-tcpundump.in b/utilities/ovs-tcpundump.in |
| 331 | index c99015b..9a617ce 100755 | 332 | index c298700..0d8b8da 100755 |
| 332 | --- a/utilities/ovs-tcpundump.in | 333 | --- a/utilities/ovs-tcpundump.in |
| 333 | +++ b/utilities/ovs-tcpundump.in | 334 | +++ b/utilities/ovs-tcpundump.in |
| 334 | @@ -1,4 +1,4 @@ | 335 | @@ -1,4 +1,4 @@ |
| @@ -358,7 +359,7 @@ index e229498..5b70118 100755 | |||
| 358 | # Copyright (c) 2010 Nicira, Inc. | 359 | # Copyright (c) 2010 Nicira, Inc. |
| 359 | # | 360 | # |
| 360 | diff --git a/vtep/ovs-vtep.in b/vtep/ovs-vtep.in | 361 | diff --git a/vtep/ovs-vtep.in b/vtep/ovs-vtep.in |
| 361 | index 98748e4..3f12ae2 100755 | 362 | index 3383870..42f98db 100755 |
| 362 | --- a/vtep/ovs-vtep.in | 363 | --- a/vtep/ovs-vtep.in |
| 363 | +++ b/vtep/ovs-vtep.in | 364 | +++ b/vtep/ovs-vtep.in |
| 364 | @@ -1,4 +1,4 @@ | 365 | @@ -1,4 +1,4 @@ |
| @@ -368,5 +369,5 @@ index 98748e4..3f12ae2 100755 | |||
| 368 | # | 369 | # |
| 369 | # Licensed under the Apache License, Version 2.0 (the "License"); | 370 | # Licensed under the Apache License, Version 2.0 (the "License"); |
| 370 | -- | 371 | -- |
| 371 | 2.7.4 | 372 | 2.8.1 |
| 372 | 373 | ||
