From: Denys Dmytriyenko <[email protected]>
Signed-off-by: Denys Dmytriyenko <[email protected]>
---
.../packagegroup-arago-tisdk-graphics-sdk-host.bb | 15 +++----
...packagegroup-arago-tisdk-graphics-sdk-target.bb | 24 ++++-------
.../packagegroup-arago-tisdk-graphics.bb | 47 ++++++----------------
3 files changed, 27 insertions(+), 59 deletions(-)
diff --git
a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics-sdk-host.bb
b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics-sdk-host.bb
index e669765..675c756 100644
---
a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics-sdk-host.bb
+++
b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics-sdk-host.bb
@@ -1,17 +1,14 @@
-DESCRIPTION = "Task to install graphics sources in SDK"
+SUMMARY = "Task to install graphics sources in SDK"
LICENSE = "MIT"
-PR = "r7"
+PR = "r8"
PACKAGE_ARCH = "${MACHINE_ARCH}"
-inherit packagegroup
+inherit packagegroup machine_features_check
-GRAPHICS_RDEPENDS =
"${@bb.utils.contains('MACHINE_FEATURES','gpu','${PREFERRED_PROVIDER_virtual/gpudriver}-src','',d)}"
-
-GRAPHICS_RDEPENDS_append_omap-a15 = "\
- ti-gc320-driver-src \
-"
+REQUIRED_MACHINE_FEATURES = "gpu"
RDEPENDS_${PN} = "\
- ${GRAPHICS_RDEPENDS} \
+ ${PREFERRED_PROVIDER_virtual/gpudriver}-src \
+ ${@bb.utils.contains('MACHINE_FEATURES', 'gc320', 'ti-gc320-driver-src',
'', d)} \
"
diff --git
a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics-sdk-target.bb
b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics-sdk-target.bb
index f4652d5..96a5bd9 100644
---
a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics-sdk-target.bb
+++
b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics-sdk-target.bb
@@ -1,25 +1,17 @@
-DESCRIPTION = "Task to install graphics binaries on sdk target"
+SUMMARY = "Task to install graphics packages on sdk target"
LICENSE = "MIT"
-PR = "r9"
+PR = "r10"
PACKAGE_ARCH = "${MACHINE_ARCH}"
-inherit packagegroup
+inherit packagegroup machine_features_check
-GRAPHICS_RDEPENDS = "\
- ${PREFERRED_PROVIDER_virtual/libgbm}-dev \
+REQUIRED_MACHINE_FEATURES = "gpu"
+
+RDEPENDS_${PN} = "\
+ libegl-dev \
libdrm-dev \
wayland-dev \
weston-dev \
- ${PREFERRED_PROVIDER_virtual/egl}-dev \
-
${@bb.utils.contains('MACHINE_FEATURES','gpu','${PREFERRED_PROVIDER_virtual/gpudriver}-dev','',d)}
\
-"
-GRAPHICS_RDEPENDS_remove_j7-evm = "ti-sgx-ddk-km-dev"
-
-GRAPHICS_RDEPENDS_append_omap-a15 = "\
- ti-gc320-libs-dev \
-"
-
-RDEPENDS_${PN} = "\
- ${GRAPHICS_RDEPENDS} \
+ ${@bb.utils.contains('MACHINE_FEATURES', 'gc320', 'ti-gc320-libs-dev', '',
d)} \
"
diff --git
a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics.bb
b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics.bb
index 72f3efe..131ec71 100644
---
a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics.bb
+++
b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics.bb
@@ -1,48 +1,27 @@
-DESCRIPTION = "Task to install graphics binaries"
+SUMMARY = "Task to install graphics packages"
LICENSE = "MIT"
PR = "r26"
PACKAGE_ARCH = "${MACHINE_ARCH}"
-inherit packagegroup
+inherit packagegroup machine_features_check
-# wayland-ivi-extension
-GRAPHICS_WAYLAND = "\
- weston \
+REQUIRED_MACHINE_FEATURES = "gpu"
+
+GFX_WAYLAND = "\
weston-init \
weston-examples \
"
-#GRAPHICS_WAYLAND_append_omap-a15 = "\
-#
${@bb.utils.contains('MACHINE_FEATURES','gpu','chromium-ozone-wayland','',d)} \
-#"
-
-#GRAPHICS_WAYLAND_append_k3 = "\
-#
${@bb.utils.contains('MACHINE_FEATURES','gpu','chromium-ozone-wayland','',d)} \
-#"
-
-GRAPHICS_RDEPENDS = "\
- ${PREFERRED_PROVIDER_virtual/libgbm} \
- ${PREFERRED_PROVIDER_virtual/egl} \
-
${@bb.utils.contains('MACHINE_FEATURES','gpu','${PREFERRED_PROVIDER_virtual/gpudriver}','',d)}
\
- ${@bb.utils.contains('MACHINE_FEATURES','gpu','glmark2','',d)} \
-"
-
-GRAPHICS_DISPLAY_UTILS = "\
-"
-
-GRAPHICS_DISPLAY_UTILS_append_omap-a15 = "\
- ${@bb.utils.contains('MACHINE_FEATURES','gpu','glsdk-util-scripts','',d)} \
-"
-
-GRAPHICS_RDEPENDS_append_omap-a15 = "\
- ti-gc320-tests \
- ti-gc320-driver \
- ti-gc320-libs \
+GFX_UTILS = ""
+GFX_UTILS_append_omap-a15 = "\
+ glsdk-util-scripts \
"
RDEPENDS_${PN} = "\
- ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', "${GRAPHICS_WAYLAND}",
'', d)} \
- ${GRAPHICS_RDEPENDS} \
- ${GRAPHICS_DISPLAY_UTILS} \
+ libegl \
+ glmark2 \
+ ${@bb.utils.contains('MACHINE_FEATURES', 'gc320', 'ti-gc320-tests', '',
d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', "${GFX_WAYLAND}", '',
d)} \
+ ${GFX_UTILS} \
"
--
2.7.4
_______________________________________________
meta-arago mailing list
[email protected]
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
