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, 2 insertions, 14 deletions

diff --git a/meta-systemd/oe-core/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.0.bbappend b/meta-systemd/oe-core/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.0.bbappend
index a94b00725..d0ce87eb0 100644
--- a/meta-systemd/oe-core/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.0.bbappend
+++ b/meta-systemd/oe-core/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.0.bbappend
@@ -1,15 +1,3 @@
-PRINC := "${@int(PRINC) + 2}"
+PRINC := "${@int(PRINC) + 3}"
 
-inherit systemd
-
-SYSTEMD_PACKAGES = "${PN}-systemd"
-SYSTEMD_SERVICE = "wpa_supplicant.service"
-SYSTEMD_AUTO_ENABLE = "disable"
-
-do_install_append () {
-    install -d ${D}${systemd_unitdir}/system
-    install -m 644 ${S}/wpa_supplicant/systemd/*.service ${D}${systemd_unitdir}/system
-}
-
-# systemd.bbclass does not catch all multiple-instance-service-files
-FILES_${PN}-systemd += "${systemd_unitdir}/system/"
+RPROVIDES_${PN} += "${PN}-systemd"