oprofileui-server: Add systemd support

-Remove dependency on meta-systemd

(From OE-Core rev: 177bf318bcd3dd2bfb3bec094b1f5ccac7bdd9ac)

Signed-off-by: Muhammad Shakeel <muhammad_shakeel@mentor.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-kernel/oprofile/oprofileui-server/oprofileui-server.service b/meta/recipes-kernel/oprofile/oprofileui-server/oprofileui-server.service
new file mode 100644 (file)
index 0000000..1a2cbe6
--- /dev/null
+++ b/meta/recipes-kernel/oprofile/oprofileui-server/oprofileui-server.service
@@ -0,0 +1,6 @@
+[Unit]
+Description=OProfileUI Server
+After=network.target
+
+[Service]
+ExecStart=/bin/sh -c ". @SYSCONFDIR@/profile; @BINDIR@/oprofile-server"

diff --git a/meta/recipes-kernel/oprofile/oprofileui-server_git.bb b/meta/recipes-kernel/oprofile/oprofileui-server_git.bb
index 200bab3..70a1fbf 100644 (file)
--- a/meta/recipes-kernel/oprofile/oprofileui-server_git.bb
+++ b/meta/recipes-kernel/oprofile/oprofileui-server_git.bb
@@ -6,7 +6,8 @@ PV = "0.0+git${SRCPV}"
 S = "${WORKDIR}/git"
 
 SRC_URI = "git://git.yoctoproject.org/oprofileui \
-           file://init"
+           file://init \
+           file://oprofileui-server.service "
 
 EXTRA_OECONF += "--disable-client --enable-server"
 
@@ -15,9 +16,17 @@ RDEPENDS_${PN} = "oprofile"
 do_install_append() {
        install -d ${D}${sysconfdir}/init.d
        install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/oprofileui-server
+
+       install -d ${D}${systemd_unitdir}/system
+       install -m 0644 ${WORKDIR}/oprofileui-server.service ${D}${systemd_unitdir}/system/
+       sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' \
+               -e 's,@BINDIR@,${bindir},g' ${D}${systemd_unitdir}/system/oprofileui-server.service
 }
 
+inherit update-rc.d systemd
+
 INITSCRIPT_NAME = "oprofileui-server"
 INITSCRIPT_PARAMS = "start 999 5 2 . stop 20 0 1 6 ."
 
-inherit update-rc.d
+SYSTEMD_SERVICE_${PN} = "oprofileui-server.service"
+SYSTEMD_AUTO_ENABLE = "disable"