X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=recipes-demo-hmi%2FCES2017-demo%2FCES2017-demo.bb;h=276a22733bd4faa286e07cf1ce9c9270599c1f87;hb=9cd95faf6e886fdf10823f13fe3d38616fd0d566;hp=cdb0d58b823216e4a435492533d53a21945fc6d1;hpb=0041317e6115e0c662be713a7c43a7a1fb926a5a;p=AGL%2Fmeta-agl-demo.git
diff --git a/recipes-demo-hmi/CES2017-demo/CES2017-demo.bb b/recipes-demo-hmi/CES2017-demo/CES2017-demo.bb
index cdb0d58b8..276a22733 100644
--- a/recipes-demo-hmi/CES2017-demo/CES2017-demo.bb
+++ b/recipes-demo-hmi/CES2017-demo/CES2017-demo.bb
@@ -3,12 +3,12 @@ DESCRIPTION = "App Lanucher app in QML format for the AGL Demonstrator @ CESS201
HOMEPAGE = "https://git.automotivelinux.org/gerrit/#/admin/projects/AGL/DemoApps/CES2017"
LICENSE = "MPL-2.0"
SECTION = "apps"
-PV = "1.0+git"
+PV = "1.0+git${SRCPV}"
S = "${WORKDIR}/git/"
PN = "ces2017-demo"
inherit qmake5
-DEPENDS = " qtbase qtdeclarative qtquickcontrols2 qtvirtualkeyboard qtmultimedia homescreen zip-native"
+DEPENDS = "homescreen zip-native qtmultimedia qtquickcontrols2"
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=815ca599c9df247a0c7f619bab123dad"
@@ -57,54 +57,6 @@ do_install_prepend() {
- echo " \
- \
- Home \
- \
- Home app. \
- Qt \
- \
- Apache 2.0 \
- \
-" > ${B}/apps/Home/config.xml
-
- cd ${B}/apps/Home/
- zip home.wgt config.xml home
-
-
-
- echo " \
- \
- HVAC \
- \
- HVAC app. \
- Qt \
- \
- Apache 2.0 \
- \
-" > ${B}/apps/HVAC/config.xml
-
- cd ${B}/apps/HVAC/
- zip hvac.wgt config.xml hvac
-
-
-
- echo " \
- \
- MediaPlayer \
- \
- MediaPlayer app. \
- Qt \
- \
- Apache 2.0 \
- \
-" > ${B}/apps/MediaPlayer/config.xml
-
- cd ${B}/apps/MediaPlayer/
- zip mediaplayer.wgt config.xml mediaplayer
-
-
-
echo " \
\
Phone \
@@ -137,31 +89,14 @@ do_install_prepend() {
- echo " \
- \
- Settings \
- \
- Settings app. \
- Qt \
- \
- Apache 2.0 \
- \
-" > ${B}/apps/Settings/config.xml
-
- cd ${B}/apps/Settings/
- zip settings.wgt config.xml settings
-
-
cat > ${B}/apps/installAllApps.sh <<-EOF
#!/bin/sh
/usr/bin/afm-util install controls.wgt
/usr/bin/afm-util install dashboard.wgt
- /usr/bin/afm-util install home.wgt
- /usr/bin/afm-util install hvac.wgt
- /usr/bin/afm-util install mediaplayer.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
EOF
}
@@ -169,12 +104,8 @@ 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/Home/home.wgt ${D}/usr/AGL/${PN}/
- install -m 0644 ${B}/apps/HVAC/hvac.wgt ${D}/usr/AGL/${PN}/
- install -m 0644 ${B}/apps/MediaPlayer/mediaplayer.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 -m 0644 ${B}/apps/Settings/settings.wgt ${D}/usr/AGL/${PN}/
install -m 0755 ${B}/apps/installAllApps.sh ${D}/usr/AGL/${PN}/