mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-16 04:17:25 +00:00
xserver-nodm-init: move systemd support from meta-systemd back to meta-oe
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
-1
@@ -1 +0,0 @@
|
||||
HOME=/home/root
|
||||
-9
@@ -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
|
||||
-25
@@ -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"
|
||||
Reference in New Issue
Block a user