Unify locations of applications and demo

This changeset cleans-up the locations used for apps and the ces2017-demo.
- Apps go into  /usr/AGL/apps
- Scripts are available in /usr/AGL/ces2017-demo (symlink)

As the ces2017-demo package will go away, its folder will also become obsolete
or only host startup-scripts.

Change-Id: I2b2ea8dc6de531f737305a80573ad56cb08ba009
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>

3 files changed, 16 insertions, 13 deletions

diff --git a/recipes-demo-hmi/CES2017-demo/CES2017-demo.bb b/recipes-demo-hmi/CES2017-demo/CES2017-demo.bb
index ef4b48d7a..20695bad1 100644
--- a/recipes-demo-hmi/CES2017-demo/CES2017-demo.bb
+++ b/recipes-demo-hmi/CES2017-demo/CES2017-demo.bb
@@ -91,6 +91,7 @@ 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
@@ -107,12 +108,14 @@ do_install_prepend() {
 
 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/
@@ -143,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 \
diff --git a/recipes-demo-hmi/navigation/navigation_git.bb b/recipes-demo-hmi/navigation/navigation_git.bb
index 97ba1f337..6a052c0ed 100644
--- a/recipes-demo-hmi/navigation/navigation_git.bb
+++ b/recipes-demo-hmi/navigation/navigation_git.bb
@@ -34,11 +34,10 @@ do_install_append() {
    install -m 0755 ${D}/usr/bin/navi ${WORKDIR}/widget
    zip -ju ${WORKDIR}/widget/navigation.wgt ${WORKDIR}/widget/navi ${WORKDIR}/widget/config.xml
 
-   install -d ${D}/usr/AGL/ces2017-demo
-   install -m 0644 ${WORKDIR}/widget/navigation.wgt ${D}/usr/AGL/ces2017-demo/
-   install -d ${D}/usr/AGL/ces2017-demo
+   install -d ${D}/usr/AGL/apps
+   install -m 0644 ${WORKDIR}/widget/navigation.wgt ${D}/usr/AGL/apps/
 
    install -d ${D}/usr/share/mapdata
 }
 
-FILES_${PN} += " /usr/AGL/ces2017-demo/navigation.wgt /usr/share/mapdata "
+FILES_${PN} += " /usr/AGL/apps/navigation.wgt /usr/share/mapdata "
diff --git a/recipes-demo-hmi/navigation/poiapp_git.bb b/recipes-demo-hmi/navigation/poiapp_git.bb
index 42707bab8..02a0fa0d4 100644
--- a/recipes-demo-hmi/navigation/poiapp_git.bb
+++ b/recipes-demo-hmi/navigation/poiapp_git.bb
@@ -21,9 +21,8 @@ do_install_append() {
    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/ces2017-demo
-   install -m 0644 ${WORKDIR}/widget/poi.wgt ${D}/usr/AGL/ces2017-demo/
-
+   install -d ${D}/usr/AGL/apps
+   install -m 0644 ${WORKDIR}/widget/poi.wgt ${D}/usr/AGL/apps/
 }
 
-FILES_${PN} += " /usr/AGL/ces2017-demo/poi.wgt "
+FILES_${PN} += " /usr/AGL/apps/poi.wgt "