From 4b6a4dbeb0515a64da9eb85f4cd45394025d72f4 Mon Sep 17 00:00:00 2001
From: Stefan Agner <stefan.agner@toradex.com>
Date: Tue, 17 Feb 2015 12:38:09 +0100
Subject: qt-demo-init: converted to systemd service

Convert qt-demo-init to a systemd service. The service will only
start when the systemd target is set to graphical, hence also set
the new default target of the qt4e-demo-image to graphical.
---
 recipes-qt/qt-demo/qt-demo-init/qtdemo-init    | 59 --------------------------
 recipes-qt/qt-demo/qt-demo-init/qtdemo.service | 10 +++++
 recipes-qt/qt-demo/qt-demo-init_0.1.bb         | 23 ----------
 recipes-qt/qt-demo/qt-demo-init_0.2.bb         | 27 ++++++++++++
 4 files changed, 37 insertions(+), 82 deletions(-)
 delete mode 100644 recipes-qt/qt-demo/qt-demo-init/qtdemo-init
 create mode 100644 recipes-qt/qt-demo/qt-demo-init/qtdemo.service
 delete mode 100644 recipes-qt/qt-demo/qt-demo-init_0.1.bb
 create mode 100644 recipes-qt/qt-demo/qt-demo-init_0.2.bb

(limited to 'recipes-qt')

diff --git a/recipes-qt/qt-demo/qt-demo-init/qtdemo-init b/recipes-qt/qt-demo/qt-demo-init/qtdemo-init
deleted file mode 100644
index b71cbc8..0000000
--- a/recipes-qt/qt-demo/qt-demo-init/qtdemo-init
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ -f /usr/bin/qtdemo ]; then
-	QTDEMO="qtdemo > /var/log/Xsession.log 2> &1"
-else
-	QTDEMO="qtdemoE -qws"
-	export QWS_DISPLAY="LinuxFb:/dev/fb:genericcolors"
-	export QWS_KEYBOARD="USB:/dev/input/event-keyboard"
-	export QWS_MOUSE_PROTO="LinuxInput:/dev/input/event-mouse"
-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/recipes-qt/qt-demo/qt-demo-init/qtdemo.service b/recipes-qt/qt-demo/qt-demo-init/qtdemo.service
new file mode 100644
index 0000000..44e62a6
--- /dev/null
+++ b/recipes-qt/qt-demo/qt-demo-init/qtdemo.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Start Qt4 Embedded demo application
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/qtdemoE -qws
+Environment="QWS_DISPLAY=LinuxFb:/dev/fb:genericcolors" "QWS_KEYBOARD=USB:/dev/input/event-keyboard" "QWS_MOUSE_PROTO=LinuxInput:/dev/input/event-mouse"
+
+[Install]
+WantedBy=graphical.target
diff --git a/recipes-qt/qt-demo/qt-demo-init_0.1.bb b/recipes-qt/qt-demo/qt-demo-init_0.1.bb
deleted file mode 100644
index 8ad10ee..0000000
--- a/recipes-qt/qt-demo/qt-demo-init_0.1.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-DESCRIPTION = "Init script for qtdemo"
-LICENSE = "MIT"
-SRC_URI = " \
-    file://qtdemo-init \
-    file://mouse.rules \
-    file://keyboard.rules \
-"
-PR = "r4"
-
-LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690 \
-                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-
-do_install() {
-    install -d ${D}${sysconfdir}/init.d/  ${D}${sysconfdir}/udev/rules.d/
-    install -m 0755 ${WORKDIR}/qtdemo-init ${D}${sysconfdir}/init.d/qtdemo
-    install -m 0644 ${WORKDIR}/mouse.rules ${D}${sysconfdir}/udev/rules.d/
-    install -m 0644 ${WORKDIR}/keyboard.rules ${D}${sysconfdir}/udev/rules.d/
-}
-
-inherit update-rc.d allarch
-
-INITSCRIPT_NAME = "qtdemo"
-INITSCRIPT_PARAMS = "start 99 5 2 . stop 19 0 1 6 ."
diff --git a/recipes-qt/qt-demo/qt-demo-init_0.2.bb b/recipes-qt/qt-demo/qt-demo-init_0.2.bb
new file mode 100644
index 0000000..745c34f
--- /dev/null
+++ b/recipes-qt/qt-demo/qt-demo-init_0.2.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "Systemd start script for Qt Embedded demo"
+LICENSE = "MIT"
+PR = "r1"
+
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690 \
+                    file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+inherit allarch systemd
+
+SRC_URI = " \
+    file://qtdemo.service \
+    file://mouse.rules \
+    file://keyboard.rules \
+"
+
+do_install() {
+    install -d ${D}${sysconfdir}/udev/rules.d/
+    install -m 0644 ${WORKDIR}/mouse.rules ${D}${sysconfdir}/udev/rules.d/
+    install -m 0644 ${WORKDIR}/keyboard.rules ${D}${sysconfdir}/udev/rules.d/
+
+    install -d ${D}${systemd_unitdir}/system/
+    install -m 0644 ${WORKDIR}/qtdemo.service ${D}${systemd_unitdir}/system
+}
+
+NATIVE_SYSTEMD_SUPPORT = "1"
+SYSTEMD_PACKAGES = "${PN}"
+SYSTEMD_SERVICE_${PN} = "qtdemo.service"
-- 
cgit v1.2.3