diff options
| author |   Leon Anavi <leon.anavi@konsulko.com> | 2017-05-27 10:45:33 +0300 |
|---|---|---|
| committer |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2017-05-30 12:31:55 +0000 |
| commit | 847493e6b994e25c5936a9534e2e225f9e2a42ad (patch) | |
| tree | 5781f00e703a7f1ecfc5035f1df142426e48dddd /recipes-openivi | |
| parent | e51f84722b85265924d0a74e61598a57bb54fdfe (diff) | |
openivi-html5: Fix visibility issues
Change the systemd service to user unit, add dependencies, update
the bash script for launching openivi-html5 and fix the visibility
issue to prevent blank screen at startup.
AGL-Bug: SPEC-629
Change-Id: Ibc64088a39a1d7cc2899cb0ff43e8312cde95bc8
Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
Diffstat (limited to 'recipes-openivi')
3 files changed, 15 insertions, 15 deletions
diff --git a/recipes-openivi/openivi-html5/openivi-html5/openivi-html5.service b/recipes-openivi/openivi-html5/openivi-html5/openivi-html5.service index df14ccb4a..2c8648475 100644 --- a/recipes-openivi/openivi-html5/openivi-html5/openivi-html5.service +++ b/recipes-openivi/openivi-html5/openivi-html5/openivi-html5.service @@ -1,14 +1,16 @@ [Unit] Description=HTML5 runtime for OpenIVI Mobility applications -Requires=dbus.service -After=dbus.service lightmediascanner.service rygel.service weston.service +Requires=afm-user-daemon.service InputEventManager.service +After=afm-user-daemon.service InputEventManager.service +ConditionKernelCommandLine=!agl.nogfx [Service] -User=root +Type=dbus +BusName=org.agl.openivi ExecStart=/usr/bin/openivi-html5.sh -Restart=always -RestartSec=2 +Restart=on-failure +RestartSec=5 TimeoutStopSec=1 [Install] -WantedBy=multi-user.target +WantedBy=default.target diff --git a/recipes-openivi/openivi-html5/openivi-html5/openivi-html5.sh b/recipes-openivi/openivi-html5/openivi-html5/openivi-html5.sh index 3a43b40d9..a318214ad 100644 --- a/recipes-openivi/openivi-html5/openivi-html5/openivi-html5.sh +++ b/recipes-openivi/openivi-html5/openivi-html5/openivi-html5.sh @@ -30,10 +30,7 @@ SCREEN_H=1920 QT_W=1080 QT_H=1920 -# Ensure that Weston has been fully loaded -sleep 8 - -/usr/bin/openivi-html5 -f -u $HOMESCREEN & +QT_IVI_SURFACE_ID=4194304 QT_WAYLAND_SHELL_INTEGRATION=ivi-shell /usr/bin/openivi-html5 -f -u $HOMESCREEN & # qmlscene create 2 surfaces # 0x80000000 : for off screen buffer ? diff --git a/recipes-openivi/openivi-html5/openivi-html5_git.bb b/recipes-openivi/openivi-html5/openivi-html5_git.bb index 115171948..168b98c78 100644 --- a/recipes-openivi/openivi-html5/openivi-html5_git.bb +++ b/recipes-openivi/openivi-html5/openivi-html5_git.bb @@ -16,9 +16,7 @@ PV = "0.1" S = "${WORKDIR}/git" -SYSTEMD_SERVICE_${PN} = "openivi-html5.service" - -RDEPENDS_${PN} = "qtbase qtwebkit" +RDEPENDS_${PN} = "qtbase qtwebkit inputeventmanager windowmanager" DEPENDS = "qtbase-native qtbase qtwebkit" EXTRA_OECMAKE = " -DCMAKE_DISABLE_FIND_PACKAGE_X11=TRUE " @@ -35,8 +33,11 @@ do_install() { install -p -D ${WORKDIR}/openivi-html5.sh ${D}${bindir}/openivi-html5.sh if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - install -p -D ${WORKDIR}/openivi-html5.service ${D}${systemd_unitdir}/system/openivi-html5.service + install -d ${D}${systemd_user_unitdir} + install -p -D ${WORKDIR}/openivi-html5.service ${D}${systemd_user_unitdir}/openivi-html5.service + install -d ${D}${sysconfdir}/systemd/user/default.target.wants + ln -sf ${systemd_user_unitdir}/openivi-html5.service ${D}${sysconfdir}/systemd/user/default.target.wants fi } -FILES_${PN} += " ${prefix}/bin/openivi-html5.sh" +FILES_${PN} += " ${prefix}/bin/openivi-html5.sh ${systemd_user_unitdir} ${sysconfdir}" |