diff options
| author |   Andreas Müller <schnitzeltony@googlemail.com> | 2012-07-11 14:32:14 +0200 |
|---|---|---|
| committer |   Koen Kooi <koen@dominion.thruhere.net> | 2012-07-16 09:39:07 +0200 |
| commit | 42e00e8ffd3088050716a5fe1c7da2cc6cf9787c (patch) | |
| tree | 568b7bdb31a4e965397b1b51cbd9b937b03e637b /meta-oe/recipes-graphics | |
| parent | 34fe984fc64a9f51d5b2d563eedac6f5163b250a (diff) | |
| download | meta-openembedded-42e00e8ffd3088050716a5fe1c7da2cc6cf9787c.tar.gz | |
xserver-nodm-init: move systemd support to meta-systemd
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-graphics')
3 files changed, 2 insertions, 24 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 deleted file mode 100644 index 3c0582a87e..0000000000 --- a/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm.conf +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index c15a772f18..0000000000 --- a/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm.service +++ /dev/null @@ -1,9 +0,0 @@ -[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] -WantedBy=multi-user.target 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 62c33c9687..544ae7f8c1 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,34 +3,22 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" SECTION = "x11" -PR = "r16" +PR = "r17" SRC_URI = "file://xserver-nodm \ - file://xserver-nodm.service \ - file://xserver-nodm.conf \ file://gplv2-license.patch \ " S = "${WORKDIR}" -inherit allarch - -inherit update-rc.d systemd +inherit allarch update-rc.d INITSCRIPT_NAME = "xserver-nodm" INITSCRIPT_PARAMS = "start 01 5 2 . stop 01 0 1 6 ." INITSCRIPT_PARAMS_shr = "start 90 5 2 . stop 90 0 1 6 ." -SYSTEMD_PACKAGES = "${PN}-systemd" -SYSTEMD_SERVICE_${PN}-systemd = "xserver-nodm.service" - do_install() { install -d ${D}${sysconfdir}/init.d install xserver-nodm ${D}${sysconfdir}/init.d - install -d ${D}${sysconfdir}/default - install xserver-nodm.conf ${D}${sysconfdir}/default/xserver-nodm } -FILES_${PN}-systemd += "${sysconfdir}/default/xserver-nodm" - RDEPENDS_${PN} = "xserver-common (>= 1.30) xinit" -RDEPENDS_${PN}-systemd += "xserver-common (>= 1.30) xinit" |