* [PATCH 0/1] Fix bug 999
@ 2011-08-31 1:39 Xiaofeng Yan
2011-08-31 1:39 ` [PATCH 1/1] qt-demo-init: " Xiaofeng Yan
0 siblings, 1 reply; 3+ messages in thread
From: Xiaofeng Yan @ 2011-08-31 1:39 UTC (permalink / raw)
To: openembedded-core
From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
qt-init-demo was needed during building a qt4e-demo-image.
So I pull it from Openembeded and push it into OE-core.
Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: xiaofeng/qt4e-demo-image
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=xiaofeng/qt4e-demo-image
Thanks,
Xiaofeng Yan <xiaofeng.yan@windriver.com>
---
Xiaofeng Yan (1):
qt-demo-init: Fix bug 999
meta/recipes-qt/qt-demo/qt-demo-init/qtdemo-init | 55 ++++++++++++++++++++++
meta/recipes-qt/qt-demo/qt-demo-init_0.1.bb | 19 ++++++++
2 files changed, 74 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-qt/qt-demo/qt-demo-init/qtdemo-init
create mode 100644 meta/recipes-qt/qt-demo/qt-demo-init_0.1.bb
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 1/1] qt-demo-init: Fix bug 999
2011-08-31 1:39 [PATCH 0/1] Fix bug 999 Xiaofeng Yan
@ 2011-08-31 1:39 ` Xiaofeng Yan
2011-08-31 18:56 ` Richard Purdie
0 siblings, 1 reply; 3+ messages in thread
From: Xiaofeng Yan @ 2011-08-31 1:39 UTC (permalink / raw)
To: openembedded-core
From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
[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>
---
meta/recipes-qt/qt-demo/qt-demo-init/qtdemo-init | 55 ++++++++++++++++++++++
meta/recipes-qt/qt-demo/qt-demo-init_0.1.bb | 19 ++++++++
2 files changed, 74 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-qt/qt-demo/qt-demo-init/qtdemo-init
create mode 100644 meta/recipes-qt/qt-demo/qt-demo-init_0.1.bb
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 0000000..affb958
--- /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 0000000..8d0dd19
--- /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 ."
--
1.7.0.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/1] qt-demo-init: Fix bug 999
2011-08-31 1:39 ` [PATCH 1/1] qt-demo-init: " Xiaofeng Yan
@ 2011-08-31 18:56 ` Richard Purdie
0 siblings, 0 replies; 3+ messages in thread
From: Richard Purdie @ 2011-08-31 18:56 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Wed, 2011-08-31 at 09:39 +0800, Xiaofeng Yan wrote:
> From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
>
> [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>
> ---
> meta/recipes-qt/qt-demo/qt-demo-init/qtdemo-init | 55 ++++++++++++++++++++++
> meta/recipes-qt/qt-demo/qt-demo-init_0.1.bb | 19 ++++++++
> 2 files changed, 74 insertions(+), 0 deletions(-)
> create mode 100644 meta/recipes-qt/qt-demo/qt-demo-init/qtdemo-init
> create mode 100644 meta/recipes-qt/qt-demo/qt-demo-init_0.1.bb
Merged to master, thanks.
Richard
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-08-31 19:01 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-08-31 1:39 [PATCH 0/1] Fix bug 999 Xiaofeng Yan
2011-08-31 1:39 ` [PATCH 1/1] qt-demo-init: " Xiaofeng Yan
2011-08-31 18:56 ` Richard Purdie
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.