Signed-off-by: Denys Dmytriyenko <[email protected]>
---
meta-arago-distro/recipes-core/packagegroups/ti-world.bb | 6 +++++-
.../packagegroup-arago-qte-toolchain-target.bb | 13 +------------
2 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/meta-arago-distro/recipes-core/packagegroups/ti-world.bb
b/meta-arago-distro/recipes-core/packagegroups/ti-world.bb
index 9244d49..e104df8 100644
--- a/meta-arago-distro/recipes-core/packagegroups/ti-world.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/ti-world.bb
@@ -21,6 +21,10 @@ EXTRABROWSERS = " \
qtwebengine-examples \
"
+PYTHON2APPS = " \
+ ${@bb.utils.contains('MACHINE_FEATURES','gpu',"${EXTRABROWSERS}",'',d)} \
+"
+
DEVTOOLS = " \
linux-libc-headers-dev \
build-essential \
@@ -48,7 +52,7 @@ RDEPENDS_${PN} = "\
packagegroup-arago-tisdk-addons-extra \
${@bb.utils.contains('MACHINE_FEATURES','gpu','packagegroup-arago-tisdk-hmi','packagegroup-arago-base-tisdk-server-extra',d)}
\
${@bb.utils.contains('DISTRO_FEATURES', 'wayland', "${CHROMIUM}", '', d)} \
- ${@bb.utils.contains('MACHINE_FEATURES','gpu',"${EXTRABROWSERS}",'',d)} \
+ ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2",
"${PYTHON2APPS}", "", d)} \
${@bb.utils.contains('MACHINE_FEATURES', 'gpu dsp',
'qt-opencv-opencl-opengl-multithreaded-dev', '', d)} \
${DEVTOOLS} \
${@bb.utils.contains('TUNE_FEATURES', 'armv7a', 'valgrind', '', d)} \
diff --git
a/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-qte-toolchain-target.bb
b/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-qte-toolchain-target.bb
index ac3c6b1..c40b453 100644
---
a/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-qte-toolchain-target.bb
+++
b/meta-arago-extras/recipes-core/packagegroups/packagegroup-arago-qte-toolchain-target.bb
@@ -63,24 +63,13 @@ QT5_DEV = " \
qtxmlpatterns-dev \
qtwebkit-mkspecs \
qtwebkit-dev \
- qtwebengine-mkspecs \
- qtwebengine-dev \
+ ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2",
"qtwebengine-mkspecs qtwebengine-dev", "", d)} \
qtserialport-mkspecs \
qtserialport-dev \
qtcharts-mkspecs \
qtcharts-dev \
"
-#QT5_DEV_append_k3 = " \
-# qtwebkit-mkspecs \
-# qtwebkit-dev \
-#"
-#
-#QT5_DEV_remove_k3 = " \
-# qtwebengine-mkspecs \
-# qtwebengine-dev \
-#"
-
RDEPENDS_${PN} += " \
${@oe.utils.conditional('QT_PROVIDER', 'qt5', "${QT5_DEV}",
"${QT4_DEV}", d)} \
"
--
2.7.4
_______________________________________________
meta-arago mailing list
[email protected]
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
