Hongmei Gou
2018-09-20 22:25:57 UTC
* Adding delay to work around the race condition when weston is started
before detection of input devices (e.g., mouse/keyboard) for EVMs without
touchscreen LCD
Signed-off-by: Hongmei Gou <***@ti.com>
---
meta-arago-distro/recipes-graphics/wayland/weston-init.bbappend | 2 +-
meta-arago-distro/recipes-graphics/wayland/weston-init/init | 8 ++++++++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/meta-arago-distro/recipes-graphics/wayland/weston-init.bbappend b/meta-arago-distro/recipes-graphics/wayland/weston-init.bbappend
index 4ed6a62..cbe0fe3 100644
--- a/meta-arago-distro/recipes-graphics/wayland/weston-init.bbappend
+++ b/meta-arago-distro/recipes-graphics/wayland/weston-init.bbappend
@@ -1,4 +1,4 @@
-PR_append = ".arago8"
+PR_append = ".arago9"
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-arago-distro/recipes-graphics/wayland/weston-init/init b/meta-arago-distro/recipes-graphics/wayland/weston-init/init
index 336e5af..461b078 100644
--- a/meta-arago-distro/recipes-graphics/wayland/weston-init/init
+++ b/meta-arago-distro/recipes-graphics/wayland/weston-init/init
@@ -40,6 +40,14 @@ case "$1" in
chmod 0700 $XDG_RUNTIME_DIR
fi
+ echo "Starting Weston"
+
+ if [ ! -d "/dev/input" ]; then
+ echo "Waiting for input device..."
+ killproc weston
+ sleep 3
+ fi
+
openvt -c 4 -f runWeston
# If there's no touchscreen device available, done
before detection of input devices (e.g., mouse/keyboard) for EVMs without
touchscreen LCD
Signed-off-by: Hongmei Gou <***@ti.com>
---
meta-arago-distro/recipes-graphics/wayland/weston-init.bbappend | 2 +-
meta-arago-distro/recipes-graphics/wayland/weston-init/init | 8 ++++++++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/meta-arago-distro/recipes-graphics/wayland/weston-init.bbappend b/meta-arago-distro/recipes-graphics/wayland/weston-init.bbappend
index 4ed6a62..cbe0fe3 100644
--- a/meta-arago-distro/recipes-graphics/wayland/weston-init.bbappend
+++ b/meta-arago-distro/recipes-graphics/wayland/weston-init.bbappend
@@ -1,4 +1,4 @@
-PR_append = ".arago8"
+PR_append = ".arago9"
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/meta-arago-distro/recipes-graphics/wayland/weston-init/init b/meta-arago-distro/recipes-graphics/wayland/weston-init/init
index 336e5af..461b078 100644
--- a/meta-arago-distro/recipes-graphics/wayland/weston-init/init
+++ b/meta-arago-distro/recipes-graphics/wayland/weston-init/init
@@ -40,6 +40,14 @@ case "$1" in
chmod 0700 $XDG_RUNTIME_DIR
fi
+ echo "Starting Weston"
+
+ if [ ! -d "/dev/input" ]; then
+ echo "Waiting for input device..."
+ killproc weston
+ sleep 3
+ fi
+
openvt -c 4 -f runWeston
# If there's no touchscreen device available, done
--
1.9.1
1.9.1