Unify locations of applications and demo

[AGL/meta-agl-demo.git] / recipes-demo-hmi / CES2017-demo / CES2017-demo.bb

diff --git a/recipes-demo-hmi/CES2017-demo/CES2017-demo.bb b/recipes-demo-hmi/CES2017-demo/CES2017-demo.bb
index 777f98e..20695ba 100644 (file)
--- a/recipes-demo-hmi/CES2017-demo/CES2017-demo.bb
+++ b/recipes-demo-hmi/CES2017-demo/CES2017-demo.bb
@@ -91,23 +91,31 @@ do_install_prepend() {
 
     cat > ${B}/apps/installAllApps.sh <<-EOF
        #!/bin/sh
+       cd /usr/AGL/apps
        /usr/bin/afm-util install controls.wgt
        /usr/bin/afm-util install dashboard.wgt
        /usr/bin/afm-util install phone.wgt
        /usr/bin/afm-util install radio.wgt
        /usr/bin/afm-util install settings.wgt
        /usr/bin/afm-util install navigation.wgt
+       /usr/bin/afm-util install poi.wgt
+       
+       #it's Workaround
+       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'
        EOF
 }
 
 do_install() {
     install -d ${D}/usr/AGL/${PN}
-    install -m 0644 ${B}/apps/Controls/controls.wgt ${D}/usr/AGL/${PN}/
-    install -m 0644 ${B}/apps/Dashboard/dashboard.wgt ${D}/usr/AGL/${PN}/
-    install -m 0644 ${B}/apps/Phone/phone.wgt ${D}/usr/AGL/${PN}/
-    install -m 0644 ${B}/apps/Radio/radio.wgt ${D}/usr/AGL/${PN}/
+    install -d ${D}/usr/AGL/apps
+    install -m 0644 ${B}/apps/Controls/controls.wgt ${D}/usr/AGL/apps/
+    install -m 0644 ${B}/apps/Dashboard/dashboard.wgt ${D}/usr/AGL/apps/
+    install -m 0644 ${B}/apps/Phone/phone.wgt ${D}/usr/AGL/apps/
+    install -m 0644 ${B}/apps/Radio/radio.wgt ${D}/usr/AGL/apps/
 
-    install -m 0755 ${B}/apps/installAllApps.sh ${D}/usr/AGL/${PN}/
+    install -m 0755 ${B}/apps/installAllApps.sh ${D}/usr/AGL/apps/
+    ln -sf            ../apps/installAllApps.sh ${D}/usr/AGL/${PN}/installAllApps.sh
 
     install -d ${D}${libdir}/qt5/qml/AGL/Demo/Controls/
     install -m 0644 ${S}/imports/AGL/Demo/Controls/qmldir ${D}${libdir}/qt5/qml/AGL/Demo/Controls/
@@ -138,6 +146,8 @@ do_install() {
 #}
 
 FILES_${PN} += "/usr/AGL/ \
+        /usr/AGL/apps/* \
+        /usr/AGL/${PN}/* \
        /usr/lib/qt5/qml/AGL/Demo/Controls/qmldir \
        /usr/lib/qt5/qml/AGL/Demo/Controls/ImageButton.qml \
        /usr/lib/qt5/qml/AGL/Demo/Controls/ToggleButton.qml \