summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend3
-rw-r--r--recipes-qt/automotive/multiscreen-demo_git.bb2
-rw-r--r--recipes-qt/automotive/neptune-ui/neptune.service2
-rw-r--r--recipes-qt/automotive/neptune-ui_git.bb6
-rw-r--r--recipes-qt/automotive/qtivi_git.bb2
5 files changed, 9 insertions, 6 deletions
diff --git a/meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend b/meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend
index 5a92f25..5830238 100644
--- a/meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend
+++ b/meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend
@@ -34,4 +34,7 @@ do_preconfigure_prepend () {
34 echo "CONFIG_USB_FUNCTIONFS=m" >> ${WORKDIR}/defconfig 34 echo "CONFIG_USB_FUNCTIONFS=m" >> ${WORKDIR}/defconfig
35 echo "CONFIG_USB_ACM=m" >> ${WORKDIR}/defconfig 35 echo "CONFIG_USB_ACM=m" >> ${WORKDIR}/defconfig
36 echo "TOUCHSCREEN_FUSION_F0710A=y" >> ${WORKDIR}/defconfig 36 echo "TOUCHSCREEN_FUSION_F0710A=y" >> ${WORKDIR}/defconfig
37
38 echo "CONFIG_EXTCON=y" >> ${WORKDIR}/defconfig
39 echo "CONFIG_EXTCON_USB_GPIO=y" >> ${WORKDIR}/defconfig
37} 40}
diff --git a/recipes-qt/automotive/multiscreen-demo_git.bb b/recipes-qt/automotive/multiscreen-demo_git.bb
index 1997bd5..0c9a2bb 100644
--- a/recipes-qt/automotive/multiscreen-demo_git.bb
+++ b/recipes-qt/automotive/multiscreen-demo_git.bb
@@ -39,7 +39,7 @@ QT_MODULE_BRANCH = "master"
39 39
40SRC_URI += "git://github.com/qtproject/qt-apps-demo-assets;protocol=git;name=assets;destsuffix=git/demo-assets" 40SRC_URI += "git://github.com/qtproject/qt-apps-demo-assets;protocol=git;name=assets;destsuffix=git/demo-assets"
41 41
42SRCREV_multiscreen = "77ecd7d03aeea3bb7d10ac8ef448920da11ae306" 42SRCREV_multiscreen = "f4cd6b9667b4649b4ef8b4bb645850b05aceebde"
43SRCREV_assets = "0d47d21f082d6c9e355a55809ebd38a31ea02264" 43SRCREV_assets = "0d47d21f082d6c9e355a55809ebd38a31ea02264"
44 44
45SRCREV_FORMAT = "multiscreen_assets" 45SRCREV_FORMAT = "multiscreen_assets"
diff --git a/recipes-qt/automotive/neptune-ui/neptune.service b/recipes-qt/automotive/neptune-ui/neptune.service
index e9f3793..7793d0b 100644
--- a/recipes-qt/automotive/neptune-ui/neptune.service
+++ b/recipes-qt/automotive/neptune-ui/neptune.service
@@ -3,7 +3,7 @@ Description=Neptune
3After=dbus.service dbus-session.service systemd-user-sessions.service 3After=dbus.service dbus-session.service systemd-user-sessions.service
4 4
5[Service] 5[Service]
6ExecStart=/usr/bin/appcontroller /usr/bin/appman -r -c /opt/am/config.yaml --dbus session -c am-config.yaml Main.qml 6ExecStart=/usr/bin/appcontroller /usr/bin/appman -r --dbus session -c am-config.yaml Main.qml
7Restart=on-failure 7Restart=on-failure
8WorkingDirectory=/opt/neptune 8WorkingDirectory=/opt/neptune
9 9
diff --git a/recipes-qt/automotive/neptune-ui_git.bb b/recipes-qt/automotive/neptune-ui_git.bb
index ceceec8..ba82524 100644
--- a/recipes-qt/automotive/neptune-ui_git.bb
+++ b/recipes-qt/automotive/neptune-ui_git.bb
@@ -41,10 +41,10 @@ SRC_URI += " \
41 file://neptune.service \ 41 file://neptune.service \
42 " 42 "
43 43
44SRCREV = "504d9720ed7ef921af7e5f1ebf709662baac6555" 44SRCREV = "1770881783025b04ff5b4c7da7810d1648485b92"
45 45
46DEPENDS = "qtbase qtdeclarative" 46DEPENDS = "qtbase qtdeclarative qttools-native"
47RDEPENDS_${PN} = "qtapplicationmanager qtivi qtvirtualkeyboard \ 47RDEPENDS_${PN} = "qtapplicationmanager qtivi qtvirtualkeyboard dbus \
48 qtquickcontrols-qmlplugins qtgraphicaleffects-qmlplugins \ 48 qtquickcontrols-qmlplugins qtgraphicaleffects-qmlplugins \
49 ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)}" 49 ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)}"
50 50
diff --git a/recipes-qt/automotive/qtivi_git.bb b/recipes-qt/automotive/qtivi_git.bb
index e3dd3fd..8423f99 100644
--- a/recipes-qt/automotive/qtivi_git.bb
+++ b/recipes-qt/automotive/qtivi_git.bb
@@ -44,6 +44,6 @@ PACKAGECONFIG[geniviextras-only] = "CONFIG+=geniviextras-only"
44 44
45EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" 45EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
46 46
47SRCREV = "a15c13d6255d23ce90997913b7c1347fef396fa8" 47SRCREV = "8cabf3fb534d572c905fc0a783dbb4ebc98df41c"
48 48
49DEPENDS = "qtbase qtdeclarative qtmultimedia" 49DEPENDS = "qtbase qtdeclarative qtmultimedia"