meta-systemd: Append ${PN} to SYSTEMD_SERVICE

When using systemd class from OE-Core we also need
to install the units explicitly.

systemd packages ending with -systemd are consumed
and now provided by package proper.

MJ: fix RPROVIDES_PN = PN-systemd in entrance
MJ: add RPROVIDES for ntp*-systemd in ntp
MJ: the same for wpa-supplicant

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

1 files changed, 11 insertions, 2 deletions

diff --git a/meta-systemd/meta-oe/recipes-extended/net-snmp/net-snmp_5.7.1.bbappend b/meta-systemd/meta-oe/recipes-extended/net-snmp/net-snmp_5.7.1.bbappend
index f221c1d7d..dfe68f20d 100644
--- a/meta-systemd/meta-oe/recipes-extended/net-snmp/net-snmp_5.7.1.bbappend
+++ b/meta-systemd/meta-oe/recipes-extended/net-snmp/net-snmp_5.7.1.bbappend
@@ -9,11 +9,20 @@ SRC_URI += " \
         file://snmpd.service \
         file://snmptrapd.service \
 "
+do_install_append() {
+        install -d ${D}${systemd_unitdir}/system
+        install -m 0644 ${WORKDIR}/snmpd.service ${D}${systemd_unitdir}/system
+        install -m 0644 ${WORKDIR}/snmptrapd.service ${D}${systemd_unitdir}/system
+}
 
 EXTRA_OECONF += "--with-systemd"
 
 SYSTEMD_PACKAGES = "${PN}-server-snmpd-systemd \
                     ${PN}-server-snmptrapd-systemd"
 
-SYSTEMD_SERVICE_${PN}-server-snmpd-systemd = "snmpd.service"
-SYSTEMD_SERVICE_${PN}-server-snmptrapd-systemd =  "snmptrapd.service"
+SYSTEMD_SERVICE_${PN}-server-snmpd = "snmpd.service"
+SYSTEMD_SERVICE_${PN}-server-snmptrapd =  "snmptrapd.service"
+RPROVIDES_${PN}-server-snmpd += "${PN}-server-snmpd-systemd"
+RPROVIDES_${PN}-server-snmptrapd += "${PN}-server-snmptrapd-systemd"
+FILES_${PN}-server-snmpd += "${systemd_unitdir}/system/snmpd.service"
+FILES_${PN}-server-snmptrapd += "${systemd_unitdir}/system/snmptrapd.service"