diff options
| author | Pau Espin Pedrol <pespin@sysmocom.de> | 2018-09-07 15:56:57 +0200 |
|---|---|---|
| committer | Pau Espin Pedrol <pespin@sysmocom.de> | 2019-01-30 22:46:13 +0100 |
| commit | a3fdefb96f746f636b977dc2a4b5033c785494a1 (patch) | |
| tree | e296f32f8e0a7e5cf64f927227fe9deb85043ac8 | |
| parent | 0221146de0987065677a2874007de0cb017e17ae (diff) | |
openbsc: Use systemd.bbclass correctly
* Describe packages containing systemd services in SYSTEMD_PACKAGES.
* Enable services by default, since now osmo-bsc-sccplite doesn't collide
with osmo-bsc.git's osmo-bsc.
* Add SYSTEMD_SERVICE_* to specify service file for each package.
Change-Id: I922291bc8a1a8d52f41b3f4d5d80b80305b181cd
| -rw-r--r-- | recipes-osmocom/openbsc/openbsc.inc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/recipes-osmocom/openbsc/openbsc.inc b/recipes-osmocom/openbsc/openbsc.inc index f76afb7..ca9a6c6 100644 --- a/recipes-osmocom/openbsc/openbsc.inc +++ b/recipes-osmocom/openbsc/openbsc.inc @@ -39,13 +39,11 @@ do_install_append() { } PACKAGES =+ "osmo-bsc-nat osmo-bsc-sccplite osmo-nitb" - +SYSTEMD_PACKAGES = "osmo-bsc-nat osmo-bsc-sccplite osmo-nitb" INITSCRIPT_PACKAGES = "osmo-bsc-sccplite osmo-nitb" -# Do not start any of the services by default -SYSTEMD_AUTO_ENABLE = "disable" - CONFFILES_osmo-bsc-sccplite = "${sysconfdir}/osmocom/osmo-bsc-sccplite.cfg" +SYSTEMD_SERVICE_osmo-bsc-sccplite = "osmo-bsc-sccplite.service" INITSCRIPT_NAME_osmo-bsc-sccplite = "osmo-bsc-sccplite" INITSCRIPT_PARAMS_osmo-bsc-sccplite = "defaults 30 30" FILES_osmo-bsc-sccplite = " ${bindir}/osmo-bsc-sccplite \ @@ -55,16 +53,18 @@ FILES_osmo-bsc-sccplite = " ${bindir}/osmo-bsc-sccplite \ " CONFFILES_osmo-nitb = "${sysconfdir}/osmocom/osmo-nitb.cfg" +SYSTEMD_SERVICE_osmo-nitb = "osmo-nitb.service" INITSCRIPT_NAME_osmo-nitb = "osmo-nitb" INITSCRIPT_PARAMS_osmo-nitb = "defaults 30 30" FILES_osmo-nitb = " ${bindir}/osmo-nitb \ /var/lib/osmocom \ ${sysconfdir}/init.d/osmo-nitb \ ${sysconfdir}/osmocom/osmo-nitb.cfg \ - ${systemd_unitdir}/system/osmo-nitb.service \ + ${systemd_system_unitdir}/osmo-nitb.service \ " CONFFILES_osmo-bsc-nat = "${sysconfdir}/osmocom/osmo-bsc_nat.cfg" +SYSTEMD_SERVICE_osmo-bsc-nat = "osmo-bsc-nat.service" FILES_osmo-bsc-nat = " \ ${bindir}/osmo-bsc_nat \ ${sysconfdir}/osmocom/osmo-bsc_nat.cfg \ |