From: Naoto Yamaguchi <naoto.yamaguchi@aisin.co.jp>
Date: Mon, 30 Sep 2024 15:22:49 +0000 (+0900)
Subject: Update cluster guest to migrate to Qt6
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=f265b77e8111e554fba4f9670e411eda8dffbc5d;p=AGL%2Fmeta-agl-devel.git

Update cluster guest to migrate to Qt6

Qt6 packages structure was changed from Qt5.
This change adopt to this structure changes.

Bug-AGL: SPEC-5162

Change-Id: I8f63babb7bd11d8e069dc42ec5824660e03b693b
Signed-off-by: Naoto Yamaguchi <naoto.yamaguchi@aisin.co.jp>
---

diff --git a/meta-agl-ic-container/recipes-demo/packagegroups/packagegroup-agl-ic-qt.bb b/meta-agl-ic-container/recipes-demo/packagegroups/packagegroup-agl-ic-qt.bb
index 37afbfb2..dabe9a0c 100644
--- a/meta-agl-ic-container/recipes-demo/packagegroups/packagegroup-agl-ic-qt.bb
+++ b/meta-agl-ic-container/recipes-demo/packagegroups/packagegroup-agl-ic-qt.bb
@@ -13,11 +13,8 @@ PACKAGES = "\
 "
 RDEPENDS:${PN} += "\
     qtbase qtbase-plugins qtbase-qmlplugins \
-    qtdeclarative qtdeclarative-plugins qtdeclarative-qmlplugins \
-    qtgraphicaleffects qtgraphicaleffects-plugins qtgraphicaleffects-qmlplugins \
-    qtmultimedia qtmultimedia-plugins qtmultimedia-qmlplugins \
-    qtquickcontrols qtquickcontrols-plugins qtquickcontrols-qmlplugins \
-    qtquickcontrols2 qtquickcontrols2-plugins qtquickcontrols2-qmlplugins \
-    qtwayland qtwayland-plugins qtwayland-qmlplugins \
-    qt3d qt3d-plugins qt3d-qmlplugins \
+    qtdeclarative qtdeclarative-qmlplugins \
+    qt3d qt3d-plugins qt3d-qmlplugins\
+    qtquick3d qtquick3d \
+    qt5compat qt5compat-qmlplugins \
 "
diff --git a/meta-agl-ic-container/recipes-platform/images/guest-image-cluster-demo.bb b/meta-agl-ic-container/recipes-platform/images/guest-image-cluster-demo.bb
index d783054b..1d67ec08 100644
--- a/meta-agl-ic-container/recipes-platform/images/guest-image-cluster-demo.bb
+++ b/meta-agl-ic-container/recipes-platform/images/guest-image-cluster-demo.bb
@@ -5,12 +5,8 @@ require guest-image-minimal.bb
 
 IMAGE_INSTALL += " \
     packagegroup-agl-ic-core \
-    weston \
-    weston-init-guest \
-    weston-ini-conf-guest \
-    cluster-refgui \
     packagegroup-agl-ic-qt \
-    pipewire-ic-ipc \
+    cluster-refgui \
 "
 
 IMAGE_INSTALL:append:rpi = " mesa-megadriver"