From: Denys Dmytriyenko <[email protected]> Make them part of ti-world, while default rootfs should only have qtwebkit now.
Signed-off-by: Denys Dmytriyenko <[email protected]> --- .../recipes-core/packagegroups/packagegroup-arago-qte.bb | 8 -------- .../packagegroups/packagegroup-arago-tisdk-qte.bb | 11 ----------- meta-arago-distro/recipes-core/packagegroups/ti-world.bb | 8 +++++++- 3 files changed, 7 insertions(+), 20 deletions(-) diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qte.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qte.bb index 5984fee..bf8124d 100644 --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qte.bb +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-qte.bb @@ -41,19 +41,11 @@ QT5_ESSENTIALS = "\ qtvirtualkeyboard-plugins \ qtvirtualkeyboard-qmlplugins \ qtwebkit-qmlplugins \ - qtwebengine-qmlplugins \ liberation-fonts \ qtconnectivity \ qtconnectivity-qmlplugins \ " -#QT5_ESSENTIALS_append_k3 = "\ -# qtwebkit-qmlplugins \ -#" -#QT5_ESSENTIALS_remove_k3 = "\ -# qtwebengine-qmlplugins \ -#" - RDEPENDS_${PN} = "\ ${@oe.utils.conditional('QT_PROVIDER', 'qt5', "${QT5_ESSENTIALS}", "${QT4_ESSENTIALS}", d)} \ " diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb index fbc5f12..e057267 100644 --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-qte.bb @@ -22,21 +22,10 @@ QT5_DEMOS = "\ qtsvg-examples \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland-examples', '', d)} \ qtwebkit-examples-examples \ - qtwebengine-examples \ - qtwebbrowser \ - qtwebbrowser-examples \ qtserialport-examples \ qtcharts-examples \ " -#QT5_DEMOS_append_k3 = " qtwebkit-examples-examples" -# -#QT5_DEMOS_remove_k3 = "\ -# qtwebbrowser \ -# qtwebbrowser-examples \ -# qtwebengine-examples \ -#" - QT_DEMOS = "\ qt-tstat \ " diff --git a/meta-arago-distro/recipes-core/packagegroups/ti-world.bb b/meta-arago-distro/recipes-core/packagegroups/ti-world.bb index fb20b89..2bba82b 100644 --- a/meta-arago-distro/recipes-core/packagegroups/ti-world.bb +++ b/meta-arago-distro/recipes-core/packagegroups/ti-world.bb @@ -11,11 +11,16 @@ CHROMIUM = "" CHROMIUM_append_omap-a15 = "\ chromium-ozone-wayland \ " - CHROMIUM_append_k3 = "\ chromium-ozone-wayland \ " +EXTRABROWSERS = " \ + qtwebbrowser-examples \ + qtwebengine-qmlplugins \ + qtwebengine-examples \ +" + DEVTOOLS = " \ linux-libc-headers-dev \ packagegroup-core-buildessential \ @@ -44,6 +49,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('MACHINE_FEATURES', 'gpu dsp', 'qt-opencv-opencl-opengl-multithreaded-dev', '', d)} \ ${DEVTOOLS} \ ${@bb.utils.contains('TUNE_FEATURES', 'armv7a', 'valgrind', '', d)} \ -- 2.7.4 _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
