<div dir="ltr">merged<div><br></div><div>Bruce</div></div><div class="gmail_extra"><br><div class="gmail_quote">On Wed, May 30, 2018 at 11:47 AM, Mark Asselstine <span dir="ltr"><<a href="mailto:mark.asselstine@windriver.com" target="_blank">mark.asselstine@windriver.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">This brings us up to date with the latest upstream release. I suspect<br>
there will be an upcoming release to add compatibility with DPDK<br>
v18.05 (the DPDK release is due out any day now) but getting this<br>
fairly large release bump out of the way first will facilitate any<br>
upcoming uprev.<br>
<br>
We are able to drop they python3 patches as they have been merged<br>
upstream. Some scripts which needed to be updated to use python3<br>
disappeared, new ones appeared so the 'use python3' patches are<br>
updated accordingly. Beyond this the biggest change is related to the<br>
systemd unit files, the ovsdb-server has been updated upstream to be<br>
generated on the fly via the spec file, we mimic this in the<br>
install_prepend. We also add the various configuration files which the<br>
unit files source before launching the services.<br>
<br>
As usual this was tested against out typical usecases including usage<br>
in meta-overc. As well the ptests have been run and the results are no<br>
better or worse.<br>
<br>
   Previous version:<br>
    ERROR: 2332 tests were run,<br>
    21 failed unexpectedly.<br>
    3 tests were skipped.<br>
<br>
   New version:<br>
    ERROR: 2527 tests were run,<br>
    29 failed unexpectedly.<br>
    3 tests were skipped.<br>
<br>
Signed-off-by: Mark Asselstine <<a href="mailto:mark.asselstine@windriver.com">mark.asselstine@windriver.com</a><wbr>><br>
---<br>
 ...on-make-remaining-scripts-<wbr>use-usr-bin-env.patch | 298 ++++++++++++++++++---<br>
 ...n-switch-remaining-scripts-<wbr>to-use-python3.patch |  15 +-<br>
 .../openvswitch-git/disable_<wbr>m4_check.patch         |   8 +-<br>
 ...-<wbr>7e614671cba3c4e338d1c5003b74a1<wbr>0047d7a8eb.patch | 110 ++++++++<br>
 .../systemd-update-tool-paths.<wbr>patch                |  45 ++++<br>
 recipes-networking/<wbr>openvswitch/openvswitch.inc     |  18 ++<br>
 recipes-networking/<wbr>openvswitch/<a href="http://openvswitch_git.bb" rel="noreferrer" target="_blank">openvswitch_git.bb</a>  |  22 +-<br>
 7 files changed, 443 insertions(+), 73 deletions(-)<br>
 create mode 100644 recipes-networking/<wbr>openvswitch/openvswitch-git/<wbr>openvswitch-add-ptest-<wbr>7e614671cba3c4e338d1c5003b74a1<wbr>0047d7a8eb.patch<br>
 create mode 100644 recipes-networking/<wbr>openvswitch/openvswitch-git/<wbr>systemd-update-tool-paths.<wbr>patch<br>
<br>
diff --git a/recipes-networking/<wbr>openvswitch/files/python-make-<wbr>remaining-scripts-use-usr-bin-<wbr>env.patch b/recipes-networking/<wbr>openvswitch/files/python-make-<wbr>remaining-scripts-use-usr-bin-<wbr>env.patch<br>
index deff10b..0dc6b11 100644<br>
--- a/recipes-networking/<wbr>openvswitch/files/python-make-<wbr>remaining-scripts-use-usr-bin-<wbr>env.patch<br>
+++ b/recipes-networking/<wbr>openvswitch/files/python-make-<wbr>remaining-scripts-use-usr-bin-<wbr>env.patch<br>
@@ -1,4 +1,4 @@<br>
-From f21a0490555d5fe8f5a9ce982defa6<wbr>66a64151c0 Mon Sep 17 00:00:00 2001<br>
+From a0a2d829642e916bd5d1c498a3e6f3<wbr>641ed717a0 Mon Sep 17 00:00:00 2001<br>
 From: Mark Asselstine <<a href="mailto:mark.asselstine@windriver.com">mark.asselstine@windriver.com</a><wbr>><br>
 Date: Fri, 13 Jan 2017 16:12:55 -0500<br>
 Subject: [PATCH] python: make remaining scripts use /usr/bin/env<br>
@@ -12,24 +12,43 @@ PYTHON. To make this function smoothly all installed scripts should<br>
 make use of /usr/bin/env to increase the chances of finding python.<br>
<br>
 Signed-off-by: Mark Asselstine <<a href="mailto:mark.asselstine@windriver.com">mark.asselstine@windriver.com</a><wbr>><br>
-<br>
 ---<br>
- build-aux/check-structs                  | 2 +-<br>
- build-aux/extract-ofp-actions            | 2 +-<br>
- build-aux/extract-ofp-errors             | 2 +-<br>
- build-aux/extract-ofp-fields             | 2 +-<br>
- build-aux/extract-ofp-msgs               | 2 +-<br>
- build-aux/xml2nroff                      | 2 +-<br>
- ovn/utilities/ovn-docker-<wbr>overlay-driver  | 2 +-<br>
- ovn/utilities/ovn-docker-<wbr>underlay-driver | 2 +-<br>
- ovsdb/ovsdb-doc                          | 2 +-<br>
- ovsdb/<a href="http://ovsdb-dot.in" rel="noreferrer" target="_blank">ovsdb-dot.in</a>                       | 2 +-<br>
- ovsdb/<a href="http://ovsdb-idlc.in" rel="noreferrer" target="_blank">ovsdb-idlc.in</a>                      | 2 +-<br>
- utilities/bugtool/<a href="http://ovs-bugtool.in" rel="noreferrer" target="_blank">ovs-bugtool.<wbr>in</a>         | 2 +-<br>
- 12 files changed, 12 insertions(+), 12 deletions(-)<br>
+ build-aux/check-structs                     | 2 +-<br>
+ build-aux/dpdkstrip.py                      | 2 +-<br>
+ build-aux/extract-ofp-actions               | 2 +-<br>
+ build-aux/extract-ofp-errors                | 2 +-<br>
+ build-aux/extract-ofp-fields                | 2 +-<br>
+ build-aux/extract-ofp-msgs                  | 2 +-<br>
+ build-aux/sodepends.py                      | 2 +-<br>
+ build-aux/soexpand.py                       | 2 +-<br>
+ build-aux/text2c                            | 2 +-<br>
+ build-aux/xml2nroff                         | 2 +-<br>
+ ovn/utilities/<a href="http://ovn-detrace.in" rel="noreferrer" target="_blank">ovn-detrace.in</a>                | 2 +-<br>
+ ovn/utilities/<a href="http://ovn-docker-overlay-driver.in" rel="noreferrer" target="_blank">ovn-docker-<wbr>overlay-driver.in</a>  | 2 +-<br>
+ ovn/utilities/<a href="http://ovn-docker-underlay-driver.in" rel="noreferrer" target="_blank">ovn-docker-<wbr>underlay-driver.in</a> | 2 +-<br>
+ ovsdb/dot2pic                               | 2 +-<br>
+ ovsdb/ovsdb-doc                             | 2 +-<br>
+ ovsdb/<a href="http://ovsdb-dot.in" rel="noreferrer" target="_blank">ovsdb-dot.in</a>                          | 2 +-<br>
+ ovsdb/<a href="http://ovsdb-idlc.in" rel="noreferrer" target="_blank">ovsdb-idlc.in</a>                         | 2 +-<br>
+ python/build/soutil.py                      | 2 +-<br>
+ tests/flowgen.py                            | 2 +-<br>
+ tests/ovsdb-monitor-sort.py                 | 2 +-<br>
+ tests/uuidfilt.py                           | 2 +-<br>
+ utilities/bugtool/<a href="http://ovs-bugtool.in" rel="noreferrer" target="_blank">ovs-bugtool.<wbr>in</a>            | 2 +-<br>
+ utilities/<a href="http://ovs-check-dead-ifs.in" rel="noreferrer" target="_blank">ovs-check-dead-ifs.<wbr>in</a>             | 2 +-<br>
+ utilities/<a href="http://ovs-dpctl-top.in" rel="noreferrer" target="_blank">ovs-dpctl-top.in</a>                  | 2 +-<br>
+ utilities/<a href="http://ovs-l3ping.in" rel="noreferrer" target="_blank">ovs-l3ping.in</a>                     | 2 +-<br>
+ utilities/<a href="http://ovs-parse-backtrace.in" rel="noreferrer" target="_blank">ovs-parse-backtrace.<wbr>in</a>            | 2 +-<br>
+ utilities/<a href="http://ovs-pcap.in" rel="noreferrer" target="_blank">ovs-pcap.in</a>                       | 2 +-<br>
+ utilities/<a href="http://ovs-tcpdump.in" rel="noreferrer" target="_blank">ovs-tcpdump.in</a>                    | 2 +-<br>
+ utilities/<a href="http://ovs-tcpundump.in" rel="noreferrer" target="_blank">ovs-tcpundump.in</a>                  | 2 +-<br>
+ utilities/<a href="http://ovs-test.in" rel="noreferrer" target="_blank">ovs-test.in</a>                       | 2 +-<br>
+ utilities/<a href="http://ovs-vlan-test.in" rel="noreferrer" target="_blank">ovs-vlan-test.in</a>                  | 2 +-<br>
+ vtep/<a href="http://ovs-vtep.in" rel="noreferrer" target="_blank">ovs-vtep.in</a>                            | 2 +-<br>
+ 32 files changed, 32 insertions(+), 32 deletions(-)<br>
<br>
 diff --git a/build-aux/check-structs b/build-aux/check-structs<br>
-index f79f235..5129b72 100755<br>
+index 37ffa06..eb44c91 100755<br>
 --- a/build-aux/check-structs<br>
 +++ b/build-aux/check-structs<br>
 @@ -1,4 +1,4 @@<br>
@@ -38,8 +57,18 @@ index f79f235..5129b72 100755<br>
<br>
  import os.path<br>
  import sys<br>
+diff --git a/build-aux/dpdkstrip.py b/build-aux/dpdkstrip.py<br>
+index 48c7f06..b8b8ba9 100755<br>
+--- a/build-aux/dpdkstrip.py<br>
++++ b/build-aux/dpdkstrip.py<br>
+@@ -1,4 +1,4 @@<br>
+-#! /usr/bin/env python<br>
++#! /usr/bin/env python3<br>
+ # Copyright (c) 2017 Red Hat, Inc.<br>
+ #<br>
+ # Licensed under the Apache License, Version 2.0 (the "License");<br>
 diff --git a/build-aux/extract-ofp-<wbr>actions b/build-aux/extract-ofp-<wbr>actions<br>
-index 0062ab8..ee8c4ff 100755<br>
+index bd7131f..4d05ef9 100755<br>
 --- a/build-aux/extract-ofp-<wbr>actions<br>
 +++ b/build-aux/extract-ofp-<wbr>actions<br>
 @@ -1,4 +1,4 @@<br>
@@ -49,7 +78,7 @@ index 0062ab8..ee8c4ff 100755<br>
  import sys<br>
  import os.path<br>
 diff --git a/build-aux/extract-ofp-errors b/build-aux/extract-ofp-errors<br>
-index 2312b76..e36444e 100755<br>
+index 71ae0bd..58ba006 100755<br>
 --- a/build-aux/extract-ofp-errors<br>
 +++ b/build-aux/extract-ofp-errors<br>
 @@ -1,4 +1,4 @@<br>
@@ -59,7 +88,7 @@ index 2312b76..e36444e 100755<br>
  import sys<br>
  import os.path<br>
 diff --git a/build-aux/extract-ofp-fields b/build-aux/extract-ofp-fields<br>
-index 498b887..c248e76 100755<br>
+index 184b75e..cf339f8 100755<br>
 --- a/build-aux/extract-ofp-fields<br>
 +++ b/build-aux/extract-ofp-fields<br>
 @@ -1,4 +1,4 @@<br>
@@ -69,7 +98,7 @@ index 498b887..c248e76 100755<br>
  import getopt<br>
  import sys<br>
 diff --git a/build-aux/extract-ofp-msgs b/build-aux/extract-ofp-msgs<br>
-index 1813638..c2a91f9 100755<br>
+index a67e870..92c4bda 100755<br>
 --- a/build-aux/extract-ofp-msgs<br>
 +++ b/build-aux/extract-ofp-msgs<br>
 @@ -1,4 +1,4 @@<br>
@@ -78,6 +107,36 @@ index 1813638..c2a91f9 100755<br>
<br>
  import sys<br>
  import os.path<br>
+diff --git a/build-aux/sodepends.py b/build-aux/sodepends.py<br>
+index 90cfaa0..45812bc 100755<br>
+--- a/build-aux/sodepends.py<br>
++++ b/build-aux/sodepends.py<br>
+@@ -1,4 +1,4 @@<br>
+-#! /usr/bin/env python<br>
++#! /usr/bin/env python3<br>
+ <br>
+ # Copyright (c) 2008, 2011, 2017 Nicira, Inc.<br>
+ #<br>
+diff --git a/build-aux/soexpand.py b/build-aux/soexpand.py<br>
+index 53ca640..00adcf4 100755<br>
+--- a/build-aux/soexpand.py<br>
++++ b/build-aux/soexpand.py<br>
+@@ -1,4 +1,4 @@<br>
+-#! /usr/bin/env python<br>
++#! /usr/bin/env python3<br>
+ <br>
+ # Copyright (c) 2008, 2017 Nicira, Inc.<br>
+ #<br>
+diff --git a/build-aux/text2c b/build-aux/text2c<br>
+index cb1f256..ab7910e 100755<br>
+--- a/build-aux/text2c<br>
++++ b/build-aux/text2c<br>
+@@ -1,4 +1,4 @@<br>
+-#! /usr/bin/python<br>
++#! /usr/bin/env python3<br>
+ <br>
+ import re<br>
+ import sys<br>
 diff --git a/build-aux/xml2nroff b/build-aux/xml2nroff<br>
 index bd4e879..db45c56 100755<br>
 --- a/build-aux/xml2nroff<br>
@@ -88,28 +147,48 @@ index bd4e879..db45c56 100755<br>
<br>
  # Copyright (c) 2010, 2011, 2012, 2013, 2014, 2015, 2016 Nicira, Inc.<br>
  #<br>
-diff --git a/ovn/utilities/ovn-docker-<wbr>overlay-driver b/ovn/utilities/ovn-docker-<wbr>overlay-driver<br>
-index 52de3db..3b1fa45 100755<br>
---- a/ovn/utilities/ovn-docker-<wbr>overlay-driver<br>
-+++ b/ovn/utilities/ovn-docker-<wbr>overlay-driver<br>
+diff --git a/ovn/utilities/<a href="http://ovn-detrace.in" rel="noreferrer" target="_blank">ovn-detrace.in</a> b/ovn/utilities/<a href="http://ovn-detrace.in" rel="noreferrer" target="_blank">ovn-detrace.in</a><br>
+index e2e5b4c..5549219 100755<br>
+--- a/ovn/utilities/<a href="http://ovn-detrace.in" rel="noreferrer" target="_blank">ovn-detrace.in</a><br>
++++ b/ovn/utilities/<a href="http://ovn-detrace.in" rel="noreferrer" target="_blank">ovn-detrace.in</a><br>
 @@ -1,4 +1,4 @@<br>
--#! /usr/bin/python<br>
-+#! /usr/bin/env python3<br>
+-#! @PYTHON@<br>
++#!/usr/bin/env @PYTHON@<br>
+ #<br>
+ # Copyright (c) 2017 eBay Inc.<br>
+ #<br>
+diff --git a/ovn/utilities/<a href="http://ovn-docker-overlay-driver.in" rel="noreferrer" target="_blank">ovn-docker-<wbr>overlay-driver.in</a> b/ovn/utilities/<a href="http://ovn-docker-overlay-driver.in" rel="noreferrer" target="_blank">ovn-docker-<wbr>overlay-driver.in</a><br>
+index 65edfcd..895426b 100755<br>
+--- a/ovn/utilities/<a href="http://ovn-docker-overlay-driver.in" rel="noreferrer" target="_blank">ovn-docker-<wbr>overlay-driver.in</a><br>
++++ b/ovn/utilities/<a href="http://ovn-docker-overlay-driver.in" rel="noreferrer" target="_blank">ovn-docker-<wbr>overlay-driver.in</a><br>
+@@ -1,4 +1,4 @@<br>
+-#! @PYTHON@<br>
++#!/usr/bin/env @PYTHON@<br>
  # Copyright (C) 2015 Nicira, Inc.<br>
  #<br>
  # Licensed under the Apache License, Version 2.0 (the "License");<br>
-diff --git a/ovn/utilities/ovn-docker-<wbr>underlay-driver b/ovn/utilities/ovn-docker-<wbr>underlay-driver<br>
-index 2c9c4b6..551e7a1 100755<br>
---- a/ovn/utilities/ovn-docker-<wbr>underlay-driver<br>
-+++ b/ovn/utilities/ovn-docker-<wbr>underlay-driver<br>
+diff --git a/ovn/utilities/<a href="http://ovn-docker-underlay-driver.in" rel="noreferrer" target="_blank">ovn-docker-<wbr>underlay-driver.in</a> b/ovn/utilities/<a href="http://ovn-docker-underlay-driver.in" rel="noreferrer" target="_blank">ovn-docker-<wbr>underlay-driver.in</a><br>
+index d91ce9f..e0c8db6 100755<br>
+--- a/ovn/utilities/<a href="http://ovn-docker-underlay-driver.in" rel="noreferrer" target="_blank">ovn-docker-<wbr>underlay-driver.in</a><br>
++++ b/ovn/utilities/<a href="http://ovn-docker-underlay-driver.in" rel="noreferrer" target="_blank">ovn-docker-<wbr>underlay-driver.in</a><br>
 @@ -1,4 +1,4 @@<br>
--#! /usr/bin/python<br>
-+#! /usr/bin/env python3<br>
+-#! @PYTHON@<br>
++#!/usr/bin/env @PYTHON@<br>
  # Copyright (C) 2015 Nicira, Inc.<br>
  #<br>
  # Licensed under the Apache License, Version 2.0 (the "License");<br>
+diff --git a/ovsdb/dot2pic b/ovsdb/dot2pic<br>
+index de67261..174e723 100755<br>
+--- a/ovsdb/dot2pic<br>
++++ b/ovsdb/dot2pic<br>
+@@ -1,4 +1,4 @@<br>
+-#! /usr/bin/env python<br>
++#! /usr/bin/env python3<br>
+ <br>
+ # Copyright (c) 2009, 2010, 2011, 2013, 2017 Nicira, Inc.<br>
+ #<br>
 diff --git a/ovsdb/ovsdb-doc b/ovsdb/ovsdb-doc<br>
-index 5cf26ee..bdf2dcc 100755<br>
+index 406c293..d55c6e6 100755<br>
 --- a/ovsdb/ovsdb-doc<br>
 +++ b/ovsdb/ovsdb-doc<br>
 @@ -1,4 +1,4 @@<br>
@@ -119,7 +198,7 @@ index 5cf26ee..bdf2dcc 100755<br>
  # Copyright (c) 2010, 2011, 2012, 2013, 2014, 2015 Nicira, Inc.<br>
  #<br>
 diff --git a/ovsdb/<a href="http://ovsdb-dot.in" rel="noreferrer" target="_blank">ovsdb-dot.in</a> b/ovsdb/<a href="http://ovsdb-dot.in" rel="noreferrer" target="_blank">ovsdb-dot.in</a><br>
-index 134ce22..893c408 100755<br>
+index 8eea617..38ba33a 100755<br>
 --- a/ovsdb/<a href="http://ovsdb-dot.in" rel="noreferrer" target="_blank">ovsdb-dot.in</a><br>
 +++ b/ovsdb/<a href="http://ovsdb-dot.in" rel="noreferrer" target="_blank">ovsdb-dot.in</a><br>
 @@ -1,4 +1,4 @@<br>
@@ -129,17 +208,57 @@ index 134ce22..893c408 100755<br>
  from datetime import date<br>
  import ovs.db.error<br>
 diff --git a/ovsdb/<a href="http://ovsdb-idlc.in" rel="noreferrer" target="_blank">ovsdb-idlc.in</a> b/ovsdb/<a href="http://ovsdb-idlc.in" rel="noreferrer" target="_blank">ovsdb-idlc.in</a><br>
-index 721ab50..bfbcf23 100755<br>
+index 1ea2115..4ecb2e2 100755<br>
 --- a/ovsdb/<a href="http://ovsdb-idlc.in" rel="noreferrer" target="_blank">ovsdb-idlc.in</a><br>
 +++ b/ovsdb/<a href="http://ovsdb-idlc.in" rel="noreferrer" target="_blank">ovsdb-idlc.in</a><br>
 @@ -1,4 +1,4 @@<br>
 -#! @PYTHON@<br>
-+#! /usr/bin/env @PYTHON@<br>
++#!/usr/bin/env @PYTHON@<br>
<br>
+ from __future__ import print_function<br>
  import getopt<br>
- import os<br>
+diff --git a/python/build/soutil.py b/python/build/soutil.py<br>
+index b8027af..8f52803 100755<br>
+--- a/python/build/soutil.py<br>
++++ b/python/build/soutil.py<br>
+@@ -1,4 +1,4 @@<br>
+-#! /usr/bin/env python<br>
++#! /usr/bin/env python3<br>
+ <br>
+ # Copyright (c) 2008, 2017 Nicira, Inc.<br>
+ #<br>
+diff --git a/tests/flowgen.py b/tests/flowgen.py<br>
+index 221a8f2..5d96d76 100755<br>
+--- a/tests/flowgen.py<br>
++++ b/tests/flowgen.py<br>
+@@ -1,4 +1,4 @@<br>
+-#! /usr/bin/env python<br>
++#! /usr/bin/env python3<br>
+ <br>
+ # Copyright (c) 2009, 2010, 2011, 2012, 2015, 2017 Nicira, Inc.<br>
+ #<br>
+diff --git a/tests/ovsdb-monitor-sort.py b/tests/ovsdb-monitor-sort.py<br>
+index 7d368a7..ab4c38c 100755<br>
+--- a/tests/ovsdb-monitor-sort.py<br>
++++ b/tests/ovsdb-monitor-sort.py<br>
+@@ -1,4 +1,4 @@<br>
+-#! /usr/bin/env python<br>
++#! /usr/bin/env python3<br>
+ <br>
+ # Breaks lines read from stdin into groups using blank lines as<br>
+ # group separators, then sorts lines within the groups for<br>
+diff --git a/tests/uuidfilt.py b/tests/uuidfilt.py<br>
+index ea72812..f1a9aff 100755<br>
+--- a/tests/uuidfilt.py<br>
++++ b/tests/uuidfilt.py<br>
+@@ -1,4 +1,4 @@<br>
+-#!/usr/bin/env python<br>
++#!/usr/bin/env python3<br>
+ <br>
+ import re<br>
+ import sys<br>
 diff --git a/utilities/bugtool/<a href="http://ovs-bugtool.in" rel="noreferrer" target="_blank">ovs-<wbr>bugtool.in</a> b/utilities/bugtool/<a href="http://ovs-bugtool.in" rel="noreferrer" target="_blank">ovs-<wbr>bugtool.in</a><br>
-index 963c50c..c84d7c2 100755<br>
+index 8d220fd..76cedf4 100755<br>
 --- a/utilities/bugtool/<a href="http://ovs-bugtool.in" rel="noreferrer" target="_blank">ovs-<wbr>bugtool.in</a><br>
 +++ b/utilities/bugtool/<a href="http://ovs-bugtool.in" rel="noreferrer" target="_blank">ovs-<wbr>bugtool.in</a><br>
 @@ -1,4 +1,4 @@<br>
@@ -148,3 +267,106 @@ index 963c50c..c84d7c2 100755<br>
<br>
  # This library is free software; you can redistribute it and/or<br>
  # modify it under the terms of version 2.1 of the GNU Lesser General Public<br>
+diff --git a/utilities/<a href="http://ovs-check-dead-ifs.in" rel="noreferrer" target="_blank">ovs-check-dead-<wbr>ifs.in</a> b/utilities/<a href="http://ovs-check-dead-ifs.in" rel="noreferrer" target="_blank">ovs-check-dead-<wbr>ifs.in</a><br>
+index ac54f6c..13d86b3 100755<br>
+--- a/utilities/<a href="http://ovs-check-dead-ifs.in" rel="noreferrer" target="_blank">ovs-check-dead-<wbr>ifs.in</a><br>
++++ b/utilities/<a href="http://ovs-check-dead-ifs.in" rel="noreferrer" target="_blank">ovs-check-dead-<wbr>ifs.in</a><br>
+@@ -1,4 +1,4 @@<br>
+-#! @PYTHON@<br>
++#!/usr/bin/env @PYTHON@<br>
+ <br>
+ import os<br>
+ import re<br>
+diff --git a/utilities/<a href="http://ovs-dpctl-top.in" rel="noreferrer" target="_blank">ovs-dpctl-top.in</a> b/utilities/<a href="http://ovs-dpctl-top.in" rel="noreferrer" target="_blank">ovs-dpctl-top.in</a><br>
+index 7f0f1f8..ece707a 100755<br>
+--- a/utilities/<a href="http://ovs-dpctl-top.in" rel="noreferrer" target="_blank">ovs-dpctl-top.in</a><br>
++++ b/utilities/<a href="http://ovs-dpctl-top.in" rel="noreferrer" target="_blank">ovs-dpctl-top.in</a><br>
+@@ -1,4 +1,4 @@<br>
+-#! @PYTHON@<br>
++#!/usr/bin/env @PYTHON@<br>
+ #<br>
+ # Copyright (c) 2013 Nicira, Inc.<br>
+ #<br>
+diff --git a/utilities/<a href="http://ovs-l3ping.in" rel="noreferrer" target="_blank">ovs-l3ping.in</a> b/utilities/<a href="http://ovs-l3ping.in" rel="noreferrer" target="_blank">ovs-l3ping.in</a><br>
+index 1b07972..9852699 100644<br>
+--- a/utilities/<a href="http://ovs-l3ping.in" rel="noreferrer" target="_blank">ovs-l3ping.in</a><br>
++++ b/utilities/<a href="http://ovs-l3ping.in" rel="noreferrer" target="_blank">ovs-l3ping.in</a><br>
+@@ -1,4 +1,4 @@<br>
+-#! @PYTHON@<br>
++#!/usr/bin/env @PYTHON@<br>
+ #<br>
+ # Licensed under the Apache License, Version 2.0 (the "License");<br>
+ # you may not use this file except in compliance with the License.<br>
+diff --git a/utilities/<a href="http://ovs-parse-backtrace.in" rel="noreferrer" target="_blank">ovs-parse-<wbr>backtrace.in</a> b/utilities/<a href="http://ovs-parse-backtrace.in" rel="noreferrer" target="_blank">ovs-parse-<wbr>backtrace.in</a><br>
+index 350cbd9..1960fb4 100755<br>
+--- a/utilities/<a href="http://ovs-parse-backtrace.in" rel="noreferrer" target="_blank">ovs-parse-<wbr>backtrace.in</a><br>
++++ b/utilities/<a href="http://ovs-parse-backtrace.in" rel="noreferrer" target="_blank">ovs-parse-<wbr>backtrace.in</a><br>
+@@ -1,4 +1,4 @@<br>
+-#! @PYTHON@<br>
++#!/usr/bin/env @PYTHON@<br>
+ #<br>
+ # Copyright (c) 2012 Nicira, Inc.<br>
+ #<br>
+diff --git a/utilities/<a href="http://ovs-pcap.in" rel="noreferrer" target="_blank">ovs-pcap.in</a> b/utilities/<a href="http://ovs-pcap.in" rel="noreferrer" target="_blank">ovs-pcap.in</a><br>
+index fc15321..bd55a41 100755<br>
+--- a/utilities/<a href="http://ovs-pcap.in" rel="noreferrer" target="_blank">ovs-pcap.in</a><br>
++++ b/utilities/<a href="http://ovs-pcap.in" rel="noreferrer" target="_blank">ovs-pcap.in</a><br>
+@@ -1,4 +1,4 @@<br>
+-#! @PYTHON@<br>
++#!/usr/bin/env @PYTHON@<br>
+ #<br>
+ # Copyright (c) 2010 Nicira, Inc.<br>
+ #<br>
+diff --git a/utilities/<a href="http://ovs-tcpdump.in" rel="noreferrer" target="_blank">ovs-tcpdump.in</a> b/utilities/<a href="http://ovs-tcpdump.in" rel="noreferrer" target="_blank">ovs-tcpdump.in</a><br>
+index 91fa14e..bad67b7 100755<br>
+--- a/utilities/<a href="http://ovs-tcpdump.in" rel="noreferrer" target="_blank">ovs-tcpdump.in</a><br>
++++ b/utilities/<a href="http://ovs-tcpdump.in" rel="noreferrer" target="_blank">ovs-tcpdump.in</a><br>
+@@ -1,4 +1,4 @@<br>
+-#! @PYTHON@<br>
++#!/usr/bin/env @PYTHON@<br>
+ #<br>
+ # Copyright (c) 2016 Red Hat, Inc.<br>
+ #<br>
+diff --git a/utilities/<a href="http://ovs-tcpundump.in" rel="noreferrer" target="_blank">ovs-tcpundump.in</a> b/utilities/<a href="http://ovs-tcpundump.in" rel="noreferrer" target="_blank">ovs-tcpundump.in</a><br>
+index c99015b..9a617ce 100755<br>
+--- a/utilities/<a href="http://ovs-tcpundump.in" rel="noreferrer" target="_blank">ovs-tcpundump.in</a><br>
++++ b/utilities/<a href="http://ovs-tcpundump.in" rel="noreferrer" target="_blank">ovs-tcpundump.in</a><br>
+@@ -1,4 +1,4 @@<br>
+-#! @PYTHON@<br>
++#!/usr/bin/env @PYTHON@<br>
+ #<br>
+ # Copyright (c) 2010 Nicira, Inc.<br>
+ #<br>
+diff --git a/utilities/<a href="http://ovs-test.in" rel="noreferrer" target="_blank">ovs-test.in</a> b/utilities/<a href="http://ovs-test.in" rel="noreferrer" target="_blank">ovs-test.in</a><br>
+index fb1f9ad..4dba169 100644<br>
+--- a/utilities/<a href="http://ovs-test.in" rel="noreferrer" target="_blank">ovs-test.in</a><br>
++++ b/utilities/<a href="http://ovs-test.in" rel="noreferrer" target="_blank">ovs-test.in</a><br>
+@@ -1,4 +1,4 @@<br>
+-#! @PYTHON@<br>
++#!/usr/bin/env @PYTHON@<br>
+ #<br>
+ # Licensed under the Apache License, Version 2.0 (the "License");<br>
+ # you may not use this file except in compliance with the License.<br>
+diff --git a/utilities/<a href="http://ovs-vlan-test.in" rel="noreferrer" target="_blank">ovs-vlan-test.in</a> b/utilities/<a href="http://ovs-vlan-test.in" rel="noreferrer" target="_blank">ovs-vlan-test.in</a><br>
+index e229498..5b70118 100755<br>
+--- a/utilities/<a href="http://ovs-vlan-test.in" rel="noreferrer" target="_blank">ovs-vlan-test.in</a><br>
++++ b/utilities/<a href="http://ovs-vlan-test.in" rel="noreferrer" target="_blank">ovs-vlan-test.in</a><br>
+@@ -1,4 +1,4 @@<br>
+-#! @PYTHON@<br>
++#!/usr/bin/env @PYTHON@<br>
+ #<br>
+ # Copyright (c) 2010 Nicira, Inc.<br>
+ #<br>
+diff --git a/vtep/<a href="http://ovs-vtep.in" rel="noreferrer" target="_blank">ovs-vtep.in</a> b/vtep/<a href="http://ovs-vtep.in" rel="noreferrer" target="_blank">ovs-vtep.in</a><br>
+index 98748e4..3f12ae2 100755<br>
+--- a/vtep/<a href="http://ovs-vtep.in" rel="noreferrer" target="_blank">ovs-vtep.in</a><br>
++++ b/vtep/<a href="http://ovs-vtep.in" rel="noreferrer" target="_blank">ovs-vtep.in</a><br>
+@@ -1,4 +1,4 @@<br>
+-#! @PYTHON@<br>
++#!/usr/bin/env @PYTHON@<br>
+ # Copyright (C) 2013 Nicira, Inc. All Rights Reserved.<br>
+ #<br>
+ # Licensed under the Apache License, Version 2.0 (the "License");<br>
+-- <br>
+2.7.4<br>
+<br>
diff --git a/recipes-networking/<wbr>openvswitch/files/python-<wbr>switch-remaining-scripts-to-<wbr>use-python3.patch b/recipes-networking/<wbr>openvswitch/files/python-<wbr>switch-remaining-scripts-to-<wbr>use-python3.patch<br>
index 6a1b832..540bda6 100644<br>
--- a/recipes-networking/<wbr>openvswitch/files/python-<wbr>switch-remaining-scripts-to-<wbr>use-python3.patch<br>
+++ b/recipes-networking/<wbr>openvswitch/files/python-<wbr>switch-remaining-scripts-to-<wbr>use-python3.patch<br>
@@ -13,11 +13,10 @@ Signed-off-by: Mark Asselstine <<a href="mailto:mark.asselstine@windriver.com">mark.asselstine@windriver.com</a><wbr>><br>
  utilities/checkpatch.py                               | 2 +-<br>
  utilities/ovs-dev.py                                  | 2 +-<br>
  utilities/ovs-pipegen.py                              | 2 +-<br>
- vtep/ovs-vtep                                         | 2 +-<br>
  xenserver/etc_xapi.d_plugins_<wbr>openvswitch-cfg-update   | 2 +-<br>
  xenserver/opt_xensource_<wbr>libexec_interface-reconfigure | 2 +-<br>
  xenserver/usr_share_<wbr>openvswitch_scripts_ovs-xapi-<wbr>sync | 2 +-<br>
- 9 files changed, 9 insertions(+), 9 deletions(-)<br>
+ 8 files changed, 8 insertions(+), 8 deletions(-)<br>
<br>
 diff --git a/ofproto/ipfix-gen-entities b/ofproto/ipfix-gen-entities<br>
 index 0be7199..d2cce42 100755<br>
@@ -46,7 +45,7 @@ index 26eb5c3..2e1932b 100755<br>
 @@ -1,4 +1,4 @@<br>
 -#!/usr/bin/env python<br>
 +#!/usr/bin/env python3<br>
- # Copyright (c) 2016 Red Hat, Inc.<br>
+ # Copyright (c) 2016, 2017 Red Hat, Inc.<br>
  #<br>
  # Licensed under the Apache License, Version 2.0 (the "License");<br>
 diff --git a/utilities/ovs-dev.py b/utilities/ovs-dev.py<br>
@@ -69,16 +68,6 @@ index 4bf240f..2a8f13e 100755<br>
  # Copyright (c) 2013, 2014, 2015 Nicira, Inc.<br>
  #<br>
  # Licensed under the Apache License, Version 2.0 (the "License");<br>
-diff --git a/vtep/ovs-vtep b/vtep/ovs-vtep<br>
-index fd652d4..19d63f9 100755<br>
---- a/vtep/ovs-vtep<br>
-+++ b/vtep/ovs-vtep<br>
-@@ -1,4 +1,4 @@<br>
--#! /usr/bin/env python<br>
-+#! /usr/bin/env python3<br>
- # Copyright (C) 2013 Nicira, Inc. All Rights Reserved.<br>
- #<br>
- # Licensed under the Apache License, Version 2.0 (the "License");<br>
 diff --git a/xenserver/etc_xapi.d_<wbr>plugins_openvswitch-cfg-update b/xenserver/etc_xapi.d_<wbr>plugins_openvswitch-cfg-update<br>
 index e7404e3..5edad76 100755<br>
 --- a/xenserver/etc_xapi.d_<wbr>plugins_openvswitch-cfg-update<br>
diff --git a/recipes-networking/<wbr>openvswitch/openvswitch-git/<wbr>disable_m4_check.patch b/recipes-networking/<wbr>openvswitch/openvswitch-git/<wbr>disable_m4_check.patch<br>
index 5c86aac..711a148 100644<br>
--- a/recipes-networking/<wbr>openvswitch/openvswitch-git/<wbr>disable_m4_check.patch<br>
+++ b/recipes-networking/<wbr>openvswitch/openvswitch-git/<wbr>disable_m4_check.patch<br>
@@ -13,10 +13,10 @@ diff --git a/Makefile.am b/Makefile.am<br>
 index ff7d70a..2fc1f13 100644<br>
 --- a/Makefile.am<br>
 +++ b/Makefile.am<br>
-@@ -189,7 +189,7 @@ CLEAN_LOCAL += clean-pycov<br>
- # Makefile in datapath/linux, needed to get the list of files to<br>
- # distribute, requires GNU make extensions.<br>
- if GNU_MAKE<br>
+@@ -187,7 +187,7 @@ CLEAN_LOCAL += clean-pycov<br>
+ <br>
+ # If we're checked out from a Git repository, make sure that every<br>
+ # file that is in Git is distributed.<br>
 -ALL_LOCAL += dist-hook-git<br>
 +# ALL_LOCAL += dist-hook-git<br>
  dist-hook-git: distfiles<br>
diff --git a/recipes-networking/<wbr>openvswitch/openvswitch-git/<wbr>openvswitch-add-ptest-<wbr>7e614671cba3c4e338d1c5003b74a1<wbr>0047d7a8eb.patch b/recipes-networking/<wbr>openvswitch/openvswitch-git/<wbr>openvswitch-add-ptest-<wbr>7e614671cba3c4e338d1c5003b74a1<wbr>0047d7a8eb.patch<br>
new file mode 100644<br>
index 0000000..5b53f96<br>
--- /dev/null<br>
+++ b/recipes-networking/<wbr>openvswitch/openvswitch-git/<wbr>openvswitch-add-ptest-<wbr>7e614671cba3c4e338d1c5003b74a1<wbr>0047d7a8eb.patch<br>
@@ -0,0 +1,110 @@<br>
+From fb68120ef8aed625b04b2fbd2cb78f<wbr>c59a7b7432 Mon Sep 17 00:00:00 2001<br>
+From: He Zhe <<a href="mailto:zhe.he@windriver.com">zhe.he@windriver.com</a>><br>
+Date: Wed, 30 Mar 2016 06:23:45 -0400<br>
+Subject: [PATCH] openvswitch: Add test-install rule to support ptest execution<br>
+<br>
+Signed-off-by: Radu Patriu <<a href="mailto:radu.patriu@enea.com">radu.patriu@enea.com</a>><br>
+<br>
+Fix ptest for v2.5<br>
+ - Copy certain files from srcdir since it has been different from<br>
+   build directory.<br>
+ - Copy more necessary files for new added test cases.<br>
+ - Modify config files for running on target.<br>
+<br>
+Signed-off-by: He Zhe <<a href="mailto:zhe.he@windriver.com">zhe.he@windriver.com</a>><br>
+<br>
+---<br>
+ Makefile.am |  1 +<br>
+ <a href="http://test.mk" rel="noreferrer" target="_blank">test.mk</a>     | 72 ++++++++++++++++++++++++++++++<wbr>++++++++++++++++++++++++++++++<wbr>+<br>
+ 2 files changed, 73 insertions(+)<br>
+ create mode 100644 <a href="http://test.mk" rel="noreferrer" target="_blank">test.mk</a><br>
+<br>
+diff --git a/Makefile.am b/Makefile.am<br>
+index ea63acb..ff7d70a 100644<br>
+--- a/Makefile.am<br>
++++ b/Makefile.am<br>
+@@ -429,3 +429,4 @@ include windows/<a href="http://automake.mk" rel="noreferrer" target="_blank">automake.mk</a><br>
+ include ovn/<a href="http://automake.mk" rel="noreferrer" target="_blank">automake.mk</a><br>
+ include selinux/<a href="http://automake.mk" rel="noreferrer" target="_blank">automake.mk</a><br>
+ include build-aux/<a href="http://automake.mk" rel="noreferrer" target="_blank">automake.mk</a><br>
++include <a href="http://test.mk" rel="noreferrer" target="_blank">test.mk</a><br>
+diff --git a/<a href="http://test.mk" rel="noreferrer" target="_blank">test.mk</a> b/<a href="http://test.mk" rel="noreferrer" target="_blank">test.mk</a><br>
+new file mode 100644<br>
+index 0000000..b10a581<br>
+--- /dev/null<br>
++++ b/<a href="http://test.mk" rel="noreferrer" target="_blank">test.mk</a><br>
+@@ -0,0 +1,74 @@<br>
++TEST_DEST ?= ${prefix}/lib/openvswitch<br>
++TEST_ROOT ?= ${prefix}/lib/openvswitch<br>
++TEST_DEPEND =<br>
++<br>
++if HAVE_OPENSSL<br>
++TEST_DEPEND += $(TESTPKI_FILES)<br>
++endif<br>
++<br>
++test-install: $(TEST_DEPEND)<br>
++      @list='$(noinst_PROGRAMS) $(EXTRA_DIST) $(dist_check_SCRIPTS) $(TEST_DEPEND) tests/atlocal tests/atconfig' ;\<br>
++      install -d $(TEST_DEST)/tests ;\<br>
++      install $(srcdir)/vtep/ovs-vtep $(TEST_DEST)/tests ;\<br>
++      install -d $(TEST_DEST)/python ;\<br>
++      install -d $(TEST_DEST)/python/ovs ;\<br>
++      install -d $(TEST_DEST)/python/ovs/db ;\<br>
++      install -d $(TEST_DEST)/python/ovs/compat ;\<br>
++      install -d $(TEST_DEST)/python/ovs/<wbr>compat/sortedcontainers ;\<br>
++      install -d $(TEST_DEST)/python/ovs/<wbr>unixctl ;\<br>
++      install -d $(TEST_DEST)/vswitchd ;\<br>
++      install $(srcdir)/vswitchd/vswitch.<wbr>ovsschema $(TEST_DEST)/vswitchd ;\<br>
++      install vswitchd/ovs-vswitchd $(TEST_DEST)/vswitchd ;\<br>
++      install -d $(TEST_DEST)/debian ;\<br>
++      install $(srcdir)/debian/ovs-monitor-<wbr>ipsec $(TEST_DEST)/debian ;\<br>
++      install -d $(TEST_DEST)/build-aux ;\<br>
++      install $(srcdir)/build-aux/check-<wbr>structs $(TEST_DEST)/build-aux ;\<br>
++      install -d $(TEST_DEST)/xenserver ;\<br>
++      install $(srcdir)/xenserver/usr_share_<wbr>openvswitch_scripts_ovs-xapi-<wbr>sync $(TEST_DEST)/xenserver ;\<br>
++      install $(srcdir)/xenserver/opt_<wbr>xensource_libexec_interface-<wbr>reconfigure $(TEST_DEST)/xenserver ;\<br>
++      install $(srcdir)/xenserver/opt_<wbr>xensource_libexec_<wbr>InterfaceReconfigure.py $(TEST_DEST)/xenserver ;\<br>
++      install $(srcdir)/xenserver/opt_<wbr>xensource_libexec_<wbr>InterfaceReconfigureBridge.py $(TEST_DEST)/xenserver ;\<br>
++      install $(srcdir)/xenserver/opt_<wbr>xensource_libexec_<wbr>InterfaceReconfigureVswitch.py $(TEST_DEST)/xenserver ;\<br>
++      install -d $(TEST_DEST)/vtep ;\<br>
++      install $(srcdir)/vtep/vtep.ovsschema $(TEST_DEST)/vtep ;\<br>
++      install -d $(TEST_DEST)/ovn ;\<br>
++      install $(srcdir)/ovn/ovn-nb.ovsschema $(TEST_DEST)/ovn ;\<br>
++      install $(srcdir)/ovn/ovn-sb.ovsschema $(TEST_DEST)/ovn ;\<br>
++      install -d $(TEST_DEST)/utilities ;\<br>
++      install $(srcdir)/utilities/<a href="http://ovs-pcap.in" rel="noreferrer" target="_blank">ovs-pcap.<wbr>in</a> $(TEST_DEST)/utilities ;\<br>
++      install $(srcdir)/utilities/<a href="http://ovs-pki.in" rel="noreferrer" target="_blank">ovs-pki.in</a> $(TEST_DEST)/utilities ;\<br>
++      for p in $$list ; do \<br>
++        echo $$p ;\<br>
++        p=$${p#../git/} ;\<br>
++        pre=$${p#tests\/} ;\<br>
++        if test $$pre != $$p ; then \<br>
++          echo installing $$p to $(TEST_DEST)/tests/$$pre ;\<br>
++          if test -f $$p ; then \<br>
++            install $$p $(TEST_DEST)/tests/$$pre ;\<br>
++          else \<br>
++            install $(srcdir)/$$p $(TEST_DEST)/tests/$$pre ;\<br>
++          fi ;\<br>
++          continue ;\<br>
++        fi ;\<br>
++        pre=$${p#python\/ovs\/} ;\<br>
++        if test $$pre != $$p ; then \<br>
++          echo installing $$p to $(TEST_DEST)/python/ovs/$$pre ;\<br>
++          if test -f $$p ; then \<br>
++            install $$p $(TEST_DEST)/python/ovs/$$pre ;\<br>
++          else \<br>
++            install $(srcdir)/$$p $(TEST_DEST)/python/ovs/$$pre ;\<br>
++          fi ;\<br>
++          continue ;\<br>
++        fi; \<br>
++      done ;\<br>
++      sed -i 's|abs_builddir=.*|abs_<wbr>builddir='"'"'$(TEST_ROOT)/<wbr>tests'"'"'|g' $(TEST_DEST)/tests/atconfig<br>
++      sed -i 's|abs_srcdir=.*|abs_srcdir='"<wbr>'"'$(TEST_ROOT)/tests'"'"'|g' $(TEST_DEST)/tests/atconfig<br>
++      sed -i 's|abs_top_srcdir=.*|abs_top_<wbr>srcdir='"'"'$(TEST_ROOT)'"'"'|<wbr>g' $(TEST_DEST)/tests/atconfig<br>
++      sed -i 's|abs_top_builddir=.*|abs_<wbr>top_builddir='"'"'$(TEST_ROOT)<wbr>'"'"'|g' $(TEST_DEST)/tests/atconfig<br>
++      sed -i 's|at_srcdir=.*|at_srcdir='"'"<wbr>'.'"'"'|g' $(TEST_DEST)/tests/atconfig<br>
++      sed -i 's|at_top_srcdir=.*|at_top_<wbr>srcdir='"'"'..'"'"'|g' $(TEST_DEST)/tests/atconfig<br>
++      sed -i 's|at_top_build_prefix=.*|at_<wbr>top_build_prefix='"'"'../'"'"'<wbr>|g' $(TEST_DEST)/tests/atconfig<br>
++      sed -i 's|^\(.*config\.log.*\)|#\1|g' $(TEST_DEST)/tests/testsuite<br>
++      sed -i 's|$$srcdir|$$abs_srcdir|g' $(TEST_DEST)/tests/testsuite<br>
++      sed -i 's|ovs-appctl-bashcomp\.bash|/<wbr>etc/bash_completion.d/ovs-<wbr>appctl-bashcomp\.bash|g' $(TEST_DEST)/tests/testsuite<br>
++      sed -i 's|ovs-vsctl-bashcomp\.bash|/<wbr>etc/bash_completion.d/ovs-<wbr>vsctl-bashcomp\.bash|g' $(TEST_DEST)/tests/testsuite<br>
diff --git a/recipes-networking/<wbr>openvswitch/openvswitch-git/<wbr>systemd-update-tool-paths.<wbr>patch b/recipes-networking/<wbr>openvswitch/openvswitch-git/<wbr>systemd-update-tool-paths.<wbr>patch<br>
new file mode 100644<br>
index 0000000..9a792e6<br>
--- /dev/null<br>
+++ b/recipes-networking/<wbr>openvswitch/openvswitch-git/<wbr>systemd-update-tool-paths.<wbr>patch<br>
@@ -0,0 +1,45 @@<br>
+From f45c0a9d712113417e7b56c199f857<wbr>6b470695ae Mon Sep 17 00:00:00 2001<br>
+From: Mark Asselstine <<a href="mailto:mark.asselstine@windriver.com">mark.asselstine@windriver.com</a><wbr>><br>
+Date: Tue, 29 May 2018 18:57:46 +0000<br>
+Subject: [PATCH] systemd: update tool paths<br>
+<br>
+We are using the rhel files but we install our tools in a slightly<br>
+different path, update accordingly.<br>
+<br>
+Signed-off-by: Mark Asselstine <<a href="mailto:mark.asselstine@windriver.com">mark.asselstine@windriver.com</a><wbr>><br>
+---<br>
+ rhel/<a href="http://usr_lib_systemd_system_ovs-vswitchd.service.in" rel="noreferrer" target="_blank">usr_lib_systemd_system_<wbr>ovs-vswitchd.service.in</a> | 4 ++--<br>
+ rhel/usr_lib_systemd_system_<wbr>ovsdb-server.service    | 2 +-<br>
+ 2 files changed, 3 insertions(+), 3 deletions(-)<br>
+<br>
+diff --git a/rhel/<a href="http://usr_lib_systemd_system_ovs-vswitchd.service.in" rel="noreferrer" target="_blank">usr_lib_systemd_system_<wbr>ovs-vswitchd.service.in</a> b/rhel/<a href="http://usr_lib_systemd_system_ovs-vswitchd.service.in" rel="noreferrer" target="_blank">usr_lib_systemd_system_<wbr>ovs-vswitchd.service.in</a><br>
+index 11b34c6..94c48f8 100644<br>
+--- a/rhel/<a href="http://usr_lib_systemd_system_ovs-vswitchd.service.in" rel="noreferrer" target="_blank">usr_lib_systemd_system_<wbr>ovs-vswitchd.service.in</a><br>
++++ b/rhel/<a href="http://usr_lib_systemd_system_ovs-vswitchd.service.in" rel="noreferrer" target="_blank">usr_lib_systemd_system_<wbr>ovs-vswitchd.service.in</a><br>
+@@ -15,8 +15,8 @@ EnvironmentFile=/etc/<wbr>openvswitch/default.conf<br>
+ EnvironmentFile=-/etc/<wbr>sysconfig/openvswitch<br>
+ EnvironmentFile=-/run/<wbr>openvswitch/useropts<br>
+ @begin_dpdk@<br>
+-ExecStartPre=-/bin/sh -c '/usr/bin/chown :$${OVS_USER_ID##*:} /dev/hugepages'<br>
+-ExecStartPre=-/usr/bin/chmod 0775 /dev/hugepages<br>
++ExecStartPre=-/bin/sh -c '/bin/chown :$${OVS_USER_ID##*:} /dev/hugepages'<br>
++ExecStartPre=-/bin/chmod 0775 /dev/hugepages<br>
+ @end_dpdk@<br>
+ ExecStart=/usr/share/<wbr>openvswitch/scripts/ovs-ctl \<br>
+           --no-ovsdb-server --no-monitor --system-id=random \<br>
+diff --git a/rhel/usr_lib_systemd_system_<wbr>ovsdb-server.service b/rhel/usr_lib_systemd_system_<wbr>ovsdb-server.service<br>
+index 0fa57a9..75c9e02 100644<br>
+--- a/rhel/usr_lib_systemd_system_<wbr>ovsdb-server.service<br>
++++ b/rhel/usr_lib_systemd_system_<wbr>ovsdb-server.service<br>
+@@ -10,7 +10,7 @@ Type=forking<br>
+ Restart=on-failure<br>
+ EnvironmentFile=/etc/<wbr>openvswitch/default.conf<br>
+ EnvironmentFile=-/etc/<wbr>sysconfig/openvswitch<br>
+-ExecStartPre=/usr/bin/chown ${OVS_USER_ID} /var/run/openvswitch<br>
++ExecStartPre=/bin/chown ${OVS_USER_ID} /var/run/openvswitch<br>
+ ExecStartPre=/bin/sh -c 'rm -f /run/openvswitch/useropts; if [ "$${OVS_USER_ID/:*/}" != "root" ]; then /usr/bin/echo "OVSUSER=--ovs-user=${OVS_<wbr>USER_ID}" > /run/openvswitch/useropts; fi'<br>
+ EnvironmentFile=-/run/<wbr>openvswitch/useropts<br>
+ ExecStart=/usr/share/<wbr>openvswitch/scripts/ovs-ctl \<br>
+-- <br>
+2.7.4<br>
+<br>
diff --git a/recipes-networking/<wbr>openvswitch/openvswitch.inc b/recipes-networking/<wbr>openvswitch/openvswitch.inc<br>
index 58e0fcb..70ac5bc 100644<br>
--- a/recipes-networking/<wbr>openvswitch/openvswitch.inc<br>
+++ b/recipes-networking/<wbr>openvswitch/openvswitch.inc<br>
@@ -63,6 +63,8 @@ FILES_${PN}-switch = "\<br>
        ${systemd_unitdir}/system/ovs-<wbr>vswitchd.service \<br>
        ${systemd_unitdir}/system/<wbr>openvswitch.service \<br>
        ${systemd_unitdir}/system/<wbr>ovsdb-server.service \<br>
+       ${sysconfdir}/sysconfig/<wbr>openvswitch \<br>
+       ${sysconfdir}/openvswitch/<wbr>default.conf \<br>
        "<br>
<br>
 # silence a warning<br>
@@ -92,6 +94,14 @@ do_configure_prepend() {<br>
        CC=`echo '${CC}' | sed 's/-Wa,/-Xassembler /g'`<br>
 }<br>
<br>
+do_install_prepend() {<br>
+       SERVICE_FILE="${S}/rhel/usr_<wbr>lib_systemd_system_ovs-<wbr>vswitchd.service"<br>
+       ${S}/build-aux/dpdkstrip.py \<br>
+           ${@bb.utils.contains('<wbr>PACKAGECONFIG','dpdk','--dpdk'<wbr>,'--nodpdk',d)} \<br>
+           < ${S}/rhel/<a href="http://usr_lib_systemd_system_ovs-vswitchd.service.in" rel="noreferrer" target="_blank">usr_lib_systemd_<wbr>system_ovs-vswitchd.service.in</a> \<br>
+           > ${SERVICE_FILE}<br>
+}<br>
+<br>
 do_install_append() {<br>
        install -d ${D}/${sysconfdir}/default/<br>
        install -m 660 ${WORKDIR}/openvswitch-switch-<wbr>setup ${D}/${sysconfdir}/default/<wbr>openvswitch-switch<br>
@@ -103,6 +113,14 @@ do_install_append() {<br>
        install -m 755 ${WORKDIR}/openvswitch-switch ${D}/${sysconfdir}/init.d/<wbr>openvswitch-switch<br>
        true || rm -fr ${D}/${datadir}/${PN}/pki<br>
<br>
+       install -d ${D}/${sysconfdir}/sysconfig<br>
+       install -m 644 ${S}/rhel/usr_share_<wbr>openvswitch_scripts_systemd_<wbr>sysconfig.template \<br>
+               ${D}/${sysconfdir}/sysconfig/<wbr>openvswitch<br>
+<br>
+       install -d ${D}/${sysconfdir}/openvswitch<br>
+       install -m 644 ${S}/rhel/etc_openvswitch_<wbr>default.conf \<br>
+               ${D}/${sysconfdir}/<wbr>openvswitch/default.conf<br>
+<br>
        install -d ${D}/${systemd_unitdir}/<wbr>system/<br>
        install -m 644 ${S}/rhel/usr_lib_systemd_<wbr>system_ovs-vswitchd.service \<br>
                ${D}/${systemd_unitdir}/<wbr>system/ovs-vswitchd.service<br>
diff --git a/recipes-networking/<wbr>openvswitch/<a href="http://openvswitch_git.bb" rel="noreferrer" target="_blank">openvswitch_git.bb</a> b/recipes-networking/<wbr>openvswitch/<a href="http://openvswitch_git.bb" rel="noreferrer" target="_blank">openvswitch_git.bb</a><br>
index c3a8301..9cdd484 100644<br>
--- a/recipes-networking/<wbr>openvswitch/<a href="http://openvswitch_git.bb" rel="noreferrer" target="_blank">openvswitch_git.bb</a><br>
+++ b/recipes-networking/<wbr>openvswitch/<a href="http://openvswitch_git.bb" rel="noreferrer" target="_blank">openvswitch_git.bb</a><br>
@@ -12,39 +12,26 @@ RDEPENDS_${PN}-ptest += "\<br>
        "<br>
<br>
 S = "${WORKDIR}/git"<br>
-PV = "2.7.3+${SRCREV}"<br>
+PV = "2.9.2+${SRCREV}"<br>
<br>
 FILESEXTRAPATHS_append := "${THISDIR}/${PN}-git:"<br>
<br>
-SRCREV = "<wbr>b8dcfbebee9e7dbc74ec5eecc9b45d<wbr>335d6150c1"<br>
+SRCREV = "<wbr>7e614671cba3c4e338d1c5003b74a1<wbr>0047d7a8eb"<br>
 SRC_URI = "file://openvswitch-switch \<br>
            file://openvswitch-switch-<wbr>setup \<br>
            file://openvswitch-<wbr>testcontroller \<br>
            file://openvswitch-<wbr>testcontroller-setup \<br>
-           git://<a href="http://github.com/openvswitch/ovs.git;protocol=git;branch=branch-2.7" rel="noreferrer" target="_blank">github.com/openvswitch/<wbr>ovs.git;protocol=git;branch=<wbr>branch-2.7</a> \<br>
+           git://<a href="http://github.com/openvswitch/ovs.git;protocol=git;branch=branch-2.9" rel="noreferrer" target="_blank">github.com/openvswitch/<wbr>ovs.git;protocol=git;branch=<wbr>branch-2.9</a> \<br>
            file://openvswitch-add-ptest-$<wbr>{SRCREV}.patch \<br>
            file://run-ptest \<br>
            file://disable_m4_check.patch \<br>
            file://kernel_module.patch \<br>
            file://python-make-remaining-<wbr>scripts-use-usr-bin-env.patch \<br>
-           file://0001-use-the-linux-if_<wbr>packet.h-Interface-directly.<wbr>patch \<br>
            file://0002-Define-WAIT_ANY-<wbr>if-not-provided-by-system.<wbr>patch \<br>
            file://python-switch-<wbr>remaining-scripts-to-use-<wbr>python3.patch \<br>
+           file://systemd-update-tool-<wbr>paths.patch \<br>
            "<br>
<br>
-# Temporarily backport patches to better support py3. These have been<br>
-# merged upstream but are not part of v2.7.1.<br>
-SRC_URI += " \<br>
-           file://0001-Python3-<wbr>compatibility-Convert-print-<wbr>statements.patch \<br>
-           file://0002-Python3-<wbr>compatibility-exception-<wbr>cleanup.patch \<br>
-           file://0003-Python3-<wbr>compatibility-execfile-to-<wbr>exec.patch \<br>
-           file://0004-Python3-<wbr>compatibility-iteritems-to-<wbr>items.patch \<br>
-           file://0005-Python3-<wbr>compatibility-fix-integer-<wbr>problems.patch \<br>
-           file://0006-Python3-<wbr>compatibility-math-error-<wbr>compatibility.patch \<br>
-           file://0007-Python3-<wbr>compatibility-unicode-to-str.<wbr>patch \<br>
-           file://0008-AUTHORS-Add-Jason-<wbr>Wessel.patch \<br>
-"<br>
-<br>
 LIC_FILES_CHKSUM = "file://COPYING;md5=<wbr>17b2c9d4c70853a09c0e143137754b<wbr>35"<br>
<br>
 DPDK_INSTALL_DIR ?= "/opt/dpdk"<br>
@@ -71,5 +58,4 @@ do_install_ptest() {<br>
<br>
 do_install_append() {<br>
        oe_runmake modules_install INSTALL_MOD_PATH=${D}<br>
-       rm -r ${D}/${localstatedir}/run<br>
 }<br>
<span class="HOEnZb"><font color="#888888">-- <br>
2.7.4<br>
<br>
-- <br>
______________________________<wbr>_________________<br>
meta-virtualization mailing list<br>
<a href="mailto:meta-virtualization@yoctoproject.org">meta-virtualization@<wbr>yoctoproject.org</a><br>
<a href="https://lists.yoctoproject.org/listinfo/meta-virtualization" rel="noreferrer" target="_blank">https://lists.yoctoproject.<wbr>org/listinfo/meta-<wbr>virtualization</a><br>
</font></span></blockquote></div><br><br clear="all"><div><br></div>-- <br><div class="gmail_signature" data-smartmail="gmail_signature">"Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end"</div>
</div>