[meta-freescale] [meta-fsl-demos][PATCH 1/2] qt-in-industrial-embedded-common: add init script for the smarthome demo

[Otavio Salvador]

Hello,

On Mon, Jan 27, 2014 at 10:41 PM, Eric Nelson
<eric.nelson at boundarydevices.com> wrote:
> On 01/17/2014 07:02 AM, Mario Domenech Goulart wrote:
>> Currently, qt-in-industrial-embedded starts no demo automatically when
>> installed.  This patch adds an init script so that the smarthome demo
>> can be automatically started on boot.
>>
>> Signed-off-by: Mario Domenech Goulart <mario at ossystems.com.br>
>> ---
>>   recipes-qt/qt-in-use/files/smarthome               |   37
>> ++++++++++++++++++++
>>   .../qt-in-use/qt-in-industrial-embedded-common.inc |   13 +++++--
>>   2 files changed, 48 insertions(+), 2 deletions(-)
>>   create mode 100644 recipes-qt/qt-in-use/files/smarthome
>>
>> diff --git a/recipes-qt/qt-in-use/files/smarthome
>> b/recipes-qt/qt-in-use/files/smarthome
>> new file mode 100644
>> index 0000000..c0aa575
>> --- /dev/null
>> +++ b/recipes-qt/qt-in-use/files/smarthome
>> @@ -0,0 +1,37 @@
>> +#!/bin/sh
>> +
>> +set -e
>> +
>> +SMARTHOME="smarthome"
>> +SMARTHOME_ARGS="`[ -x '__BINDIR__/X' ] && echo '' || echo '-qws'`"
>> +
>> +case "$1" in
>> +  start)
>> +       echo "Starting $SMARTHOME"
>> +       if [ -f __SYSCONFDIR__/profile.d/tslib.sh ]; then
>> +               . __SYSCONFDIR__/profile.d/tslib.sh
>> +       fi
>> +       if [ -e "$TSLIB_TSDEVICE" ]; then
>> +               if [ ! -f __SYSCONFDIR__/pointercal ]; then
>> +                       __BINDIR__/ts_calibrate
>> +               fi
>> +                QWS_MOUSE_PROTO=tslib:$TSLIB_TSDEVICE $SMARTHOME
>> $SMARTHOME_ARGS &
>> +       else
>> +               $SMARTHOME $SMARTHOME_ARGS &
>> +       fi
>> +       ;;
>> +  stop)
>> +       echo "Stopping $SMARTHOME"
>> +        killall $SMARTHOME
>> +       ;;
>> +  restart)
>> +       $0 stop
>> +       $0 start
>> +       ;;
>> +  *)
>> +       echo "usage: $0 { start | stop | restart }" >&2
>> +       exit 1
>> +       ;;
>> +esac
>> +
>> +exit 0
>> diff --git a/recipes-qt/qt-in-use/qt-in-industrial-embedded-common.inc
>> b/recipes-qt/qt-in-use/qt-in-industrial-embedded-common.inc
>> index ea4feef..ad879c5 100644
>> --- a/recipes-qt/qt-in-use/qt-in-industrial-embedded-common.inc
>> +++ b/recipes-qt/qt-in-use/qt-in-industrial-embedded-common.inc
>> @@ -1,10 +1,12 @@
>>   DESCRIPTION = "Demos from the industrial embedded segment"
>>
>> -inherit autotools
>> +inherit autotools update-rc.d
>>
>>   PV = "0.0+gitr${SRCPV}"
>>   SRCREV = "4b10cbfd32391c83251bbc61520eeab03461db0a"
>> -SRC_URI = "git://gitorious.org/qt-in-use/qt-in-industrial-embedded.git"
>> +SRC_URI = "git://gitorious.org/qt-in-use/qt-in-industrial-embedded.git \
>> +           file://smarthome \
>> +          "
>>
>>   PR = "r3"
>>
>> @@ -18,6 +20,10 @@ do_configure_prepend() {
>>   do_install_append () {
>>       # Set the correct smarthome binary path
>>       sed -i -e 's:Exec=.*:Exec=${bindir}/smarthome:g'
>> ${D}${datadir}/applications/smarthome.desktop
>
>
> This should only be installed when not using X, right?
>
>
>> +
>> +    install -d ${D}${sysconfdir}/init.d
>> +    install -m 755 ${WORKDIR}/smarthome ${D}${sysconfdir}/init.d/
>> +    sed -i -e 's:__BINDIR__:${bindir}:g;
>> s:__SYSCONFDIR__:${sysconfdir}:g' ${D}${sysconfdir}/init.d/smarthome
>>   }
>>
>
> When testing using fsl-image-gui on the master branch today, I
> immediately got a ts_calibrate prompt on my HDMI monitor, which was
> frustrating since it doesn't happen to have a touch screen.

We'll test it again tomorrow but in theory it wouldn't be called if
tslib is not installed and this should be the case for X11 based
images.

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750