summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2014-09-18 17:05:47 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-09-29 12:12:43 +0100
commit020f4cbda63956f9693946166f5e3e8720bc23d1 (patch)
tree15bb7c1ca5bf5d9916d922122dc6eb151e8c63a9 /meta
parent8ff856a75e6cac329106fd80b3919619cefa56ae (diff)
downloadpoky-020f4cbda63956f9693946166f5e3e8720bc23d1.tar.gz
qtdemo-init: Make qtdemo startup correctly
The qtdemo can't launch via qtdemo-init initscript. Fix it. (From OE-Core rev: bdd7a07db6b41c6c87c272d410af63c2d0251fc8) Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-qt/qt-demo/qt-demo-init/qtdemo-init10
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-qt/qt-demo/qt-demo-init/qtdemo-init b/meta/recipes-qt/qt-demo/qt-demo-init/qtdemo-init
index 3a1f2cb1b2..21f0273e2a 100644
--- a/meta/recipes-qt/qt-demo/qt-demo-init/qtdemo-init
+++ b/meta/recipes-qt/qt-demo/qt-demo-init/qtdemo-init
@@ -2,8 +2,8 @@
2 2
3set -e 3set -e
4 4
5if [ -f /usr/bin/qtdemo ]; then 5if [ -x /usr/bin/qtdemo ]; then
6 QTDEMO="qtdemo > /var/log/Xsession.log 2> &1" 6 QTDEMO="qtdemo"
7else 7else
8 QTDEMO="qtdemoE -qws" 8 QTDEMO="qtdemoE -qws"
9fi 9fi
@@ -18,7 +18,7 @@ case "$1" in
18 if [ ! -f /etc/pointercal ]; then 18 if [ ! -f /etc/pointercal ]; then
19 /usr/bin/ts_calibrate 19 /usr/bin/ts_calibrate
20 fi 20 fi
21 if [ "$QTDEMO" = qtdemo ]; then 21 if [ "$QTDEMO" = "qtdemo" ]; then
22 Xorg & 22 Xorg &
23 export DISPLAY=:0 23 export DISPLAY=:0
24 $QTDEMO & 24 $QTDEMO &
@@ -26,7 +26,7 @@ case "$1" in
26 QWS_MOUSE_PROTO=tslib:$TSLIB_TSDEVICE $QTDEMO & 26 QWS_MOUSE_PROTO=tslib:$TSLIB_TSDEVICE $QTDEMO &
27 fi 27 fi
28 else 28 else
29 if [ "$QTDEMO" = qtdemo ]; then 29 if [ "$QTDEMO" = "qtdemo" ]; then
30 Xorg & 30 Xorg &
31 export DISPLAY=:0 31 export DISPLAY=:0
32 fi 32 fi
@@ -35,7 +35,7 @@ case "$1" in
35 ;; 35 ;;
36 stop) 36 stop)
37 echo "Stopping qtdemo" 37 echo "Stopping qtdemo"
38 if [ "$QTDEMO" = qtdemo ]; then 38 if [ "$QTDEMO" = "qtdemo" ]; then
39 killall Xorg 39 killall Xorg
40 killall qtdemo 40 killall qtdemo
41 else 41 else