From bc5f5a67a5850d2a68527d37de6b512854a72f93 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Wed, 27 Mar 2013 16:58:42 +0100 Subject: images: added a QT4 X11 image - bbappends to the base qt4-x11-free recipe to use OpenGL ES2 - script which starts X plus qtdemo, including a systemd service to activate script --- recipes-qt/qt4/qt4-x11-free-systemd.bb | 24 +++++++++ recipes-qt/qt4/qt4-x11-free-systemd/qtdemo-init | 60 ++++++++++++++++++++++ recipes-qt/qt4/qt4-x11-free-systemd/qtdemo.service | 10 ++++ recipes-qt/qt4/qt4-x11-free_4.8.1.bbappend | 7 +++ recipes-qt/qt4/qt4-x11-free_4.8.3.bbappend | 7 +++ 5 files changed, 108 insertions(+) create mode 100644 recipes-qt/qt4/qt4-x11-free-systemd.bb create mode 100644 recipes-qt/qt4/qt4-x11-free-systemd/qtdemo-init create mode 100644 recipes-qt/qt4/qt4-x11-free-systemd/qtdemo.service create mode 100644 recipes-qt/qt4/qt4-x11-free_4.8.1.bbappend create mode 100644 recipes-qt/qt4/qt4-x11-free_4.8.3.bbappend (limited to 'recipes-qt') diff --git a/recipes-qt/qt4/qt4-x11-free-systemd.bb b/recipes-qt/qt4/qt4-x11-free-systemd.bb new file mode 100644 index 0000000..2c8227c --- /dev/null +++ b/recipes-qt/qt4/qt4-x11-free-systemd.bb @@ -0,0 +1,24 @@ +SECTION = "x11/libs" +DESCRIPTION = "qtdemo autostart" +RDEPENDS_${PN} = "" +# The license is meant for this recipe and the files it installs. +# RNDIS is part of the kernel, udhcpd is part of busybox +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" + +PR = "r1" + +inherit allarch systemd + +SRC_URI = "file://qtdemo.service \ + file://qtdemo-init " + +FILES_${PN} += " ${sysconfdir}/init.d " +do_install () { + install -d ${D}/${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/qtdemo-init ${D}/${sysconfdir}/init.d/ +} + +NATIVE_SYSTEMD_SUPPORT = "1" +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE_${PN} = "qtdemo.service" diff --git a/recipes-qt/qt4/qt4-x11-free-systemd/qtdemo-init b/recipes-qt/qt4/qt4-x11-free-systemd/qtdemo-init new file mode 100644 index 0000000..e9ed869 --- /dev/null +++ b/recipes-qt/qt4/qt4-x11-free-systemd/qtdemo-init @@ -0,0 +1,60 @@ +#!/bin/sh + +set -e + +if [ -f /usr/bin/qtdemo ]; then + QTVARIANT="X11" + QTDEMO="qtdemo > /var/log/Xsession.log 2>&1" +else + QTVARIANT="" + 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 [ "$QTVARIANT" == X11 ]; then + Xorg & + export DISPLAY=:0 + eval $QTDEMO & + else + QWS_MOUSE_PROTO=tslib:$TSLIB_TSDEVICE $QTDEMO & + fi + else + if [ -e "/usr/bin/xinput_calibrator_once.sh" ]; then + xinput_calibrator_once.sh + fi + if [ "$QTVARIANT" == X11 ]; then + Xorg & + export DISPLAY=:0 + fi + eval $QTDEMO & + fi + ;; + stop) + echo "Stopping qtdemo" + if [ "$QTVARIANT" == X11 ]; 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/recipes-qt/qt4/qt4-x11-free-systemd/qtdemo.service b/recipes-qt/qt4/qt4-x11-free-systemd/qtdemo.service new file mode 100644 index 0000000..22ed75d --- /dev/null +++ b/recipes-qt/qt4/qt4-x11-free-systemd/qtdemo.service @@ -0,0 +1,10 @@ +[Unit] +Description=start X and qtdemo + +[Service] +Type=forking +ExecStart=/etc/init.d/qtdemo-init start +ExecStop=/etc/init.d/qtdemo-init stop + +[Install] +WantedBy=graphical.target diff --git a/recipes-qt/qt4/qt4-x11-free_4.8.1.bbappend b/recipes-qt/qt4/qt4-x11-free_4.8.1.bbappend new file mode 100644 index 0000000..d1aa300 --- /dev/null +++ b/recipes-qt/qt4/qt4-x11-free_4.8.1.bbappend @@ -0,0 +1,7 @@ +PRINC = "1" + +# Build OpenGL/ES support if available + +QT_GLFLAGS_colibri-t20 = " -opengl es2 -no-neon " +QT_GLFLAGS_colibri-t30 = " -opengl es2 -no-neon " +QT_GLFLAGS_apalis-t30 = " -opengl es2 -no-neon " diff --git a/recipes-qt/qt4/qt4-x11-free_4.8.3.bbappend b/recipes-qt/qt4/qt4-x11-free_4.8.3.bbappend new file mode 100644 index 0000000..c996471 --- /dev/null +++ b/recipes-qt/qt4/qt4-x11-free_4.8.3.bbappend @@ -0,0 +1,7 @@ +PRINC = "1" + +# Build OpenGL/ES support if available + +QT_GLFLAGS_colibri-t20 = "-opengl es2 " +QT_GLFLAGS_colibri-t30 = "-opengl es2 " +QT_GLFLAGS_apalis-t30 = "-opengl es2 " -- cgit v1.2.3