summaryrefslogtreecommitdiff
path: root/recipes-qt
diff options
context:
space:
mode:
authorStefan Agner <stefan.agner@toradex.com>2015-02-17 12:38:09 +0100
committerStefan Agner <stefan.agner@toradex.com>2015-02-17 13:29:39 +0100
commit4c35bb1cd6a64c40e5ca8b7426dd2cd41467ab67 (patch)
tree8e07c892bfbbd3700880afe4ce35ff26d8c38a9e /recipes-qt
parentb18ffd625bd35b49d09a6541bd1decc9853c1f7f (diff)
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.
Diffstat (limited to 'recipes-qt')
-rw-r--r--recipes-qt/qt-demo/qt-demo-init/qtdemo-init59
-rw-r--r--recipes-qt/qt-demo/qt-demo-init/qtdemo.service10
-rw-r--r--recipes-qt/qt-demo/qt-demo-init_0.2.bb (renamed from recipes-qt/qt-demo/qt-demo-init_0.1.bb)28
3 files changed, 26 insertions, 71 deletions
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.2.bb
index 8ad10ee..745c34f 100644
--- a/recipes-qt/qt-demo/qt-demo-init_0.1.bb
+++ b/recipes-qt/qt-demo/qt-demo-init_0.2.bb
@@ -1,23 +1,27 @@
-DESCRIPTION = "Init script for qtdemo"
+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-init \
+ file://qtdemo.service \
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 -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/
-}
-inherit update-rc.d allarch
+ install -d ${D}${systemd_unitdir}/system/
+ install -m 0644 ${WORKDIR}/qtdemo.service ${D}${systemd_unitdir}/system
+}
-INITSCRIPT_NAME = "qtdemo"
-INITSCRIPT_PARAMS = "start 99 5 2 . stop 19 0 1 6 ."
+NATIVE_SYSTEMD_SUPPORT = "1"
+SYSTEMD_PACKAGES = "${PN}"
+SYSTEMD_SERVICE_${PN} = "qtdemo.service"