diff options
| author |   Naoto Yamaguchi <naoto.yamaguchi@aisin.co.jp> | 2024-10-01 01:44:46 +0900 |
|---|---|---|
| committer | Naoto YAMAGUCHI <naoto.yamaguchi@aisin.co.jp> | 2024-10-09 16:49:01 +0000 |
| commit | 5406db62a6f753155050f00f68e09a71decf070d (patch) | |
| tree | 673ddd917be9e1234049fc4c4c63405150e3da2d /meta-agl-ic-container/recipes-demo/mominavi | |
| parent | 0905846dec112d69a532dac26bd2e31ef94d35d7 (diff) | |
Update each apps to migrate Qt6
The AGL IC container integration migrate to Qt6 from Qt5 now.
Each Apps needs modification.
This patch change rev and environment setting.
Bug-AGL: SPEC-5162
Change-Id: Ib7273fc13d5ab381bed7675662bd1cdc7f941c33
Signed-off-by: Naoto Yamaguchi <naoto.yamaguchi@aisin.co.jp>
Diffstat (limited to 'meta-agl-ic-container/recipes-demo/mominavi')
3 files changed, 13 insertions, 19 deletions
diff --git a/meta-agl-ic-container/recipes-demo/mominavi/mominavi/mominavi b/meta-agl-ic-container/recipes-demo/mominavi/mominavi/mominavi index a683c9d5..f8693419 100644 --- a/meta-agl-ic-container/recipes-demo/mominavi/mominavi/mominavi +++ b/meta-agl-ic-container/recipes-demo/mominavi/mominavi/mominavi @@ -1,10 +1,10 @@ XDG_RUNTIME_DIR=/run/user/0 QT_QPA_PLATFORM=wayland-egl -QT_QPA_PLATFORM_PLUGIN_PATH=/usr/lib/plugins/ QT_WAYLAND_DISABLE_WINDOWDECORATION=1 -QT_QPA_FONTDIR=/usr/share/fonts/truetype QT_IVI_SURFACE_ID=2010 QT_WAYLAND_SHELL_INTEGRATION=ivi-shell +QT_QPA_PLATFORM_PLUGIN_PATH=/usr/lib/plugins/ +QT_QPA_FONTDIR=/usr/share/fonts/truetype QML_IMPORT_PATH=/usr/lib/qml/ QML2_IMPORT_PATH=/usr/lib/qml/ -WAYLAND_DISPLAY=wayland-1 +HOME=/home/root diff --git a/meta-agl-ic-container/recipes-demo/mominavi/mominavi/mominavi.service b/meta-agl-ic-container/recipes-demo/mominavi/mominavi/mominavi.service index b49609e0..1be3ceab 100644 --- a/meta-agl-ic-container/recipes-demo/mominavi/mominavi/mominavi.service +++ b/meta-agl-ic-container/recipes-demo/mominavi/mominavi/mominavi.service @@ -1,12 +1,15 @@ [Unit] Description=mominavi -After=multi-user.target weston.service network-online.target -Requires=multi-user.target weston.service network-online.target +After=multi-user.target momiscreen.service network-online.target +Requires=multi-user.target momiscreen.service network-online.target [Service] Type=simple EnvironmentFile=/etc/default/mominavi +EnvironmentFile=-/etc/default/qtwayland-common ExecStart=/usr/bin/mominavi +Restart=on-failure +RestartSec=1s [Install] WantedBy=multi-user.target diff --git a/meta-agl-ic-container/recipes-demo/mominavi/mominavi_git.bb b/meta-agl-ic-container/recipes-demo/mominavi/mominavi_git.bb index f9b36f9f..ec5463e2 100644 --- a/meta-agl-ic-container/recipes-demo/mominavi/mominavi_git.bb +++ b/meta-agl-ic-container/recipes-demo/mominavi/mominavi_git.bb @@ -6,36 +6,29 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504" DEPENDS = " \ qtbase \ - qtquickcontrols2 \ + qtdeclarative \ + qtwayland \ qtlocation \ - qtgraphicaleffects \ qtsvg \ qtwebsockets \ " -PV = "1.0.0" +PV = "2.0.0" SRC_URI = "git://git.automotivelinux.org/apps/mominavi;protocol=https;branch=${AGL_BRANCH} \ file://mominavi.service \ file://mominavi \ " -SRCREV = "10c3f7996d4bbe04d237baff2ef16573bc9eb9ed" +SRCREV = "e36c747c21907b154d6170132933d5ee6d0596eb" S = "${WORKDIR}/git" -inherit qmake5 systemd +inherit qt6-qmake systemd -MOMIMAP_MAPBOX_ACCESS_TOKEN ??= "YOU_NEED_TO_SET_IT_IN_LOCAL_CONF" -MOMIMAP_MAPBOX_STYLE ??= "mapbox://styles/wata2ki/ckoy853ue11a117nss0uxut76" MOMIMAP_INITIAL_LATITUDE ??= "36.129" MOMIMAP_INITIAL_LONGITUDE ??= "-115.1533" QT_INSTALL_PREFIX = "/usr" -do_configure:prepend() { - if [ "${MOMIMAP_MAPBOX_ACCESS_TOKEN}" = "YOU_NEED_TO_SET_IT_IN_LOCAL_CONF" ]; then - bbwarn "WARNING: You should set MapBox development key to MOMIMAP_MAPBOX_ACCESS_TOKEN variable in local.conf." - fi -} do_install:append() { install -d ${D}/${systemd_unitdir}/system install -m 0644 ${WORKDIR}/mominavi.service ${D}/${systemd_unitdir}/system @@ -43,8 +36,6 @@ do_install:append() { install -m 0755 -d ${D}${sysconfdir}/default/ install -m 0755 ${WORKDIR}/mominavi ${D}${sysconfdir}/default/ - echo 'MOMIMAP_MAPBOX_ACCESS_TOKEN=${MOMIMAP_MAPBOX_ACCESS_TOKEN}' >> ${D}${sysconfdir}/default/mominavi - echo 'MOMIMAP_MAPBOX_STYLE=${MOMIMAP_MAPBOX_STYLE}' >> ${D}${sysconfdir}/default/mominavi echo 'MOMIMAP_INITIAL_LATITUDE=${MOMIMAP_INITIAL_LATITUDE}' >> ${D}${sysconfdir}/default/mominavi echo 'MOMIMAP_INITIAL_LONGITUDE=${MOMIMAP_INITIAL_LONGITUDE}' >> ${D}${sysconfdir}/default/mominavi } |