osmo-bts: systemd service name changed

Systemd service name changed upstream from sysmobts to osmo-bts-sysmo.

recipes-sysmobts/osmo-bts/osmo-bts_git.bb

@@ -17,8 +17,9 @@ RCONFLICTS_${PN} = "sysmobts-firmware (< 5.1)"
 
 EXTRA_OECONF += "--enable-sysmocom-bts"
 
-inherit autotools update-rc.d pkgconfig
+inherit autotools update-rc.d pkgconfig systemd
 
+SYSTEMD_SERVICE_${PN} = "osmo-bts-sysmo.service"
 
 # Select the API version
 inherit femtobts_api
@@ -42,15 +43,9 @@ do_install_append() {
 	install -d ${D}${sysconfdir}/init.d
 	install -m 0755 ${S}/contrib/sysmobts.init ${D}${sysconfdir}/init.d/sysmobts
 
-	# Install systemd and enable on sysinit
-	install -d ${D}${systemd_unitdir}/system/multi-user.target.wants/
-	install -m 0644 ${S}/contrib/sysmobts.service ${D}${systemd_unitdir}/system/
-	ln -sf ../sysmobts.service ${D}${systemd_unitdir}/system/multi-user.target.wants/
-
-	# Future sysmobts-mgr handling
-	install -m 0660 ${S}/doc/examples/sysmobts-mgr.cfg ${D}${sysconfdir}/osmocom
-	install -m 0644 ${S}/contrib/sysmobts-mgr.service ${D}${systemd_unitdir}/system/
-	ln -sf ../sysmobts-mgr.service ${D}${systemd_unitdir}/system/multi-user.target.wants/
+  # Install systemd services (enabled by default)
+  install -d ${D}/${systemd_unitdir}/system
+  install -m 644 ${S}/contrib/*.service ${D}/${systemd_unitdir}/system
 }
 
 do_install_append_sysmobts-v2() {
@@ -65,7 +60,6 @@ INITSCRIPT_PARAMS_${PN} = "defaults 30 30"
 
 PACKAGES =+ "osmo-bts-remote sysmobts-calib sysmobts-util"
 
-FILES_${PN} += "${systemd_unitdir}"
 FILES_osmo-bts-remote = " ${bindir}/sysmobts-remote "
 FILES_sysmobts-calib = " ${bindir}/sysmobts-calib "
 FILES_sysmobts-util = " ${bindir}/sysmobts-util "

recipes-sysmobts/osmo-pcu/osmo-pcu_git.bb

@@ -15,17 +15,14 @@ RDEPENDS_${PN} = "osmo-bts (>= 0.4.0)"
 
 EXTRA_OECONF_sysmobts-v2 += "--enable-sysmocom-bts --enable-sysmocom-dsp"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig systemd
 
 # Select the API version
 inherit femtobts_api
 CPPFLAGS += " ${BTS_HW_VERSION} "
 
 do_install_append() {
-        # Install systemd and enable on sysinit
-        install -d ${D}${systemd_unitdir}/system/multi-user.target.wants/
-        install -m 0644 ${S}/contrib/sysmopcu.service ${D}${systemd_unitdir}/system/
-        ln -sf ../sysmopcu.service ${D}${systemd_unitdir}/system/multi-user.target.wants/
+  # Install systemd services (enabled by default)
+  install -d ${D}/${systemd_unitdir}/system
+  install -m 644 ${S}/contrib/*.service ${D}/${systemd_unitdir}/system
 }
-
-FILES_${PN} += "${systemd_unitdir}"