diff options
Diffstat (limited to 'recipes-networking/openvswitch/openvswitch.inc')
-rw-r--r-- | recipes-networking/openvswitch/openvswitch.inc | 23 |
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 = "\ | |||
31 | file://openvswitch-switch-setup \ | 31 | file://openvswitch-switch-setup \ |
32 | file://openvswitch-testcontroller \ | 32 | file://openvswitch-testcontroller \ |
33 | file://openvswitch-testcontroller-setup \ | 33 | file://openvswitch-testcontroller-setup \ |
34 | file://openvswitch-add-target-python-handling.patch \ | ||
35 | file://openvswitch-add-target-perl-handling.patch \ | ||
36 | " | 34 | " |
37 | 35 | ||
38 | EXTRA_OECONF += "\ | 36 | EXTRA_OECONF += "\ |
39 | TARGET_PYTHON=${bindir}/python \ | 37 | PYTHON=${bindir}/python \ |
40 | TARGET_PERL=${bindir}/perl \ | 38 | PYTHON3=${bindir}/python3 \ |
39 | PERL=${bindir}/perl \ | ||
41 | " | 40 | " |
42 | CONFIGUREOPT_DEPTRACK = "" | 41 | CONFIGUREOPT_DEPTRACK = "" |
43 | 42 | ||
@@ -61,8 +60,9 @@ FILES_${PN}-brcompat = "${sbindir}/ovs-brcompatd" | |||
61 | FILES_${PN}-switch = "\ | 60 | FILES_${PN}-switch = "\ |
62 | ${sysconfdir}/init.d/openvswitch-switch \ | 61 | ${sysconfdir}/init.d/openvswitch-switch \ |
63 | ${sysconfdir}/default/openvswitch-switch \ | 62 | ${sysconfdir}/default/openvswitch-switch \ |
63 | ${systemd_unitdir}/system/ovs-vswitchd.service \ | ||
64 | ${systemd_unitdir}/system/openvswitch.service \ | 64 | ${systemd_unitdir}/system/openvswitch.service \ |
65 | ${systemd_unitdir}/system/openvswitch-nonetwork.service \ | 65 | ${systemd_unitdir}/system/ovsdb-server.service \ |
66 | " | 66 | " |
67 | 67 | ||
68 | # silence a warning | 68 | # silence a warning |
@@ -74,8 +74,9 @@ inherit autotools update-rc.d systemd python-dir | |||
74 | 74 | ||
75 | SYSTEMD_PACKAGES = "${PN}-switch" | 75 | SYSTEMD_PACKAGES = "${PN}-switch" |
76 | SYSTEMD_SERVICE_${PN}-switch = " \ | 76 | SYSTEMD_SERVICE_${PN}-switch = " \ |
77 | openvswitch-nonetwork.service \ | 77 | ovsdb-server.service \ |
78 | openvswitch-switch.service \ | 78 | ovs-vswitchd.service \ |
79 | openvswitch.service \ | ||
79 | " | 80 | " |
80 | 81 | ||
81 | INITSCRIPT_PACKAGES = "${PN}-switch ${PN}-testcontroller" | 82 | INITSCRIPT_PACKAGES = "${PN}-switch ${PN}-testcontroller" |
@@ -97,10 +98,12 @@ do_install_append() { | |||
97 | true || rm -fr ${D}/${datadir}/${PN}/pki | 98 | true || rm -fr ${D}/${datadir}/${PN}/pki |
98 | 99 | ||
99 | install -d ${D}/${systemd_unitdir}/system/ | 100 | install -d ${D}/${systemd_unitdir}/system/ |
101 | install -m 644 ${S}/rhel/usr_lib_systemd_system_ovs-vswitchd.service \ | ||
102 | ${D}/${systemd_unitdir}/system/ovs-vswitchd.service | ||
100 | install -m 644 ${S}/rhel/usr_lib_systemd_system_openvswitch.service \ | 103 | install -m 644 ${S}/rhel/usr_lib_systemd_system_openvswitch.service \ |
101 | ${D}/${systemd_unitdir}/system/openvswitch-switch.service | 104 | ${D}/${systemd_unitdir}/system/openvswitch.service |
102 | install -m 644 ${S}/rhel/usr_lib_systemd_system_openvswitch-nonetwork.service \ | 105 | install -m 644 ${S}/rhel/usr_lib_systemd_system_ovsdb-server.service \ |
103 | ${D}/${systemd_unitdir}/system/openvswitch-nonetwork.service | 106 | ${D}/${systemd_unitdir}/system/ovsdb-server.service |
104 | 107 | ||
105 | oe_runmake modules_install INSTALL_MOD_PATH=${D} | 108 | oe_runmake modules_install INSTALL_MOD_PATH=${D} |
106 | install -d ${D}${libdir}/python${PYTHON_BASEVERSION}/site-packages | 109 | install -d ${D}${libdir}/python${PYTHON_BASEVERSION}/site-packages |