diff options
author | Yi Zhao <yi.zhao@windriver.com> | 2018-04-16 15:40:12 +0800 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2018-04-16 07:25:10 -0400 |
commit | 500e5d2ad58f78d3aa5132081123955b6681bb8c (patch) | |
tree | 0af4fda14f47b594e996fe4214a080c880ca63e3 /recipes-networking/openvswitch/openvswitch-git/0004-Python3-compatibility-iteritems-to-items.patch | |
parent | 97fea33badac9e674365744a559006b70d2e1222 (diff) | |
download | meta-virtualization-500e5d2ad58f78d3aa5132081123955b6681bb8c.tar.gz |
openvswitch: refresh patches to fix QA warning
Refresh patches with devtool command to fix do_patch warning.
Drop CVE-2017-9263.patch since it had been fixed upstream.
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'recipes-networking/openvswitch/openvswitch-git/0004-Python3-compatibility-iteritems-to-items.patch')
-rw-r--r-- | recipes-networking/openvswitch/openvswitch-git/0004-Python3-compatibility-iteritems-to-items.patch | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/recipes-networking/openvswitch/openvswitch-git/0004-Python3-compatibility-iteritems-to-items.patch b/recipes-networking/openvswitch/openvswitch-git/0004-Python3-compatibility-iteritems-to-items.patch index ddc86db2..092c42d6 100644 --- a/recipes-networking/openvswitch/openvswitch-git/0004-Python3-compatibility-iteritems-to-items.patch +++ b/recipes-networking/openvswitch/openvswitch-git/0004-Python3-compatibility-iteritems-to-items.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 0f318e472d9897d99395adcfb17cbeaff05677ba Mon Sep 17 00:00:00 2001 | 1 | From 7e4bd5c2af85b1293be0a92b18f7930bda2ab41a Mon Sep 17 00:00:00 2001 |
2 | From: Jason Wessel <jason.wessel@windriver.com> | 2 | From: Jason Wessel <jason.wessel@windriver.com> |
3 | Date: Thu, 29 Jun 2017 20:33:23 -0700 | 3 | Date: Thu, 29 Jun 2017 20:33:23 -0700 |
4 | Subject: [PATCH 4/8] Python3 compatibility: iteritems to items | 4 | Subject: [PATCH] Python3 compatibility: iteritems to items |
5 | 5 | ||
6 | Commit 4ab665623cbb4c6506e48b82e0c9fe8585f42e13 from | 6 | Commit 4ab665623cbb4c6506e48b82e0c9fe8585f42e13 from |
7 | https://github.com/openvswitch/ovs.git | 7 | https://github.com/openvswitch/ovs.git |
@@ -11,6 +11,7 @@ items(). | |||
11 | 11 | ||
12 | Signed-off-by: Jason Wessel <jason.wessel@windriver.com> | 12 | Signed-off-by: Jason Wessel <jason.wessel@windriver.com> |
13 | Signed-off-by: Ben Pfaff <blp@ovn.org> | 13 | Signed-off-by: Ben Pfaff <blp@ovn.org> |
14 | |||
14 | --- | 15 | --- |
15 | build-aux/extract-ofp-actions | 2 +- | 16 | build-aux/extract-ofp-actions | 2 +- |
16 | build-aux/extract-ofp-errors | 2 +- | 17 | build-aux/extract-ofp-errors | 2 +- |
@@ -19,7 +20,7 @@ Signed-off-by: Ben Pfaff <blp@ovn.org> | |||
19 | 4 files changed, 7 insertions(+), 7 deletions(-) | 20 | 4 files changed, 7 insertions(+), 7 deletions(-) |
20 | 21 | ||
21 | diff --git a/build-aux/extract-ofp-actions b/build-aux/extract-ofp-actions | 22 | diff --git a/build-aux/extract-ofp-actions b/build-aux/extract-ofp-actions |
22 | index 874e6b4..c11297c 100755 | 23 | index 67e3848..c7858bd 100755 |
23 | --- a/build-aux/extract-ofp-actions | 24 | --- a/build-aux/extract-ofp-actions |
24 | +++ b/build-aux/extract-ofp-actions | 25 | +++ b/build-aux/extract-ofp-actions |
25 | @@ -13,7 +13,7 @@ version_map = {"1.0": 0x01, | 26 | @@ -13,7 +13,7 @@ version_map = {"1.0": 0x01, |
@@ -32,7 +33,7 @@ index 874e6b4..c11297c 100755 | |||
32 | # Map from vendor name to the length of the action header. | 33 | # Map from vendor name to the length of the action header. |
33 | vendor_map = {"OF": (0x00000000, 4), | 34 | vendor_map = {"OF": (0x00000000, 4), |
34 | diff --git a/build-aux/extract-ofp-errors b/build-aux/extract-ofp-errors | 35 | diff --git a/build-aux/extract-ofp-errors b/build-aux/extract-ofp-errors |
35 | index 336a240..71ae0bd 100755 | 36 | index 97d62d2..58ba006 100755 |
36 | --- a/build-aux/extract-ofp-errors | 37 | --- a/build-aux/extract-ofp-errors |
37 | +++ b/build-aux/extract-ofp-errors | 38 | +++ b/build-aux/extract-ofp-errors |
38 | @@ -14,7 +14,7 @@ version_map = {"1.0": 0x01, | 39 | @@ -14,7 +14,7 @@ version_map = {"1.0": 0x01, |
@@ -45,7 +46,7 @@ index 336a240..71ae0bd 100755 | |||
45 | token = None | 46 | token = None |
46 | line = "" | 47 | line = "" |
47 | diff --git a/build-aux/extract-ofp-fields b/build-aux/extract-ofp-fields | 48 | diff --git a/build-aux/extract-ofp-fields b/build-aux/extract-ofp-fields |
48 | index 61e752b..ef997dd 100755 | 49 | index 6286c9c..f624728 100755 |
49 | --- a/build-aux/extract-ofp-fields | 50 | --- a/build-aux/extract-ofp-fields |
50 | +++ b/build-aux/extract-ofp-fields | 51 | +++ b/build-aux/extract-ofp-fields |
51 | @@ -16,7 +16,7 @@ VERSION = {"1.0": 0x01, | 52 | @@ -16,7 +16,7 @@ VERSION = {"1.0": 0x01, |
@@ -58,7 +59,7 @@ index 61e752b..ef997dd 100755 | |||
58 | TYPES = {"u8": (1, False), | 59 | TYPES = {"u8": (1, False), |
59 | "be16": (2, False), | 60 | "be16": (2, False), |
60 | diff --git a/ovsdb/ovsdb-idlc.in b/ovsdb/ovsdb-idlc.in | 61 | diff --git a/ovsdb/ovsdb-idlc.in b/ovsdb/ovsdb-idlc.in |
61 | index 3fa1a0f..615548f 100755 | 62 | index e1551f9..b70a599 100755 |
62 | --- a/ovsdb/ovsdb-idlc.in | 63 | --- a/ovsdb/ovsdb-idlc.in |
63 | +++ b/ovsdb/ovsdb-idlc.in | 64 | +++ b/ovsdb/ovsdb-idlc.in |
64 | @@ -138,7 +138,7 @@ def printCIDLHeader(schemaFile): | 65 | @@ -138,7 +138,7 @@ def printCIDLHeader(schemaFile): |
@@ -97,6 +98,3 @@ index 3fa1a0f..615548f 100755 | |||
97 | structName = "%s%s" % (prefix, tableName.lower()) | 98 | structName = "%s%s" % (prefix, tableName.lower()) |
98 | if table.is_root: | 99 | if table.is_root: |
99 | is_root = "true" | 100 | is_root = "true" |
100 | -- | ||
101 | 2.5.0 | ||
102 | |||