openvswitch: uprev to v2.9.2

This brings us up to date with the latest upstream release. I suspect
there will be an upcoming release to add compatibility with DPDK
v18.05 (the DPDK release is due out any day now) but getting this
fairly large release bump out of the way first will facilitate any
upcoming uprev.

We are able to drop they python3 patches as they have been merged
upstream. Some scripts which needed to be updated to use python3
disappeared, new ones appeared so the 'use python3' patches are
updated accordingly. Beyond this the biggest change is related to the
systemd unit files, the ovsdb-server has been updated upstream to be
generated on the fly via the spec file, we mimic this in the
install_prepend. We also add the various configuration files which the
unit files source before launching the services.

As usual this was tested against out typical usecases including usage
in meta-overc. As well the ptests have been run and the results are no
better or worse.

   Previous version:
    ERROR: 2332 tests were run,
    21 failed unexpectedly.
    3 tests were skipped.

   New version:
    ERROR: 2527 tests were run,
    29 failed unexpectedly.
    3 tests were skipped.

Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>

1 files changed, 18 insertions, 0 deletions

diff --git a/recipes-networking/openvswitch/openvswitch.inc b/recipes-networking/openvswitch/openvswitch.inc
index 58e0fcb0..70ac5bc5 100644
--- a/recipes-networking/openvswitch/openvswitch.inc
+++ b/recipes-networking/openvswitch/openvswitch.inc
@@ -63,6 +63,8 @@ FILES_${PN}-switch = "\
         ${systemd_unitdir}/system/ovs-vswitchd.service \
         ${systemd_unitdir}/system/openvswitch.service \
         ${systemd_unitdir}/system/ovsdb-server.service \
+        ${sysconfdir}/sysconfig/openvswitch \
+        ${sysconfdir}/openvswitch/default.conf \
         "
 
 # silence a warning
@@ -92,6 +94,14 @@ do_configure_prepend() {
         CC=`echo '${CC}' | sed 's/-Wa,/-Xassembler /g'`
 }
 
+do_install_prepend() {
+        SERVICE_FILE="${S}/rhel/usr_lib_systemd_system_ovs-vswitchd.service"
+        ${S}/build-aux/dpdkstrip.py \
+            ${@bb.utils.contains('PACKAGECONFIG','dpdk','--dpdk','--nodpdk',d)} \
+            < ${S}/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in \
+            > ${SERVICE_FILE}
+}
+
 do_install_append() {
         install -d ${D}/${sysconfdir}/default/
         install -m 660 ${WORKDIR}/openvswitch-switch-setup ${D}/${sysconfdir}/default/openvswitch-switch
@@ -103,6 +113,14 @@ do_install_append() {
         install -m 755 ${WORKDIR}/openvswitch-switch ${D}/${sysconfdir}/init.d/openvswitch-switch
         true || rm -fr ${D}/${datadir}/${PN}/pki
 
+        install -d ${D}/${sysconfdir}/sysconfig
+        install -m 644 ${S}/rhel/usr_share_openvswitch_scripts_systemd_sysconfig.template \
+                ${D}/${sysconfdir}/sysconfig/openvswitch
+
+        install -d ${D}/${sysconfdir}/openvswitch
+        install -m 644 ${S}/rhel/etc_openvswitch_default.conf \
+                ${D}/${sysconfdir}/openvswitch/default.conf
+
         install -d ${D}/${systemd_unitdir}/system/
         install -m 644 ${S}/rhel/usr_lib_systemd_system_ovs-vswitchd.service \
                 ${D}/${systemd_unitdir}/system/ovs-vswitchd.service