diff options
Diffstat (limited to 'meta/recipes-graphics/x11-common/xserver-nodm-init.bb')
| -rw-r--r-- | meta/recipes-graphics/x11-common/xserver-nodm-init.bb | 38 |
1 files changed, 30 insertions, 8 deletions
diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init.bb b/meta/recipes-graphics/x11-common/xserver-nodm-init.bb index 8490c81b48..e4508a917d 100644 --- a/meta/recipes-graphics/x11-common/xserver-nodm-init.bb +++ b/meta/recipes-graphics/x11-common/xserver-nodm-init.bb @@ -1,30 +1,52 @@ -DESCRIPTION = "Simple Xserver Init Script (no dm)" +SUMMARY = "Simple Xserver Init Script (no dm)" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" SECTION = "x11" PR = "r31" -RDEPENDS_${PN} = "sudo xuser-account" SRC_URI = "file://xserver-nodm \ file://Xusername \ - file://gplv2-license.patch" + file://gplv2-license.patch \ + file://xserver-nodm.service \ + file://xserver-nodm.conf \ +" S = "${WORKDIR}" +# Since we refer to ROOTLESS_X which is normally enabled per-machine PACKAGE_ARCH = "${MACHINE_ARCH}" +inherit update-rc.d systemd + do_install() { - install -d ${D}${sysconfdir} install -d ${D}${sysconfdir}/init.d install xserver-nodm ${D}${sysconfdir}/init.d - if [ "${ROOTLESS_X}" = "1" ] ; then - install -d ${D}${sysconfdir}/X11 - install Xusername ${D}${sysconfdir}/X11 + + if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then + install -d ${D}${sysconfdir}/default + install xserver-nodm.conf ${D}${sysconfdir}/default/xserver-nodm + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/xserver-nodm.service ${D}${systemd_unitdir}/system + if [ "${ROOTLESS_X}" = "1" ] ; then + sed -i 's!^HOME=.*!HOME=/home/xuser!' ${D}${sysconfdir}/default/xserver-nodm + sed -i 's!^User=.*!User=xuser!' ${D}${systemd_unitdir}/system/xserver-nodm.service + else + sed -i 's!^HOME=.*!HOME=${ROOT_HOME}!' ${D}${sysconfdir}/default/xserver-nodm + sed -i '/^User=/d' ${D}${systemd_unitdir}/system/xserver-nodm.service + fi + fi + + if ${@base_contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then + if [ "${ROOTLESS_X}" = "1" ] ; then + install -d ${D}${sysconfdir}/X11 + install Xusername ${D}${sysconfdir}/X11 + fi fi } -inherit update-rc.d +RDEPENDS_${PN} = "${@base_conditional('ROOTLESS_X', '1', 'xuser-account', '', d)}" INITSCRIPT_NAME = "xserver-nodm" INITSCRIPT_PARAMS = "start 9 5 2 . stop 20 0 1 6 ." +SYSTEMD_SERVICE_${PN} = "xserver-nodm.service" |