[yocto] [meta-ivi][PATCH 2/2] dlt-daemon: Use systemd class from meta-systemd

[Andrei Gherzan]

Signed-off-by: Andrei Gherzan <andrei.gherzan at windriver.com>
---
 recipes-extended/dlt-daemon/dlt-daemon_2.9.0.bb |   31 ++++++++++++++++++----
 1 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/recipes-extended/dlt-daemon/dlt-daemon_2.9.0.bb b/recipes-extended/dlt-daemon/dlt-daemon_2.9.0.bb
index 7a20647..52a69f8 100644
--- a/recipes-extended/dlt-daemon/dlt-daemon_2.9.0.bb
+++ b/recipes-extended/dlt-daemon/dlt-daemon_2.9.0.bb
@@ -11,7 +11,7 @@ DESCRIPTION = "This component provides a standardised log and trace interface, b
 HOMEPAGE = "https://www.genivi.org/"
 SECTION = "console/utils"
 
-PR = "r1"
+PR = "r2"
 
 inherit gzipnative
 
@@ -23,11 +23,30 @@ SRC_URI = "git://git.projects.genivi.org/${PN}.git;protocol=git;tag=v${PV}"
 
 S = "${WORKDIR}/git"
 
-inherit autotools gettext cmake
+inherit autotools gettext cmake systemd
 
-PACKAGES =+ "${PN}-systemd \
+SYSTEMD_PACKAGES = " \
+                    dlt-adaptor-udp-systemd \
+                    dlt-receive-systemd \
+                    dlt-system-systemd \
+                    dlt-example-systemd \
+                    dlt-daemon-systemd \
+                    "
+SYSTEMD_SERVICE_dlt-adaptor-udp-systemd = "dlt-adaptor-udp.service"
+SYSTEMD_AUTO_ENABLE_dlt-adaptor-udp-systemd = "disable"
+SYSTEMD_SERVICE_dlt-receive-systemd = "dlt-receive.service"
+SYSTEMD_AUTO_ENABLE_dlt-receive-systemd = "disable"
+SYSTEMD_SERVICE_dlt-system-systemd = "dlt-system.service"
+SYSTEMD_AUTO_ENABLE_dlt-system-systemd = "disable"
+SYSTEMD_SERVICE_dlt-example-systemd = "dlt-example-user.service"
+SYSTEMD_AUTO_ENABLE_dlt-example-systemd = "disable"
+SYSTEMD_SERVICE_${PN}-systemd = "dlt.service"
+SYSTEMD_AUTO_ENABLE_${PN}-systemd = "disable"
+
+PACKAGES =+ " \
              libdlt \
-             dlt-adaptor \
+             dlt-adaptor-udp \
+             dlt-adaptor-stdin \
              dlt-convert \
              dlt-example \
              dlt-receive \
@@ -36,7 +55,8 @@ PACKAGES =+ "${PN}-systemd \
              "
 
 FILES_libdlt = "${libdir}/*${SOLIBS}"
-FILES_dlt-adaptor = "${bindir}/dlt-adaptor*"
+FILES_dlt-adaptor-udp = "${bindir}/dlt-adaptor-stdin"
+FILES_dlt-adaptor-stdin = "${bindir}/dlt-adaptor-udp"
 FILES_dlt-convert = "${bindir}/dlt-convert*"
 FILES_dlt-example = "${bindir}/dlt-example*"
 FILES_dlt-receive = "${bindir}/dlt-receive*"
@@ -44,6 +64,5 @@ FILES_dlt-system = "${bindir}/dlt-system* \
                       ${sysconfdir}/dlt-system.conf"
 FILES_dlt-test = "${bindir}/dlt-test* \
                   ${datadir}/dlt-filetransfer"
-FILES_${PN}-systemd += "${systemd_unitdir}/system/"
 
 EXTRA_OECMAKE = "-DWITH_SYSTEMD=ON"
-- 
1.7.5.4