diff options
| author |   Xiaofeng Yan <xiaofeng.yan@windriver.com> | 2011-08-31 09:39:58 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-08-31 19:55:11 +0100 |
| commit | e21e8b502ab2f982836cf1f7a30e33bff1bd5b7b (patch) | |
| tree | 8cfd6a50bb88d9dbbe489a22bf7ba8126a531ace | |
| parent | 38589c37923ecfe34f1dbd5f12d89d55dfb11e2a (diff) | |
| download | openembedded-core-contrib-e21e8b502ab2f982836cf1f7a30e33bff1bd5b7b.tar.gz | |
qt-demo-init: Fix bug 999
[YOCTO #999]
qt4e-demo-image needs qt-demo-init when starting qtdemoE.
qt-demo-init was pulled from Openembeded.
Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-qt/qt-demo/qt-demo-init/qtdemo-init | 55 | ||||
| -rw-r--r-- | meta/recipes-qt/qt-demo/qt-demo-init_0.1.bb | 19 |
2 files changed, 74 insertions, 0 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 new file mode 100644 index 0000000000..affb9589ea --- /dev/null +++ b/meta/recipes-qt/qt-demo/qt-demo-init/qtdemo-init @@ -0,0 +1,55 @@ +#!/bin/sh + +set -e + +if [ -f /usr/bin/qtdemo ]; then + QTDEMO="qtdemo > /var/log/Xsession.log 2> &1" +else + QTDEMO="qtdemoE -qws" +fi + +case "$1" in + start) + echo "Starting qtdemo" + if [ -f /etc/profile.d/tslib.sh ]; then + source /etc/profile.d/tslib.sh + fi + if [ -e $TSLIB_TSDEVICE ]; then + if [ ! -f /etc/pointercal ]; then + /usr/bin/ts_calibrate + fi + if [ $QTDEMO == qtdemo ]; then + Xorg & + export DISPLAY=:0 + $QTDEMO & + else + QWS_MOUSE_PROTO=tslib:$TSLIB_TSDEVICE $QTDEMO & + fi + else + if [ $QTDEMO == qtdemo ]; then + Xorg & + export DISPLAY=:0 + fi + $QTDEMO & + fi + ;; + stop) + echo "Stopping qtdemo" + if [ $QTDEMO == qtdemo ]; then + killall Xorg + killall qtdemo + else + killall qtdemoE + fi + ;; + restart) + $0 stop + $0 start + ;; + *) + echo "usage: $0 { start | stop | restart }" >&2 + exit 1 + ;; +esac + +exit 0 diff --git a/meta/recipes-qt/qt-demo/qt-demo-init_0.1.bb b/meta/recipes-qt/qt-demo/qt-demo-init_0.1.bb new file mode 100644 index 0000000000..8d0dd19227 --- /dev/null +++ b/meta/recipes-qt/qt-demo/qt-demo-init_0.1.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "Init script for qtdemo" +LICENSE = "MIT" +SRC_URI = "file://qtdemo-init" +PR = "r2" + +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" + +PACKAGE_ARCH = "all" + +do_install() { + install -d ${D}${sysconfdir}/init.d/ + install -m 0755 ${WORKDIR}/qtdemo-init ${D}${sysconfdir}/init.d/qtdemo +} + +inherit update-rc.d + +INITSCRIPT_NAME = "qtdemo" +INITSCRIPT_PARAMS = "start 99 5 2 . stop 19 0 1 6 ." |