aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-graphics
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2012-04-10 05:59:39 +0000
committerKoen Kooi <koen@dominion.thruhere.net>2012-04-10 08:55:00 +0200
commit2cb1ae5c172d51df200cc09eb04ddae66bef6b6c (patch)
tree4b2f07f1f61bfc49978dc813a08a9028b867615e /meta-oe/recipes-graphics
parent8f6027c1bd6659bc393bb652727456f3daa80832 (diff)
downloadmeta-openembedded-2cb1ae5c172d51df200cc09eb04ddae66bef6b6c.tar.gz
xserver-nodm-init: add EnvironmentFile
* used to set HOME variable before /etc/X11/Xsession is started * e.g. enlightenment is creating ${HOME}/.e and without this it ends in /tmp/.e and during startup HOME gets defined and switched to /home/root/.e Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe/recipes-graphics')
-rw-r--r--meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm.conf1
-rw-r--r--meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm.service1
-rw-r--r--meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb7
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"