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/0002-Python3-compatibility-exception-cleanup.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/0002-Python3-compatibility-exception-cleanup.patch')
-rw-r--r-- | recipes-networking/openvswitch/openvswitch-git/0002-Python3-compatibility-exception-cleanup.patch | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/recipes-networking/openvswitch/openvswitch-git/0002-Python3-compatibility-exception-cleanup.patch b/recipes-networking/openvswitch/openvswitch-git/0002-Python3-compatibility-exception-cleanup.patch index 59c0f3e4..70abd263 100644 --- a/recipes-networking/openvswitch/openvswitch-git/0002-Python3-compatibility-exception-cleanup.patch +++ b/recipes-networking/openvswitch/openvswitch-git/0002-Python3-compatibility-exception-cleanup.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From c98fee41d130cb946aa4e60fefaa6cbf203f6790 Mon Sep 17 00:00:00 2001 | 1 | From c0ba116eab401431b4f11b66bd7d1b42741b03c3 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 2/8] Python3 compatibility: exception cleanup | 4 | Subject: [PATCH] Python3 compatibility: exception cleanup |
5 | 5 | ||
6 | Commit 52e4a477f0b3c0a0ece7adeede6e06e07814f8b9 from | 6 | Commit 52e4a477f0b3c0a0ece7adeede6e06e07814f8b9 from |
7 | https://github.com/openvswitch/ovs.git | 7 | https://github.com/openvswitch/ovs.git |
@@ -11,6 +11,7 @@ to use the "as" form for "except:". | |||
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-fields | 2 +- | 16 | build-aux/extract-ofp-fields | 2 +- |
16 | ovsdb/ovsdb-doc | 4 ++-- | 17 | ovsdb/ovsdb-doc | 4 ++-- |
@@ -18,7 +19,7 @@ Signed-off-by: Ben Pfaff <blp@ovn.org> | |||
18 | 3 files changed, 5 insertions(+), 5 deletions(-) | 19 | 3 files changed, 5 insertions(+), 5 deletions(-) |
19 | 20 | ||
20 | diff --git a/build-aux/extract-ofp-fields b/build-aux/extract-ofp-fields | 21 | diff --git a/build-aux/extract-ofp-fields b/build-aux/extract-ofp-fields |
21 | index 425a85f..61e752b 100755 | 22 | index 80c7d35..6286c9c 100755 |
22 | --- a/build-aux/extract-ofp-fields | 23 | --- a/build-aux/extract-ofp-fields |
23 | +++ b/build-aux/extract-ofp-fields | 24 | +++ b/build-aux/extract-ofp-fields |
24 | @@ -784,7 +784,7 @@ if __name__ == "__main__": | 25 | @@ -784,7 +784,7 @@ if __name__ == "__main__": |
@@ -31,7 +32,7 @@ index 425a85f..61e752b 100755 | |||
31 | sys.exit(1) | 32 | sys.exit(1) |
32 | 33 | ||
33 | diff --git a/ovsdb/ovsdb-doc b/ovsdb/ovsdb-doc | 34 | diff --git a/ovsdb/ovsdb-doc b/ovsdb/ovsdb-doc |
34 | index b34fb11..918e88a 100755 | 35 | index e82ad59..9448713 100755 |
35 | --- a/ovsdb/ovsdb-doc | 36 | --- a/ovsdb/ovsdb-doc |
36 | +++ b/ovsdb/ovsdb-doc | 37 | +++ b/ovsdb/ovsdb-doc |
37 | @@ -278,7 +278,7 @@ if __name__ == "__main__": | 38 | @@ -278,7 +278,7 @@ if __name__ == "__main__": |
@@ -53,7 +54,7 @@ index b34fb11..918e88a 100755 | |||
53 | sys.exit(1) | 54 | sys.exit(1) |
54 | 55 | ||
55 | diff --git a/ovsdb/ovsdb-idlc.in b/ovsdb/ovsdb-idlc.in | 56 | diff --git a/ovsdb/ovsdb-idlc.in b/ovsdb/ovsdb-idlc.in |
56 | index 1064448..8b85f0d 100755 | 57 | index 62442ee..e7e1c6b 100755 |
57 | --- a/ovsdb/ovsdb-idlc.in | 58 | --- a/ovsdb/ovsdb-idlc.in |
58 | +++ b/ovsdb/ovsdb-idlc.in | 59 | +++ b/ovsdb/ovsdb-idlc.in |
59 | @@ -1098,7 +1098,7 @@ if __name__ == "__main__": | 60 | @@ -1098,7 +1098,7 @@ if __name__ == "__main__": |
@@ -74,6 +75,3 @@ index 1064448..8b85f0d 100755 | |||
74 | sys.stderr.write("%s: %s\n" % (argv0, e)) | 75 | sys.stderr.write("%s: %s\n" % (argv0, e)) |
75 | sys.exit(1) | 76 | sys.exit(1) |
76 | 77 | ||
77 | -- | ||
78 | 2.5.0 | ||
79 | |||