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 3c0582a87..000000000 --- a/meta-systemd/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init/xserver-nodm.conf +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | 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 53e61d765..000000000 --- a/meta-systemd/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init/xserver-nodm.service +++ /dev/null | |||
@@ -1,9 +0,0 @@ | |||
1 | [Unit] | ||
2 | Description=Xserver startup with a display manager | ||
3 | |||
4 | [Service] | ||
5 | EnvironmentFile=/etc/default/xserver-nodm | ||
6 | ExecStart=/usr/bin/xinit /etc/X11/Xsession -- /etc/X11/Xserver | ||
7 | |||
8 | [Install] | ||
9 | 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 cae5a3c15..000000000 --- a/meta-systemd/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bbappend +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | ||
2 | |||
3 | PRINC := "${@int(PRINC) + 3}" | ||
4 | |||
5 | inherit systemd | ||
6 | |||
7 | SRC_URI += "file://xserver-nodm.service \ | ||
8 | file://xserver-nodm.conf \ | ||
9 | " | ||
10 | |||
11 | do_install_append() { | ||
12 | install -d ${D}${sysconfdir}/default | ||
13 | install -d ${D}${systemd_unitdir}/system | ||
14 | install xserver-nodm.conf ${D}${sysconfdir}/default/xserver-nodm | ||
15 | install -m 0644 ${WORKDIR}/xserver-nodm.service ${D}${systemd_unitdir}/system | ||
16 | } | ||
17 | |||
18 | RPROVIDES_${PN} += "${PN}-systemd" | ||
19 | RREPLACES_${PN} += "${PN}-systemd" | ||
20 | RCONFLICTS_${PN} += "${PN}-systemd" | ||
21 | SYSTEMD_SERVICE_${PN} = "xserver-nodm.service" | ||
22 | |||
23 | FILES_${PN} += "${sysconfdir}/default/xserver-nodm" | ||
24 | |||
25 | RDEPENDS_${PN} += "xserver-common (>= 1.30) xinit" | ||