Fixed demo recipes to auto-install wgt app at first boot

 * link to gerrit review 8473 (meta-agl-extra)

Change-Id: I8d8c03654d4eee14bb28449d29afd4c75fac6385
Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>

2 files changed, 13 insertions, 7 deletions

diff --git a/recipes-demo-hmi/navigation/navigation_git.bb b/recipes-demo-hmi/navigation/navigation_git.bb
index 2bdd1cc0..a4513da5 100755
--- a/recipes-demo-hmi/navigation/navigation_git.bb
+++ b/recipes-demo-hmi/navigation/navigation_git.bb
@@ -26,6 +26,7 @@ SRC_URI="git://github.com/AGLExport/gpsnavi.git;branch=agl \
 SECURITY_CFLAGS = ""
 
 inherit autotools pkgconfig
+inherit aglwgt
 
 S = "${WORKDIR}/git"
 
@@ -36,11 +37,17 @@ do_compile_prepend() {
 
 do_install_append() {
    install -d ${D}/usr/AGL/apps
-   install -m 0644 ${B}/navigation.wgt ${D}/usr/AGL/apps/
+   mkdir -p ${B}/package/
+   mv ${B}/navigation.wgt ${B}/package/
    install -m 0755 ${WORKDIR}/download_mapdata_jp.sh ${D}/usr/AGL/apps/
    install -m 0755 ${WORKDIR}/download_mapdata_uk.sh ${D}/usr/AGL/apps/
 
    install -d ${D}/var/mapdata
 }
+#it's Workaround
+EXTRA_WGT_POSTINSTALL = "\
+        cyad -s -k MANIFESTS -t allow -c User::App::navigation -u '*' -p 'http://tizen.org/privilege/internal/dbus';\
+        cyad -s -k MANIFESTS -t allow -c User::App::poi -u '*' -p 'http://tizen.org/privilege/internal/dbus';\
+"
 
-FILES_${PN} += " /usr/AGL/apps/* /var/mapdata "
+FILES_${PN} += " /usr/AGL/apps/*.sh /var/mapdata "
diff --git a/recipes-demo-hmi/navigation/poiapp_git.bb b/recipes-demo-hmi/navigation/poiapp_git.bb
index 2b670b36..3bdac9ea 100755
--- a/recipes-demo-hmi/navigation/poiapp_git.bb
+++ b/recipes-demo-hmi/navigation/poiapp_git.bb
@@ -7,6 +7,7 @@ LICENSE          = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=947b2d60ca3872e172034438e9801200"
 
 inherit cmake_qt5 pkgconfig
+inherit aglwgt
 
 DEPENDS += " qtbase libdbus-c++ json-c zip-native \
            "
@@ -22,10 +23,8 @@ do_install_append() {
    mkdir -p ${WORKDIR}/widget
    install -m 0644 ${WORKDIR}/config.xml ${WORKDIR}/widget
    install -m 0755 ${D}/usr/bin/yelp-client ${WORKDIR}/widget/poi
-   zip -ju ${WORKDIR}/widget/poi.wgt ${WORKDIR}/widget/poi ${WORKDIR}/widget/config.xml
 
-   install -d ${D}/usr/AGL/apps
-   install -m 0644 ${WORKDIR}/widget/poi.wgt ${D}/usr/AGL/apps/
-}
+   mkdir -p ${B}/package
+   zip -ju ${B}/package/poi.wgt ${WORKDIR}/widget/poi ${WORKDIR}/widget/config.xml
 
-FILES_${PN} += " /usr/AGL/apps/poi.wgt "
+}