1 files changed, 13 insertions, 10 deletions

diff --git a/recipes-networking/openvswitch/openvswitch.inc b/recipes-networking/openvswitch/openvswitch.inc
index 3c70703a..ab1f8feb 100644
--- a/recipes-networking/openvswitch/openvswitch.inc
+++ b/recipes-networking/openvswitch/openvswitch.inc
@@ -31,13 +31,12 @@ SRC_URI = "\
         file://openvswitch-switch-setup \
         file://openvswitch-testcontroller \
         file://openvswitch-testcontroller-setup \
-        file://openvswitch-add-target-python-handling.patch \
-        file://openvswitch-add-target-perl-handling.patch \
         "
 
 EXTRA_OECONF += "\
-        TARGET_PYTHON=${bindir}/python \
-        TARGET_PERL=${bindir}/perl \
+        PYTHON=${bindir}/python \
+        PYTHON3=${bindir}/python3 \
+        PERL=${bindir}/perl \
         "
 CONFIGUREOPT_DEPTRACK = ""
 
@@ -61,8 +60,9 @@ FILES_${PN}-brcompat = "${sbindir}/ovs-brcompatd"
 FILES_${PN}-switch = "\
         ${sysconfdir}/init.d/openvswitch-switch \
         ${sysconfdir}/default/openvswitch-switch \
+        ${systemd_unitdir}/system/ovs-vswitchd.service \
         ${systemd_unitdir}/system/openvswitch.service \
-        ${systemd_unitdir}/system/openvswitch-nonetwork.service \
+        ${systemd_unitdir}/system/ovsdb-server.service \
         "
 
 # silence a warning
@@ -74,8 +74,9 @@ inherit autotools update-rc.d systemd python-dir
 
 SYSTEMD_PACKAGES = "${PN}-switch"
 SYSTEMD_SERVICE_${PN}-switch = " \
-    openvswitch-nonetwork.service \
-    openvswitch-switch.service \
+    ovsdb-server.service \
+    ovs-vswitchd.service \
+    openvswitch.service \
 "
 
 INITSCRIPT_PACKAGES = "${PN}-switch ${PN}-testcontroller"
@@ -97,10 +98,12 @@ do_install_append() {
         true || rm -fr ${D}/${datadir}/${PN}/pki
 
         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
         install -m 644 ${S}/rhel/usr_lib_systemd_system_openvswitch.service \
-                ${D}/${systemd_unitdir}/system/openvswitch-switch.service
-        install -m 644 ${S}/rhel/usr_lib_systemd_system_openvswitch-nonetwork.service \
-                ${D}/${systemd_unitdir}/system/openvswitch-nonetwork.service
+                ${D}/${systemd_unitdir}/system/openvswitch.service
+        install -m 644 ${S}/rhel/usr_lib_systemd_system_ovsdb-server.service \
+                ${D}/${systemd_unitdir}/system/ovsdb-server.service
 
         oe_runmake modules_install INSTALL_MOD_PATH=${D}
         install -d ${D}${libdir}/python${PYTHON_BASEVERSION}/site-packages