diff options
Diffstat (limited to 'meta-oe/recipes-graphics')
3 files changed, 8 insertions, 1 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 new file mode 100644 index 0000000000..3c0582a87e --- /dev/null +++ b/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm.conf @@ -0,0 +1 @@ +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 index a35d70e147..c15a772f18 100644 --- 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 @@ -2,6 +2,7 @@ Description=Xserver startup with a display manager [Service] +EnvironmentFile=/etc/default/xserver-nodm ExecStart=/usr/bin/xinit /etc/X11/Xsession -- /etc/X11/Xserver [Install] 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 36d9bfc932..62c33c9687 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,10 +3,11 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" SECTION = "x11" -PR = "r14" +PR = "r16" SRC_URI = "file://xserver-nodm \ file://xserver-nodm.service \ + file://xserver-nodm.conf \ file://gplv2-license.patch \ " S = "${WORKDIR}" @@ -25,7 +26,11 @@ 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" |