2 files changed, 40 insertions, 30 deletions
diff --git a/meta-rcar-gen3/recipes-graphics/images/core-image-weston.inc b/meta-rcar-gen3/recipes-graphics/images/core-image-weston.inc
index 28e28d4..eb4f1b8 100644
--- a/meta-rcar-gen3/recipes-graphics/images/core-image-weston.inc
+++ b/meta-rcar-gen3/recipes-graphics/images/core-image-weston.inc
@@ -1,42 +1,15 @@
 require include/gles-control.inc
 require core-image-renesas-mmp-base.inc
 
-# Wayland basic packages
-WAYLAND_BASE_PKGS = " \
-    weston-bin \
-    alsa-utils \
-    alsa-tools \
-    libdrm-tests \
-    libdrm-kms \
-"
-
-# GFX for Wayland packages
-WAYLAND_GLES_PKGS = "libgbm-dev"
-
-# GFX driver and library packages
-GLES_PKGS = " \
-    kernel-module-gles \
-    gles-user-module \
-"
-
 # Gstreamer Packages
 GSTREAMER_PKGS = "packagegroup-gstreamer1.0-plugins"
 
-# 32bit packages for wayland env
-WAYLAND_32BIT_PKGS = " \
-    lib32-weston \
-    lib32-libdrm \
-    lib32-libdrm-kms \
-    ${@base_conditional("USE_GLES", "1", "lib32-gles-user-module", "", d)} \
-"
-
 # Install packages for Wayland Env
 # default: Basic packages, Gstreamer packages
 # optional: GFX packages
 IMAGE_INSTALL_append = " \
-    ${WAYLAND_BASE_PKGS} \
     ${GSTREAMER_PKGS} \
-    ${@base_conditional("USE_GLES", "1", "${GLES_PKGS}", "", d)} \
-    ${@base_conditional("USE_GLES_WAYLAND", "1", "${WAYLAND_GLES_PKGS}", "", d)} \
-    ${@base_conditional("USE_32BIT_WAYLAND", "1", "${WAYLAND_32BIT_PKGS}", "", d)} \
+    packagegroup-wayland-community \
+    packagegroup-graphics-renesas-proprietary \
+    packagegroup-graphics-renesas-wayland \
 "
diff --git a/meta-rcar-gen3/recipes-graphics/packagegroups/packagegroup-graphic-renesas.bb b/meta-rcar-gen3/recipes-graphics/packagegroups/packagegroup-graphic-renesas.bb
new file mode 100644
index 0000000..19e165e
--- /dev/null
+++ b/meta-rcar-gen3/recipes-graphics/packagegroups/packagegroup-graphic-renesas.bb
@@ -0,0 +1,37 @@
+SUMMARY = "Renesas package group for Weston"
+LICENSE = "CLOSED & MIT"
+
+inherit packagegroup
+require include/gles-control.inc
+
+PACKAGES = " \
+    packagegroup-wayland-community \
+    packagegroup-graphics-renesas-proprietary \
+    packagegroup-graphics-renesas-wayland \
+"
+
+PR = "r0"
+
+RDEPENDS_packagegroup-wayland-community = " \
+    wayland \
+    weston \
+    weston-bin \
+    alsa-utils \
+    alsa-tools \
+    libdrm-tests \
+    libdrm-kms \
+"
+
+RDEPENDS_packagegroup-graphics-renesas-proprietary = " \
+    ${@bb.utils.contains('USE_GLES', '1', \
+    'kernel-module-gles gles-user-module' , \
+    '', d)} \
+"
+
+DEPENDS_packagegroup-graphics-renesas-wayland = "libegl"
+
+RDEPENDS_packagegroup-graphics-renesas-wayland = " \
+    ${@bb.utils.contains('USE_GLES_WAYLAND', '1', \
+    'libgbm libgbm-dev wayland-kms', \
+    '', d)} \
+"