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-systemd | |
| 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-systemd')
3 files changed, 0 insertions, 35 deletions
diff --git a/meta-systemd/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init/xserver-nodm.conf b/meta-systemd/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init/xserver-nodm.conf deleted file mode 100644 index 3c0582a87e..0000000000 --- a/meta-systemd/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init/xserver-nodm.conf +++ /dev/null @@ -1 +0,0 @@ -HOME=/home/root diff --git a/meta-systemd/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init/xserver-nodm.service b/meta-systemd/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init/xserver-nodm.service deleted file mode 100644 index 53e61d7653..0000000000 --- a/meta-systemd/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init/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] -Alias=display-manager.service diff --git a/meta-systemd/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bbappend b/meta-systemd/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bbappend deleted file mode 100644 index cae5a3c151..0000000000 --- a/meta-systemd/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bbappend +++ /dev/null @@ -1,25 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -PRINC := "${@int(PRINC) + 3}" - -inherit systemd - -SRC_URI += "file://xserver-nodm.service \ - file://xserver-nodm.conf \ -" - -do_install_append() { - 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 -} - -RPROVIDES_${PN} += "${PN}-systemd" -RREPLACES_${PN} += "${PN}-systemd" -RCONFLICTS_${PN} += "${PN}-systemd" -SYSTEMD_SERVICE_${PN} = "xserver-nodm.service" - -FILES_${PN} += "${sysconfdir}/default/xserver-nodm" - -RDEPENDS_${PN} += "xserver-common (>= 1.30) xinit" |