summaryrefslogtreecommitdiffstats
path: root/recipes-networking/openvswitch/openvswitch-git/0004-Python3-compatibility-iteritems-to-items.patch
diff options
context:
space:
mode:
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.patch16
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 @@
1From 0f318e472d9897d99395adcfb17cbeaff05677ba Mon Sep 17 00:00:00 2001 1From 7e4bd5c2af85b1293be0a92b18f7930bda2ab41a Mon Sep 17 00:00:00 2001
2From: Jason Wessel <jason.wessel@windriver.com> 2From: Jason Wessel <jason.wessel@windriver.com>
3Date: Thu, 29 Jun 2017 20:33:23 -0700 3Date: Thu, 29 Jun 2017 20:33:23 -0700
4Subject: [PATCH 4/8] Python3 compatibility: iteritems to items 4Subject: [PATCH] Python3 compatibility: iteritems to items
5 5
6Commit 4ab665623cbb4c6506e48b82e0c9fe8585f42e13 from 6Commit 4ab665623cbb4c6506e48b82e0c9fe8585f42e13 from
7https://github.com/openvswitch/ovs.git 7https://github.com/openvswitch/ovs.git
@@ -11,6 +11,7 @@ items().
11 11
12Signed-off-by: Jason Wessel <jason.wessel@windriver.com> 12Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
13Signed-off-by: Ben Pfaff <blp@ovn.org> 13Signed-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
21diff --git a/build-aux/extract-ofp-actions b/build-aux/extract-ofp-actions 22diff --git a/build-aux/extract-ofp-actions b/build-aux/extract-ofp-actions
22index 874e6b4..c11297c 100755 23index 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),
34diff --git a/build-aux/extract-ofp-errors b/build-aux/extract-ofp-errors 35diff --git a/build-aux/extract-ofp-errors b/build-aux/extract-ofp-errors
35index 336a240..71ae0bd 100755 36index 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 = ""
47diff --git a/build-aux/extract-ofp-fields b/build-aux/extract-ofp-fields 48diff --git a/build-aux/extract-ofp-fields b/build-aux/extract-ofp-fields
48index 61e752b..ef997dd 100755 49index 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),
60diff --git a/ovsdb/ovsdb-idlc.in b/ovsdb/ovsdb-idlc.in 61diff --git a/ovsdb/ovsdb-idlc.in b/ovsdb/ovsdb-idlc.in
61index 3fa1a0f..615548f 100755 62index 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--
1012.5.0
102