From 452232c0acd8753bc70aa0af04171f606e132be0 Mon Sep 17 00:00:00 2001 From: Naoto Yamaguchi Date: Sun, 20 Aug 2023 11:10:24 +0900 Subject: Fix agl IC demo is not show both screen In R-Car platform such as ref-hw is not show cluster and ivi screen. It cause by installing gles-user-module-firmware into guest image. gles-user-module-firmware is installed by kernel-module-gles dependency. kernel-module-gles is installed by MACHINE_EXTRA_RRECOMMENDS from agl_rcar.inc, but this environment variable can't delete in guest build. This patch fix this issue. Bug-AGL: SPEC-4888 Change-Id: Ica0f8d6ef48d30333bbccdff7380471b11ad063c Signed-off-by: Naoto Yamaguchi --- .../kernel-module-gles/kernel-module-gles.bbappend | 2 -- .../recipes-demo/mominavi/mominavi_git.bb | 6 +++--- .../recipes-demo/momiplay/momiplay_git.bb | 4 ++-- .../recipes-demo/momiscreen/momiscreen_git.bb | 2 +- .../packagegroups/packagegroup-agl-ic-qt.bb | 23 ++++++++++++++++++++++ .../agl-instrument-cluster-container-demo.bb | 2 +- .../images/guest-image-cluster-demo.bb | 3 +++ .../images/guest-image-ivi-demo.bb | 6 +++--- .../recipes-platform/images/guest-image-minimal.bb | 2 ++ 9 files changed, 38 insertions(+), 12 deletions(-) create mode 100644 meta-agl-ic-container/recipes-demo/packagegroups/packagegroup-agl-ic-qt.bb diff --git a/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-kernel/kernel-module-gles/kernel-module-gles.bbappend b/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-kernel/kernel-module-gles/kernel-module-gles.bbappend index 0fc00e78..f247fa6b 100644 --- a/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-kernel/kernel-module-gles/kernel-module-gles.bbappend +++ b/meta-agl-ic-container/dynamic-layers/meta-rcar-gen3/recipes-kernel/kernel-module-gles/kernel-module-gles.bbappend @@ -1,5 +1,3 @@ inherit guest-kernel-module SYSROOT_PREPROCESS_FUNCS:aglcontainerguest = "" - -RDEPENDS:${PN}:append = " gles-user-module-firmware" 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 8d2763a4..f5c2cfd3 100644 --- a/meta-agl-ic-container/recipes-demo/mominavi/mominavi_git.bb +++ b/meta-agl-ic-container/recipes-demo/mominavi/mominavi_git.bb @@ -51,7 +51,7 @@ SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE:${PN} = "mominavi.service" RDEPENDS:${PN} = " \ - qtsvg \ - qtwebsockets \ - qtlocation \ + qtsvg qtsvg-plugins qtsvg-qmlplugins \ + qtwebsockets qtwebsockets-plugins qtwebsockets-qmlplugins \ + qtlocation qtlocation-plugins qtlocation-qmlplugins \ " diff --git a/meta-agl-ic-container/recipes-demo/momiplay/momiplay_git.bb b/meta-agl-ic-container/recipes-demo/momiplay/momiplay_git.bb index 52db1194..b4e17ffa 100644 --- a/meta-agl-ic-container/recipes-demo/momiplay/momiplay_git.bb +++ b/meta-agl-ic-container/recipes-demo/momiplay/momiplay_git.bb @@ -43,6 +43,6 @@ SYSTEMD_SERVICE:${PN} = "momiplay.service" SYSTEMD_AUTO_ENABLE:${PN} = "disable" RDEPENDS:${PN} = " \ - qtsvg \ - qtmultimedia \ + qtsvg qtsvg-plugins qtsvg-qmlplugins \ + qtmultimedia qtmultimedia-plugins qtmultimedia-qmlplugins \ " diff --git a/meta-agl-ic-container/recipes-demo/momiscreen/momiscreen_git.bb b/meta-agl-ic-container/recipes-demo/momiscreen/momiscreen_git.bb index f14df8aa..568eb066 100644 --- a/meta-agl-ic-container/recipes-demo/momiscreen/momiscreen_git.bb +++ b/meta-agl-ic-container/recipes-demo/momiscreen/momiscreen_git.bb @@ -40,4 +40,4 @@ FILES:${PN} += " \ SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE:${PN} = "momiscreen.service" -RDEPENDS:${PN} = "qtsvg " +RDEPENDS:${PN} = "qtsvg qtsvg-plugins qtsvg-qmlplugins" 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 new file mode 100644 index 00000000..37afbfb2 --- /dev/null +++ b/meta-agl-ic-container/recipes-demo/packagegroups/packagegroup-agl-ic-qt.bb @@ -0,0 +1,23 @@ +SUMMARY = "AGL Instrument Cluster Demo Qt Packages" +DESCRIPTION = "This pacage group including Qt packages for AGL Instrument Cluster Demo." +HOMEPAGE = "https://confluence.automotivelinux.org/display/IC" + +LICENSE = "Apache-2.0" + +PACKAGE_ARCH = "${TUNE_PKGARCH}" + +inherit packagegroup + +PACKAGES = "\ + packagegroup-agl-ic-qt \ +" +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 \ +" diff --git a/meta-agl-ic-container/recipes-platform/images/agl-instrument-cluster-container-demo.bb b/meta-agl-ic-container/recipes-platform/images/agl-instrument-cluster-container-demo.bb index cae25722..3e2d6cb1 100644 --- a/meta-agl-ic-container/recipes-platform/images/agl-instrument-cluster-container-demo.bb +++ b/meta-agl-ic-container/recipes-platform/images/agl-instrument-cluster-container-demo.bb @@ -34,4 +34,4 @@ VIRTUAL-RUNTIME_net_manager = "systemd" # Under the this line, shall describe machine specific package. -IMAGE_INSTALL:append:rcar-gen3 = " kernel-module-gles " +IMAGE_INSTALL:append:rcar-gen3 = " kernel-module-gles gles-user-module-firmware" 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 8cf15287..b987370c 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 @@ -8,9 +8,12 @@ IMAGE_INSTALL += " \ weston-init-guest \ weston-ini-conf-guest \ cluster-refgui \ + packagegroup-agl-ic-qt \ pipewire-ic-ipc \ " +IMAGE_INSTALL:append:raspberrypi4 = " mesa-megadriver" + IMAGE_OVERHEAD_FACTOR = "0" EXTRA_IMAGECMD:append = " -L agl-cluster" IMAGE_ROOTFS_EXTRA_SPACE = "0" diff --git a/meta-agl-ic-container/recipes-platform/images/guest-image-ivi-demo.bb b/meta-agl-ic-container/recipes-platform/images/guest-image-ivi-demo.bb index fe5928b7..4ac579a4 100644 --- a/meta-agl-ic-container/recipes-platform/images/guest-image-ivi-demo.bb +++ b/meta-agl-ic-container/recipes-platform/images/guest-image-ivi-demo.bb @@ -12,9 +12,7 @@ IMAGE_INSTALL += " \ mominavi \ momiplay \ momiscreen \ - qtquickcontrols \ - qtquickcontrols2 \ - qtwayland \ + packagegroup-agl-ic-qt \ systemd-netif-config \ ttf-dejavu-sans \ ttf-dejavu-sans-mono \ @@ -29,6 +27,8 @@ IMAGE_INSTALL += " \ wireplumber-policy-config-agl \ " +IMAGE_INSTALL:append:raspberrypi4 = " mesa-megadriver" + IMAGE_OVERHEAD_FACTOR = "0" EXTRA_IMAGECMD:append = " -L agl-momi-ivi" IMAGE_ROOTFS_EXTRA_SPACE = "0" diff --git a/meta-agl-ic-container/recipes-platform/images/guest-image-minimal.bb b/meta-agl-ic-container/recipes-platform/images/guest-image-minimal.bb index ca53456c..ea19f5ed 100644 --- a/meta-agl-ic-container/recipes-platform/images/guest-image-minimal.bb +++ b/meta-agl-ic-container/recipes-platform/images/guest-image-minimal.bb @@ -8,3 +8,5 @@ IMAGE_INSTALL += " \ packagegroup-agl-ic-core \ packagegroup-agl-container-feature-logging-guest \ " + +NO_RECOMMENDATIONS = "1" -- cgit 1.2.3-korg