diff options
Diffstat (limited to 'recipes-networking/openvswitch/openvswitch-git')
| -rw-r--r-- | recipes-networking/openvswitch/openvswitch-git/0002-Define-WAIT_ANY-if-not-provided-by-system.patch | 29 | ||||
| -rw-r--r-- | recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-71d553b995d0bd527d3ab1e9fbaf5a2ae34de2f3.patch (renamed from recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-6beb94976e2b3e0c51430b63214de14186d8db39.patch) | 0 | ||||
| -rw-r--r-- | recipes-networking/openvswitch/openvswitch-git/ovsdb-idlc.in-fix-dict-change-during-iteration.patch | 45 | 
3 files changed, 0 insertions, 74 deletions
diff --git a/recipes-networking/openvswitch/openvswitch-git/0002-Define-WAIT_ANY-if-not-provided-by-system.patch b/recipes-networking/openvswitch/openvswitch-git/0002-Define-WAIT_ANY-if-not-provided-by-system.patch deleted file mode 100644 index f997bbff..00000000 --- a/recipes-networking/openvswitch/openvswitch-git/0002-Define-WAIT_ANY-if-not-provided-by-system.patch +++ /dev/null  | |||
| @@ -1,29 +0,0 @@ | |||
| 1 | From 801023e72b31e7c49cbccedd76ade33a17fcbe45 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Mon, 20 Mar 2017 12:13:30 -0700 | ||
| 4 | Subject: [PATCH] Define WAIT_ANY if not provided by system | ||
| 5 | |||
| 6 | POSIX does not define it and uses -1 directly | ||
| 7 | some libc do not have this definitions | ||
| 8 | |||
| 9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 10 | |||
| 11 | --- | ||
| 12 | tests/test-ovn.c | 4 ++++ | ||
| 13 | 1 file changed, 4 insertions(+) | ||
| 14 | |||
| 15 | diff --git a/tests/test-ovn.c b/tests/test-ovn.c | ||
| 16 | index 84adf81..2bc6bdf 100644 | ||
| 17 | --- a/tests/test-ovn.c | ||
| 18 | +++ b/tests/test-ovn.c | ||
| 19 | @@ -38,6 +38,10 @@ | ||
| 20 | #include "simap.h" | ||
| 21 | #include "util.h" | ||
| 22 | |||
| 23 | +#ifndef WAIT_ANY | ||
| 24 | +# define WAIT_ANY (-1) /* Any process. */ | ||
| 25 | +#endif | ||
| 26 | + | ||
| 27 | /* --relops: Bitmap of the relational operators to test, in exhaustive test. */ | ||
| 28 | static unsigned int test_relops; | ||
| 29 | |||
diff --git a/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-6beb94976e2b3e0c51430b63214de14186d8db39.patch b/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-71d553b995d0bd527d3ab1e9fbaf5a2ae34de2f3.patch index a8fc86c9..a8fc86c9 100644 --- a/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-6beb94976e2b3e0c51430b63214de14186d8db39.patch +++ b/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-71d553b995d0bd527d3ab1e9fbaf5a2ae34de2f3.patch  | |||
diff --git a/recipes-networking/openvswitch/openvswitch-git/ovsdb-idlc.in-fix-dict-change-during-iteration.patch b/recipes-networking/openvswitch/openvswitch-git/ovsdb-idlc.in-fix-dict-change-during-iteration.patch deleted file mode 100644 index bf49ff65..00000000 --- a/recipes-networking/openvswitch/openvswitch-git/ovsdb-idlc.in-fix-dict-change-during-iteration.patch +++ /dev/null  | |||
| @@ -1,45 +0,0 @@ | |||
| 1 | From d84109f0b60096ce71cd0537b31b69a7f5ea8756 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Flavio Leitner <fbl@sysclose.org> | ||
| 3 | Date: Sat, 14 Sep 2019 20:17:28 -0300 | ||
| 4 | Subject: [PATCH] ovsdb-idlc.in: fix dict change during iteration. | ||
| 5 | |||
| 6 | Commit d84109f0b600 from git://github.com/openvswitch/ovs.git | ||
| 7 | |||
| 8 | Python3 complains if a dict key is changed during the | ||
| 9 | iteration. | ||
| 10 | |||
| 11 | Use list() to create a copy of it. | ||
| 12 | |||
| 13 | Traceback (most recent call last): | ||
| 14 | File "./ovsdb/ovsdb-idlc.in", line 1581, in <module> | ||
| 15 | func(*args[1:]) | ||
| 16 | File "./ovsdb/ovsdb-idlc.in", line 185, in printCIDLHeader | ||
| 17 | replace_cplusplus_keyword(schema) | ||
| 18 | File "./ovsdb/ovsdb-idlc.in", line 179, in replace_cplusplus_keyword | ||
| 19 | for columnName in table.columns: | ||
| 20 | RuntimeError: dictionary keys changed during iteration | ||
| 21 | |||
| 22 | Signed-off-by: Flavio Leitner <fbl@sysclose.org> | ||
| 23 | Signed-off-by: Ben Pfaff <blp@ovn.org> | ||
| 24 | [MA: Upstream-Status: Submitted] | ||
| 25 | Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> | ||
| 26 | --- | ||
| 27 | ovsdb/ovsdb-idlc.in | 2 +- | ||
| 28 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 29 | |||
| 30 | diff --git a/ovsdb/ovsdb-idlc.in b/ovsdb/ovsdb-idlc.in | ||
| 31 | index 40fef39..22d0a4e 100755 | ||
| 32 | --- a/ovsdb/ovsdb-idlc.in | ||
| 33 | +++ b/ovsdb/ovsdb-idlc.in | ||
| 34 | @@ -176,7 +176,7 @@ def replace_cplusplus_keyword(schema): | ||
| 35 | 'wchar_t', 'while', 'xor', 'xor_eq'} | ||
| 36 | |||
| 37 | for tableName, table in schema.tables.items(): | ||
| 38 | - for columnName in table.columns: | ||
| 39 | + for columnName in list(table.columns): | ||
| 40 | if columnName in keywords: | ||
| 41 | table.columns[columnName + '_'] = table.columns.pop(columnName) | ||
| 42 | |||
| 43 | -- | ||
| 44 | 2.7.4 | ||
| 45 | |||
