From d5e0cf7f40587f68ef9d7f5af26b5557bb7b25e3 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 13 May 2015 16:26:33 +0300 Subject: qt5: make qtwebengine a distro feature Some devices won't have qtwebengine, so make it a DISTRO_FEATURE that can be removed in device configs. Change-Id: I751b1cdcc1eea48effec3980ed2da4799f88af9e Reviewed-by: Eirik Aavitsland --- conf/distro/b2qt.conf | 2 +- conf/distro/include/colibri-vf.conf | 2 ++ conf/distro/include/emulator.conf | 2 ++ conf/distro/include/raspberrypi.conf | 2 ++ recipes-qt/b2qt-addons/b2qt-demos.bb | 3 ++- recipes-qt/b2qt-addons/b2qt-launcher.bb | 3 ++- .../packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb | 2 +- recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5.bb | 3 ++- 8 files changed, 14 insertions(+), 5 deletions(-) diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf index 08bebd4..86aab7d 100644 --- a/conf/distro/b2qt.conf +++ b/conf/distro/b2qt.conf @@ -38,7 +38,7 @@ SANITY_TESTED_DISTROS += " \ SYSVINIT_ENABLED_GETTYS = "" -DISTRO_FEATURES_DEFAULT = "alsa argp bluetooth ext2 largefile usbgadget usbhost wifi xattr nfs" +DISTRO_FEATURES_DEFAULT = "alsa argp bluetooth ext2 largefile usbgadget usbhost wifi xattr nfs webengine" POKY_DEFAULT_DISTRO_FEATURES = "largefile opengl multiarch" DISTRO_FEATURES_BACKFILL_CONSIDERED = "pulseaudio" diff --git a/conf/distro/include/colibri-vf.conf b/conf/distro/include/colibri-vf.conf index 715bd62..c6c818a 100644 --- a/conf/distro/include/colibri-vf.conf +++ b/conf/distro/include/colibri-vf.conf @@ -33,6 +33,8 @@ BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy" PREFERRED_PROVIDER_virtual/egl = "opengldummy" PREFERRED_PROVIDER_virtual/libgles2 = "opengldummy" +DISTRO_FEATURES_remove = "webengine" + MACHINE_EXTRA_INSTALL = "\ opengldummy \ " diff --git a/conf/distro/include/emulator.conf b/conf/distro/include/emulator.conf index 3888cc5..5453742 100644 --- a/conf/distro/include/emulator.conf +++ b/conf/distro/include/emulator.conf @@ -31,6 +31,8 @@ MACHINE_EXTRA_RRECOMMENDS += "\ kernel_autoload_snd-intel8x0 = "snd-intel8x0" +DISTRO_FEATURES_remove = "webengine" + MACHINE_EXTRA_INSTALL = "\ mount-vboxsf \ " diff --git a/conf/distro/include/raspberrypi.conf b/conf/distro/include/raspberrypi.conf index 141241a..ec57b19 100644 --- a/conf/distro/include/raspberrypi.conf +++ b/conf/distro/include/raspberrypi.conf @@ -28,6 +28,8 @@ BOOTFS_DEPENDS = "bcm2835-bootfiles:do_deploy virtual/kernel:do_deploy" PREFERRED_PROVIDER_virtual/libgles1 = "userland" +DISTRO_FEATURES_remove = "webengine" + MACHINE_EXTRA_INSTALL = "\ userland \ " diff --git a/recipes-qt/b2qt-addons/b2qt-demos.bb b/recipes-qt/b2qt-addons/b2qt-demos.bb index d031b0a..42758fe 100644 --- a/recipes-qt/b2qt-addons/b2qt-demos.bb +++ b/recipes-qt/b2qt-addons/b2qt-demos.bb @@ -38,7 +38,8 @@ GITDIR_everywhere = "${DL_DIR}/qt5-everywhere-demo" S = "${WORKDIR}/git/basicsuite" -DEPENDS = "qtbase qtdeclarative qtxmlpatterns qtquickcontrols qtgraphicaleffects qtsensors qtmultimedia qtwebengine" +DEPENDS = "qtbase qtdeclarative qtxmlpatterns qtquickcontrols qtgraphicaleffects qtsensors qtmultimedia \ + ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)}" do_install_append() { # we only need plugins from the demos diff --git a/recipes-qt/b2qt-addons/b2qt-launcher.bb b/recipes-qt/b2qt-addons/b2qt-launcher.bb index 9e9c94b..b2de029 100644 --- a/recipes-qt/b2qt-addons/b2qt-launcher.bb +++ b/recipes-qt/b2qt-addons/b2qt-launcher.bb @@ -36,7 +36,8 @@ QT_BRANCH = "dev" S = "${WORKDIR}/git" -DEPENDS = "qtbase qtdeclarative qtwebengine" +DEPENDS = "qtbase qtdeclarative \ + ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)}" do_install_append() { install -m 0755 -d ${D}${sysconfdir}/init.d diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb index d740991..bbc8e44 100644 --- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb +++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb @@ -51,5 +51,5 @@ RDEPENDS_${PN} += " \ qtwebchannel-dev \ qtxmlpatterns-dev \ qtquickcontrols-dev \ - qtwebengine-dev \ + ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine-dev', '', d)} \ " diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5.bb b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5.bb index 970da82..c09d245 100644 --- a/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5.bb +++ b/recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5.bb @@ -40,8 +40,9 @@ RDEPENDS_${PN} += " \ qtsensors \ qtserialport \ qtsvg \ + ${@base_contains('DISTRO_FEATURES', 'wayland', 'qtwayland', '', d)} \ qtwebsockets \ qtxmlpatterns \ qtquickcontrols \ - qtwebengine \ + ${@base_contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)} \ " -- cgit v1.2.3-54-g00ecf