From 05c8eb4393f77314246b41b0465305f95e979df0 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 13 Apr 2013 14:32:42 +0200 Subject: xserver-nodm-init: move systemd support from meta-systemd back to meta-oe Signed-off-by: Martin Jansa --- .../xserver-nodm-init/xserver-nodm-init_2.0.bb | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb') diff --git a/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb b/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb index 544ae7f8c1..bbed445fe3 100644 --- a/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb +++ b/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb @@ -3,14 +3,16 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" SECTION = "x11" -PR = "r17" +PR = "r21" SRC_URI = "file://xserver-nodm \ file://gplv2-license.patch \ + file://xserver-nodm.service \ + file://xserver-nodm.conf \ " S = "${WORKDIR}" -inherit allarch update-rc.d +inherit allarch update-rc.d systemd INITSCRIPT_NAME = "xserver-nodm" INITSCRIPT_PARAMS = "start 01 5 2 . stop 01 0 1 6 ." @@ -19,6 +21,18 @@ INITSCRIPT_PARAMS_shr = "start 90 5 2 . stop 90 0 1 6 ." do_install() { install -d ${D}${sysconfdir}/init.d install xserver-nodm ${D}${sysconfdir}/init.d + + install -d ${D}${sysconfdir}/default + install -d ${D}${systemd_unitdir}/system + install xserver-nodm.conf ${D}${sysconfdir}/default/xserver-nodm + install -m 0644 ${WORKDIR}/xserver-nodm.service ${D}${systemd_unitdir}/system } RDEPENDS_${PN} = "xserver-common (>= 1.30) xinit" + +RPROVIDES_${PN} += "${PN}-systemd" +RREPLACES_${PN} += "${PN}-systemd" +RCONFLICTS_${PN} += "${PN}-systemd" +SYSTEMD_SERVICE_${PN} = "xserver-nodm.service" + +FILES_${PN} += "${sysconfdir}/default/xserver-nodm" -- cgit 1.2.3-korg