diff options
Diffstat (limited to 'import-layers/meta-virtualization/recipes-networking/openvswitch/openvswitch.inc')
| -rw-r--r-- | import-layers/meta-virtualization/recipes-networking/openvswitch/openvswitch.inc | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/import-layers/meta-virtualization/recipes-networking/openvswitch/openvswitch.inc b/import-layers/meta-virtualization/recipes-networking/openvswitch/openvswitch.inc index 3c70703a73..1f0b52b3be 100644 --- a/import-layers/meta-virtualization/recipes-networking/openvswitch/openvswitch.inc +++ b/import-layers/meta-virtualization/recipes-networking/openvswitch/openvswitch.inc @@ -11,11 +11,11 @@ HOMEPAGE = "http://openvswitch.org/" SECTION = "networking" LICENSE = "Apache-2" -DEPENDS += "bridge-utils openssl python perl" +DEPENDS += "bridge-utils openssl python perl python-six-native coreutils-native" RDEPENDS_${PN} += "util-linux-uuidgen util-linux-libuuid coreutils \ python perl perl-module-strict ${PN}-switch \ - bash python-twisted" + bash python-twisted python-six" RDEPENDS_${PN}-testcontroller = "${PN} lsb ${PN}-pki" RDEPENDS_${PN}-switch = "${PN} openssl procps util-linux-uuidgen" RDEPENDS_${PN}-pki = "${PN}" @@ -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=python \ + PYTHON3=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 @@ -70,12 +70,13 @@ FILES_${PN} += "${datadir}/ovsdbmonitor" FILES_${PN} += "/run" FILES_${PN} += "${libdir}/python${PYTHON_BASEVERSION}/" -inherit autotools update-rc.d systemd python-dir +inherit autotools update-rc.d systemd pythonnative 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 |