summaryrefslogtreecommitdiffstats
path: root/meta-agl-ic-container/recipes-platform/images
diff options
context:
space:
mode:
authorNaoto Yamaguchi <naoto.yamaguchi@aisin.co.jp>2023-08-20 11:10:24 +0900
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2023-09-04 13:06:14 +0000
commit452232c0acd8753bc70aa0af04171f606e132be0 (patch)
tree13e9f94014d1431da5e3b9bcc1d6c7dc2162da75 /meta-agl-ic-container/recipes-platform/images
parente377ee5b8bf34061b633f5d14ea7f704b20b5c26 (diff)
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 <naoto.yamaguchi@aisin.co.jp>
Diffstat (limited to 'meta-agl-ic-container/recipes-platform/images')
-rw-r--r--meta-agl-ic-container/recipes-platform/images/agl-instrument-cluster-container-demo.bb2
-rw-r--r--meta-agl-ic-container/recipes-platform/images/guest-image-cluster-demo.bb3
-rw-r--r--meta-agl-ic-container/recipes-platform/images/guest-image-ivi-demo.bb6
-rw-r--r--meta-agl-ic-container/recipes-platform/images/guest-image-minimal.bb2
4 files changed, 9 insertions, 4 deletions
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"