qt4e-demo-image: Fix bug 999

From: Xiaofeng Yan<[email protected]>

[YOCTO #999]
Copy metadata of qt4e-demo-image from OE for easy testing qt4embeded on embedded platform. This image was tested on qemuarm and can run program "qtdemoE".

Signed-off-by Xiaofeng Yan<[email protected]>

---
  meta/recipes-qt/images/qt4e-base-image.bb        |   14 ++++++
  meta/recipes-qt/images/qt4e-demo-image.bb        |   12 +++++
  meta/recipes-qt/qt-demo/qt-demo-init/qtdemo-init |   55 ++++++++++++++++++++++
  meta/recipes-qt/qt-demo/qt-demo-init_0.1.bb      |   19 ++++++++
  meta/recipes-qt/tasks/task-qt4e.bb               |   48 +++++++++++++++++++
  5 files changed, 148 insertions(+), 0 deletions(-)

create mode 100644 meta/recipes-qt/images/qt4e-base-image.bb create mode 100644 meta/recipes-qt/images/qt4e-demo-image.bb 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 create mode 100644 meta/recipes-qt/tasks/task-qt4e.bb

meta/recipes-qt/images/qt4e-base-image.bb new file +14 -0

new file mode 100644
index 0000000..395c069
@@ -0,0 +1,14 @@
+inherit core-image
+
+TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}'
+
+DEPENDS += "task-qt4e"
+
+RDEPENDS_${PN} += " \
+	task-qt4e-base \
+	"
+
+IMAGE_INSTALL += "\
+	task-qt4e-base \
+	${TOUCH} \
+"

meta/recipes-qt/images/qt4e-demo-image.bb new file +0 -0

new file mode 100644
index 0000000..cf3e6fb

meta/recipes-qt/images/qt4e-demo-image.bb new file +10 -0

+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+
+IMAGE_INSTALL += "\
+        qt4-embedded-demos \
+        qt4-embedded-examples \
+        qt-demo-init \
+        qt4-embedded-assistant \
+"

meta/recipes-qt/qt-demo/qt-demo-init/qtdemo-init new file +55 -0

new file mode 100644
index 0000000..affb958
@@ -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

meta/recipes-qt/qt-demo/qt-demo-init_0.1.bb new file +19 -0

new file mode 100644
index 0000000..3d7cdfc
@@ -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 ."

meta/recipes-qt/tasks/task-qt4e.bb new file +48 -0

new file mode 100644
index 0000000..5b181bb
@@ -0,0 +1,48 @@
+DESCRIPTION = "QT4 Embedded base Image Feed"
+PR = "r0"
+LICENSE = "MIT"
+
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+inherit task
+
+PACKAGES += " \
+	${PN}-base \
+"
+
+RDEPENDS_${PN}-base = " \
+	qt4-embedded \
+	libqt-embedded3support4 \
+	libqt-embeddedclucene4 \
+	libqt-embeddedcore4 \
+	libqt-embeddeddbus4 \
+	libqt-embeddedgui4 \
+	libqt-embeddedhelp4 \
+	libqt-embeddedmultimedia4 \
+	libqt-embeddednetwork4 \
+	libqt-embeddedscript4 \
+	libqt-embeddedscripttools4 \
+	libqt-embeddedsql4 \
+	libqt-embeddedsvg4 \
+	libqt-embeddedtest4 \
+	libqt-embeddedwebkit4 \
+	libqt-embeddedxml4 \
+	qt4-embedded-fonts-ttf-dejavu \
+	qt4-embedded-fonts-ttf-vera \
+	qt4-embedded-plugin-iconengine-svgicon \
+	qt4-embedded-plugin-imageformat-gif \
+	qt4-embedded-plugin-imageformat-ico \
+	qt4-embedded-plugin-imageformat-jpeg \
+	qt4-embedded-plugin-imageformat-mng \
+	qt4-embedded-plugin-imageformat-svg \
+	qt4-embedded-plugin-imageformat-tiff \
+	qt4-embedded-plugin-mousedriver-tslib \
+	qt4-embedded-plugin-phonon-backend-gstreamer \
+	qt4-embedded-plugin-script-dbus \
+	qt4-embedded-plugin-sqldriver-sqlite \
+"
+
+RRECOMMENDS_${PN}-base = " \
+	libqt-embeddedxmlpatterns4 \
+"

Why do we need the qt4e-base-image and this demo-image? Do we expect to have multiple images? This creates yet another image that needs to be built and tested? Can this really just be added to the sato-sdk or lsb-sdk images instead?

Quoted 4 lines · On Thursday 25 August 2011 00:36:45 Saul Wold wrote:

Why do we need the qt4e-base-image and this demo-image? Do we expect to have multiple images? This creates yet another image that needs to be built and tested? Can this really just be added to the sato-sdk or lsb-sdk images instead?

No, it doesn't belong in sato-sdk and lsb-sdk is Qt4/X11 based which counts it out also. It really needs its own image. The -base image could be merged into -demo though.

Cheers,
Paul