From: Denys Dmytriyenko <[email protected]>
Signed-off-by: Denys Dmytriyenko <[email protected]>
---
meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb | 2 +-
.../recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb | 4 ++--
.../recipes-core/packagegroups/packagegroup-arago-tisdk-opencl.bb | 4 +++-
meta-arago-distro/recipes-core/packagegroups/ti-world.bb | 8 ++++++--
4 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb
b/meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb
index 7f8b508..9049ada 100644
--- a/meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb
+++ b/meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb
@@ -12,7 +12,7 @@ IMAGE_INSTALL += "\
${@bb.utils.contains('MACHINE_FEATURES','gpu','packagegroup-arago-tisdk-graphics','',d)}
\
${@bb.utils.contains('MACHINE_FEATURES','gpu','packagegroup-arago-tisdk-gtk','',d)}
\
${@bb.utils.contains('MACHINE_FEATURES','gpu','packagegroup-arago-tisdk-qte','',d)}
\
-
${@bb.utils.contains('MACHINE_FEATURES','dsp','packagegroup-arago-tisdk-opencl','',d)}
\
+ ${@['','packagegroup-arago-tisdk-opencl'][oe.utils.all_distro_features(d,
'opencl', True, False) and bb.utils.contains('MACHINE_FEATURES', 'dsp', True,
False, d)]} \
packagegroup-arago-tisdk-connectivity \
packagegroup-arago-tisdk-crypto \
packagegroup-arago-tisdk-matrix \
diff --git
a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb
b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb
index 1b57798..a6e5e4c 100644
---
a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb
+++
b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-matrix.bb
@@ -212,9 +212,9 @@ RDEPENDS_${PN} = " \
${MATRIX_TOUCH_APPS} \
${MATRIX_APPS} \
${@bb.utils.contains('MACHINE_FEATURES','gpu',"${MATRIX_GPU_DEMOS}",'',d)}
\
-
${@bb.utils.contains('MACHINE_FEATURES','dsp',"${MATRIX_OPENCL_APPS}",'',d)} \
+ ${@['',"${MATRIX_OPENCL_APPS}"][oe.utils.all_distro_features(d, 'opencl',
True, False) and bb.utils.contains('MACHINE_FEATURES', 'dsp', True, False, d)]}
\
"
RDEPENDS_${PN}-extra = " \
-
${@bb.utils.contains('MACHINE_FEATURES','dsp',"${MATRIX_OPENCV_OPENCL_APPS}",'',d)}
\
+ ${@['',"${MATRIX_OPENCV_OPENCL_APPS}"][oe.utils.all_distro_features(d,
'opencl opencv', True, False) and bb.utils.contains('MACHINE_FEATURES', 'dsp',
True, False, d)]} \
"
diff --git
a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-opencl.bb
b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-opencl.bb
index 63b9f20..85ddcc0 100644
---
a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-opencl.bb
+++
b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-opencl.bb
@@ -4,7 +4,9 @@ PR = "r4"
PACKAGE_ARCH = "${MACHINE_ARCH}"
-inherit packagegroup
+inherit packagegroup features_check
+
+REQUIRED_DISTRO_FEATURES = "opencl"
PACKAGES =+ "${PN}-extra"
diff --git a/meta-arago-distro/recipes-core/packagegroups/ti-world.bb
b/meta-arago-distro/recipes-core/packagegroups/ti-world.bb
index 6c0ba5f..e357cd0 100644
--- a/meta-arago-distro/recipes-core/packagegroups/ti-world.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/ti-world.bb
@@ -33,6 +33,11 @@ DEVTOOLS = " \
git \
"
+OPENCL = " \
+
${@bb.utils.contains('MACHINE_FEATURES','dsp','packagegroup-arago-tisdk-opencl
ti-opencl','',d)} \
+
${@bb.utils.contains('MACHINE_FEATURES','dsp','packagegroup-arago-tisdk-opencl-extra','',d)}
\
+"
+
RDEPENDS_${PN} = "\
packagegroup-arago-base \
packagegroup-arago-console \
@@ -41,8 +46,7 @@ RDEPENDS_${PN} = "\
${@bb.utils.contains('MACHINE_FEATURES','gpu','packagegroup-arago-tisdk-graphics','',d)}
\
${@bb.utils.contains('MACHINE_FEATURES','gpu','packagegroup-arago-tisdk-gtk','',d)}
\
${@bb.utils.contains('MACHINE_FEATURES','gpu','packagegroup-arago-tisdk-qte
qt3d-examples','',d)} \
-
${@bb.utils.contains('MACHINE_FEATURES','dsp','packagegroup-arago-tisdk-opencl
ti-opencl','',d)} \
-
${@bb.utils.contains('MACHINE_FEATURES','dsp','packagegroup-arago-tisdk-opencl-extra','',d)}
\
+ ${@oe.utils.all_distro_features(d, "opencl", "${OPENCL}")} \
packagegroup-arago-tisdk-connectivity \
packagegroup-arago-tisdk-crypto \
packagegroup-arago-tisdk-matrix \
--
2.7.4
_______________________________________________
meta-arago mailing list
[email protected]
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
