summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2016-12-16 13:35:07 +0200
committerSamuli Piippo <samuli.piippo@qt.io>2016-12-16 13:18:10 +0000
commit60fc0576592792cc1b358044588edd9283f55072 (patch)
treeae28dfcdc4682a633bc87eb7cbf40968c144093b
parentb1fab1e70f8c042826d4c2144ceb40ad5da321cb (diff)
downloadmeta-boot2qt-60fc0576592792cc1b358044588edd9283f55072.tar.gz
Update automotive components
Latests revs for appman, neptune and qtivi. Change-Id: I18afa4f5189178d8dc039c311f472c493be3fd9c Reviewed-by: Teemu Holappa <teemu.holappa@qt.io> Reviewed-by: Gordan Markus <gordan.markus@pelagicore.com>
-rw-r--r--recipes-qt/automotive/neptune-ui_git.bb6
-rw-r--r--recipes-qt/automotive/qtapplicationmanager_git.bb2
-rw-r--r--recipes-qt/automotive/qtivi_git.bb2
3 files changed, 3 insertions, 7 deletions
diff --git a/recipes-qt/automotive/neptune-ui_git.bb b/recipes-qt/automotive/neptune-ui_git.bb
index bb188f8..d4ef8e4 100644
--- a/recipes-qt/automotive/neptune-ui_git.bb
+++ b/recipes-qt/automotive/neptune-ui_git.bb
@@ -42,7 +42,7 @@ SRC_URI += " \
42 file://neptune.service \ 42 file://neptune.service \
43 " 43 "
44 44
45SRCREV = "3d36a7b8e53770c91db60cec9586ef572a2f2814" 45SRCREV = "fd18dcbb9f53eb3948da890704530007327c476f"
46 46
47DEPENDS = "qtbase qtdeclarative" 47DEPENDS = "qtbase qtdeclarative"
48RDEPENDS_${PN} = "qtapplicationmanager qtivi qtvirtualkeyboard \ 48RDEPENDS_${PN} = "qtapplicationmanager qtivi qtvirtualkeyboard \
@@ -55,10 +55,6 @@ do_configure_prepend() {
55do_install_append() { 55do_install_append() {
56 install -m 0755 -d ${D}${systemd_unitdir}/system 56 install -m 0755 -d ${D}${systemd_unitdir}/system
57 install -m 0644 ${WORKDIR}/neptune.service ${D}${systemd_unitdir}/system/ 57 install -m 0644 ${WORKDIR}/neptune.service ${D}${systemd_unitdir}/system/
58
59 install -m 0644 ${S}/Main*.qml ${D}/opt/neptune
60 install -m 0644 ${S}/MainWithCluster.qml ${D}/opt/neptune
61 install -m 0644 ${S}/am-config.yaml ${D}/opt/neptune
62} 58}
63 59
64PACKAGES =+ "${PN}-apps" 60PACKAGES =+ "${PN}-apps"
diff --git a/recipes-qt/automotive/qtapplicationmanager_git.bb b/recipes-qt/automotive/qtapplicationmanager_git.bb
index 1121713..3b54890 100644
--- a/recipes-qt/automotive/qtapplicationmanager_git.bb
+++ b/recipes-qt/automotive/qtapplicationmanager_git.bb
@@ -34,7 +34,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=317fda864ac33d41406ff3938c3e78d1"
34inherit qt5-module 34inherit qt5-module
35require recipes-qt/qt5/qt5-git.inc 35require recipes-qt/qt5/qt5-git.inc
36 36
37SRCREV = "d9d1e0851089978d44d943d7125af1e51e0c3e3c" 37SRCREV = "be9e9a37c2cd848cfdbb97990e0047f1a0834a8a"
38 38
39DEPENDS = "qtbase qtdeclarative libyaml libarchive \ 39DEPENDS = "qtbase qtdeclarative libyaml libarchive \
40 ${@base_contains("DISTRO_FEATURES", "wayland", "qtwayland", "", d)}" 40 ${@base_contains("DISTRO_FEATURES", "wayland", "qtwayland", "", d)}"
diff --git a/recipes-qt/automotive/qtivi_git.bb b/recipes-qt/automotive/qtivi_git.bb
index 7c487ac..39d6eb2 100644
--- a/recipes-qt/automotive/qtivi_git.bb
+++ b/recipes-qt/automotive/qtivi_git.bb
@@ -43,6 +43,6 @@ PACKAGECONFIG[taglib] = "CONFIG+=config_taglib CONFIG+=done_config_taglib,CONFIG
43 43
44EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" 44EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
45 45
46SRCREV = "1163c5e8e269d73b4e422a12e47f7db34285c4a0" 46SRCREV = "ef2d628c7f34bf40a7a146a71a10c1f7e6f8d29e"
47 47
48DEPENDS = "qtbase qtdeclarative qtmultimedia" 48DEPENDS = "qtbase qtdeclarative qtmultimedia"