hmi: move application data to /usr

Could not resist to do some cleaning.

[GDP-611] Prepare system for libostree

Signed-off-by: Mirza Krak <mirza.krak@endian.se>

Author: mirzak

meta-genivi-dev/meta-genivi-dev/recipes-dev-hmi/genivi-dev-platform-hmi/gdp-new-hmi.bb

@@ -1,34 +1,44 @@
-SRC_URI = "git://github.com/GENIVI/hmi-layout-gdp.git"
-SRCREV = "86f5a365a0b1c4cd96a6344db7137a0440c11f7b"
+DESCRIPTION = "Reference HMI application for GDP"
+HOMEPAGE = "https://github.com/GENIVI/hmi-layout-gdp"
+
 LICENSE  = "MPL-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=9741c346eef56131163e13b9db1241b3"
 
-DEPENDS = "dbus-c++ systemd wayland-ivi-extension qtquick1 qtdeclarative qtbase ivi-logging"
+SRC_URI = "\
+    git://github.com/GENIVI/hmi-layout-gdp.git \
+    file://gdp-new-hmi.service \
+"
 
-RDEPENDS_${PN} += "qtbase qtsvg"
+SRCREV = "95aadfb33d95e14030585c3fa2e1afb0e7b743c8"
 
 S = "${WORKDIR}/git"
 
-inherit autotools pkgconfig qmake5 systemd
+DEPENDS = "\
+    dbus-c++ \
+    ivi-logging \
+    qtbase \
+    qtdeclarative \
+    qtquick1 \
+    systemd \
+    wayland-ivi-extension \
+"
 
-SYSTEMD_AUTO_ENABLE = "enable"
+RDEPENDS_${PN} = "qtbase qtsvg"
 
-SRC_URI_append ="\
-    file://gdp-new-hmi.service \
-    "
-
-FILES_${PN} += "\
-    ${libdir}/* \
-    /opt/gdp-hmi/bin/gdp-hmi \
-    /usr/share/applications/* \
-    ${systemd_unitdir}/* \
-    /home/* \
-"
+inherit autotools pkgconfig qmake5
 
 do_install_append() {
-        install -d ${D}${libdir}/systemd/user
-        install -m 0444 ${WORKDIR}/gdp-new-hmi.service \
-                        ${D}${libdir}/systemd/user
-        install -d ${D}${sysconfdir}/systemd/user/default.target.wants
-        ln -sf /usr/lib/systemd/user/gdp-new-hmi.service ${D}${sysconfdir}/systemd/user/default.target.wants/gdp-new-hmi.service
+    install -d ${D}${systemd_user_unitdir}
+    install -p -D ${WORKDIR}/gdp-new-hmi.service ${D}${systemd_user_unitdir}/gdp-new-hmi.service
+    install -d ${D}${sysconfdir}/systemd/user/default.target.wants
+    ln -sf ${systemd_user_unitdir}/gdp-new-hmi.service ${D}${sysconfdir}/systemd/user/default.target.wants
+
+    install -d ${D}${bindir}
+    mv ${D}/opt/gdp-hmi/bin/gdp-hmi ${D}${bindir}/gdp-hmi
+    rm -rf ${D}/opt
 }
+
+FILES_${PN} += "\
+    ${libdir}/qt5/qml/com/genivi/ \
+    ${systemd_user_unitdir}/gdp-new-hmi.service \
+"

meta-genivi-dev/meta-genivi-dev/recipes-dev-hmi/genivi-dev-platform-hmi/gdp-new-hmi/gdp-new-hmi.service

@@ -5,7 +5,7 @@ After=weston.service
 
 [Service]
 Environment=LD_PRELOAD=/usr/lib/libEGL.so
-ExecStart=/opt/gdp-hmi/bin/gdp-hmi -platform wayland
+ExecStart=/usr/bin/gdp-hmi -platform wayland
 Restart=always
 RestartSec=5