diff options
| author |   Yi Zhao <yi.zhao@windriver.com> | 2014-09-18 17:05:47 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-09-29 12:12:43 +0100 |
| commit | 020f4cbda63956f9693946166f5e3e8720bc23d1 (patch) | |
| tree | 15bb7c1ca5bf5d9916d922122dc6eb151e8c63a9 /meta/recipes-qt | |
| parent | 8ff856a75e6cac329106fd80b3919619cefa56ae (diff) | |
| download | openembedded-core-contrib-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/recipes-qt')
| -rw-r--r-- | meta/recipes-qt/qt-demo/qt-demo-init/qtdemo-init | 10 |
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 @@ set -e -if [ -f /usr/bin/qtdemo ]; then - QTDEMO="qtdemo > /var/log/Xsession.log 2> &1" +if [ -x /usr/bin/qtdemo ]; then + QTDEMO="qtdemo" else QTDEMO="qtdemoE -qws" fi @@ -18,7 +18,7 @@ case "$1" in if [ ! -f /etc/pointercal ]; then /usr/bin/ts_calibrate fi - if [ "$QTDEMO" = qtdemo ]; then + if [ "$QTDEMO" = "qtdemo" ]; then Xorg & export DISPLAY=:0 $QTDEMO & @@ -26,7 +26,7 @@ case "$1" in QWS_MOUSE_PROTO=tslib:$TSLIB_TSDEVICE $QTDEMO & fi else - if [ "$QTDEMO" = qtdemo ]; then + if [ "$QTDEMO" = "qtdemo" ]; then Xorg & export DISPLAY=:0 fi @@ -35,7 +35,7 @@ case "$1" in ;; stop) echo "Stopping qtdemo" - if [ "$QTDEMO" = qtdemo ]; then + if [ "$QTDEMO" = "qtdemo" ]; then killall Xorg killall qtdemo else |