summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrevor Woerner <twoerner@gmail.com>2017-03-25 01:19:47 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-27 08:15:06 +0100
commit1e3f04f86aac7f547b10c187f82983fa3137be55 (patch)
treef125d5274991c478bdd54027d8acb8932bc47ad0
parentd9f293892174ffb8a7c3e3dc23e58f4ba1b09ee4 (diff)
downloadpoky-1e3f04f86aac7f547b10c187f82983fa3137be55.tar.gz
xserver-nodm-init: option to remove cursor
Add a PACKAGECONFIG option to allow the user to disable the mouse cursor/pointer in the X server. This might be useful where a touchscreen is used. (From OE-Core rev: 680940250c9a1c7b43229c5e4f4fed5cc3e31033) Signed-off-by: Trevor Woerner <twoerner@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.conf.in2
-rw-r--r--meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb3
2 files changed, 4 insertions, 1 deletions
diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.conf.in b/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.conf.in
index 757c23d95a..4a9670d8d2 100644
--- a/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.conf.in
+++ b/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.conf.in
@@ -2,6 +2,6 @@
2 2
3XSERVER=/usr/bin/Xorg 3XSERVER=/usr/bin/Xorg
4DISPLAY=:0 4DISPLAY=:0
5ARGS=" -br -pn @BLANK_ARGS@ " 5ARGS=" -br -pn @BLANK_ARGS@ @NO_CURSOR_ARG@ "
6HOME=@HOME@ 6HOME=@HOME@
7USER=@USER@ 7USER=@USER@
diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb b/meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb
index 62da11800c..345b589696 100644
--- a/meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb
+++ b/meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb
@@ -24,6 +24,7 @@ REQUIRED_DISTRO_FEATURES = "x11"
24PACKAGECONFIG ??= "blank" 24PACKAGECONFIG ??= "blank"
25# dpms and screen saver will be on only if 'blank' is in PACKAGECONFIG 25# dpms and screen saver will be on only if 'blank' is in PACKAGECONFIG
26PACKAGECONFIG[blank] = "" 26PACKAGECONFIG[blank] = ""
27PACKAGECONFIG[nocursor] = ""
27 28
28do_install() { 29do_install() {
29 install -d ${D}${sysconfdir}/default 30 install -d ${D}${sysconfdir}/default
@@ -35,6 +36,7 @@ do_install() {
35 install X11/Xsession ${D}${sysconfdir}/X11/ 36 install X11/Xsession ${D}${sysconfdir}/X11/
36 37
37 BLANK_ARGS="${@bb.utils.contains('PACKAGECONFIG', 'blank', '', '-s 0 -dpms', d)}" 38 BLANK_ARGS="${@bb.utils.contains('PACKAGECONFIG', 'blank', '', '-s 0 -dpms', d)}"
39 NO_CURSOR_ARG="${@bb.utils.contains('PACKAGECONFIG', 'nocursor', '-nocursor', '', d)}"
38 if [ "${ROOTLESS_X}" = "1" ] ; then 40 if [ "${ROOTLESS_X}" = "1" ] ; then
39 XUSER_HOME="/home/xuser" 41 XUSER_HOME="/home/xuser"
40 XUSER="xuser" 42 XUSER="xuser"
@@ -44,6 +46,7 @@ do_install() {
44 fi 46 fi
45 sed -i "s:@HOME@:${XUSER_HOME}:; s:@USER@:${XUSER}:; s:@BLANK_ARGS@:${BLANK_ARGS}:" \ 47 sed -i "s:@HOME@:${XUSER_HOME}:; s:@USER@:${XUSER}:; s:@BLANK_ARGS@:${BLANK_ARGS}:" \
46 ${D}${sysconfdir}/default/xserver-nodm 48 ${D}${sysconfdir}/default/xserver-nodm
49 sed -i "s:@NO_CURSOR_ARG@:${NO_CURSOR_ARG}:" ${D}${sysconfdir}/default/xserver-nodm
47 50
48 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then 51 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
49 install -d ${D}${systemd_unitdir}/system 52 install -d ${D}${systemd_unitdir}/system