diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-13 14:32:42 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-15 16:22:04 +0200 |
| commit | 05c8eb4393f77314246b41b0465305f95e979df0 (patch) | |
| tree | 7ffc7ce20494e49bcd1c32d6cbb5feb4bf202d78 /meta-oe/recipes-graphics | |
| parent | e965f6efc0942b08f5ab39a623833ebe8f39115e (diff) | |
| download | meta-openembedded-05c8eb4393f77314246b41b0465305f95e979df0.tar.gz | |
xserver-nodm-init: move systemd support from meta-systemd back to meta-oe
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-graphics')
3 files changed, 26 insertions, 2 deletions
diff --git a/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm.conf b/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm.conf new file mode 100644 index 0000000000..3c0582a87e --- /dev/null +++ b/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm.conf @@ -0,0 +1 @@ +HOME=/home/root diff --git a/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm.service b/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm.service new file mode 100644 index 0000000000..53e61d7653 --- /dev/null +++ b/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm.service @@ -0,0 +1,9 @@ +[Unit] +Description=Xserver startup with a display manager + +[Service] +EnvironmentFile=/etc/default/xserver-nodm +ExecStart=/usr/bin/xinit /etc/X11/Xsession -- /etc/X11/Xserver + +[Install] +Alias=display-manager.service 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" |