sdk: do not explicitly define Qt dependency packages

Until now, the toolchain used by CI has been created without Qt, but with
all (best guess) Qt dependencies. Now toolchain is created with Qt and we
get all Qt dependencies correctly into the toolchain. As a consequence,
CI will now need to build Qt, which has not been covered in CI before.

The difference between embedded-sdk and embedded-qt5-sdk is that
the former does not include files needed for debugging.

Change-Id: Ie2be156c07e51119c0d4782494d6bcde6f34ed60
Reviewed-by: Risto Avila <risto.avila@qt.io>

conf/distro/b2qt.conf

@@ -69,8 +69,6 @@ PREFERRED_PROVIDER_jpeg ?= "libjpeg-turbo"
 PREFERRED_PROVIDER_jpeg-native ?= "libjpeg-turbo-native"
 
 MACHINE_EXTRA_INSTALL ?= ""
-MACHINE_EXTRA_INSTALL_SDK ?= ""
-MACHINE_EXTRA_INSTALL_SDK_HOST ?= ""
 
 # Override mkspec for mingw build
 OE_QMAKE_PLATFORM_NATIVE_mingw32 = "win32-g++-oe"

conf/distro/include/am335x-evm.conf

@@ -42,6 +42,3 @@ DISTRO_FEATURES_remove = "webengine"
 MACHINE_EXTRA_INSTALL += "\
         lighttpd \
         "
-
-MACHINE_EXTRA_INSTALL_SDK += "\
-        "

conf/distro/include/beagleboard.conf

@@ -48,8 +48,4 @@ MACHINE_EXTRA_INSTALL += "\
         libgles-omap3-rawdemos \
         "
 
-MACHINE_EXTRA_INSTALL_SDK += "\
-        libgles-omap3-dev \
-        "
-
 ADB_PRODUCTID = "0x9018"

conf/distro/include/beaglebone.conf

@@ -43,7 +43,4 @@ MACHINE_EXTRA_INSTALL += "\
         bb-org-overlays \
         "
 
-MACHINE_EXTRA_INSTALL_SDK += "\
-        "
-
 ADB_PRODUCTID = "0xD002"

conf/distro/include/colibri-vf.conf

@@ -52,7 +52,3 @@ DISTRO_FEATURES_remove = "webengine"
 MACHINE_EXTRA_INSTALL += "\
         opengldummy \
         "
-
-MACHINE_EXTRA_INSTALL_SDK += "\
-        opengldummy-dev \
-        "

conf/distro/include/emulator.conf

@@ -46,9 +46,6 @@ DISTRO_FEATURES_remove = "webengine opengl"
 MACHINE_EXTRA_INSTALL += "\
         mount-vboxsf \
         "
-MACHINE_EXTRA_INSTALL_SDK += "\
-        qtglesstream-dummy-client-dev \
-        "
 MACHINE_EXTRA_INSTALL_QT = "\
         qtsystems \
         qtglesstream \
@@ -56,6 +53,3 @@ MACHINE_EXTRA_INSTALL_QT = "\
         b2qt-emulator-vinput \
         b2qt-emulator-sdcardmountd \
         "
-MACHINE_EXTRA_INSTALL_QT_SDK = "\
-        qtglesstream-dev \
-        "

conf/distro/include/imx6-egl.inc

@@ -31,11 +31,3 @@ MACHINE_EXTRA_INSTALL += "\
     libegl-mx6 \
     libgles2-mx6 \
     "
-
-MACHINE_EXTRA_INSTALL_SDK += " \
-    libegl-mx6 \
-    libegl-mx6-dev \
-    libgles2-mx6 \
-    libgles2-mx6-dev \
-    ${@base_contains("DISTRO_FEATURES", "wayland", "libwayland-egl-mx6-dev", "", d)} \
-    "

conf/distro/include/imx6.inc

@@ -36,8 +36,3 @@ MACHINE_EXTRA_INSTALL += "\
     ${@base_contains("DISTRO_FEATURES", "gstreamer010", "gst-fsl-plugin", "", d)} \
     ${@base_contains("DISTRO_FEATURES", "gstreamer", "gstreamer1.0-plugins-imx-meta", "", d)} \
     "
-
-MACHINE_EXTRA_INSTALL_SDK += " \
-    libgal-mx6 \
-    "
-

conf/distro/include/imx7dsabresd.conf

@@ -52,7 +52,3 @@ DISTRO_FEATURES_remove = "webengine"
 
 MACHINE_EXTRA_INSTALL += "\
         "
-
-MACHINE_EXTRA_INSTALL_SDK += "\
-        "
-

conf/distro/include/intel-corei7-64.conf

@@ -45,8 +45,3 @@ MACHINE_EXTRA_INSTALL += "\
         mesa-megadriver \
         grub-efi-config \
         "
-
-MACHINE_EXTRA_INSTALL_SDK += " \
-        mesa-dev \
-        "
-

conf/distro/include/nvidia-logan.conf

@@ -43,13 +43,6 @@ MACHINE_EXTRA_INSTALL = "\
         libdrm-nv \
 "
 
-MACHINE_EXTRA_INSTALL_SDK = "\
-        libegl-dev \
-        libgles2-dev \
-        graphics-headers-dev \
-        libdrm-nv-dev \
-"
-
 PREFERRED_PROVIDER_libdrm ?= "libdrm-nv"
 PREFERRED_PROVIDER_drm ?= "libdrm-nv"
 

conf/distro/include/raspberrypi.inc

@@ -36,10 +36,6 @@ BOOTFS_CONTENT = "\
 
 BOOTFS_DEPENDS = "bcm2835-bootfiles:do_deploy virtual/kernel:do_deploy"
 
-MACHINE_EXTRA_INSTALL_SDK += " \
-        userland-dev \
-        "
-
 MACHINE_EXTRA_INSTALL += "\
         userland \
         omxplayer \

conf/distro/include/ti.inc

@@ -43,7 +43,3 @@ MACHINE_EXTRA_INSTALL += "\
     ti-sgx-ddk-km \
     ti-sgx-ddk-um \
     "
-
-MACHINE_EXTRA_INSTALL_SDK += "\
-    ti-sgx-ddk-um-dev \
-    "

recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb → recipes-qt/meta/meta-toolchain-b2qt-embedded-sdk.bb

@@ -27,13 +27,6 @@
 ##
 ############################################################################
 
-DESCRIPTION = "B2Qt on embedded Linux SDK toolchain"
-PR = "r0"
-LICENSE = "The-Qt-Company-DCLA-2.1"
-LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b"
-
-inherit populate_b2qt_sdk
-
-TOOLCHAIN_HOST_TASK = "nativesdk-packagegroup-b2qt-embedded-toolchain-host packagegroup-cross-canadian-${MACHINE}"
-TOOLCHAIN_TARGET_TASK += "packagegroup-b2qt-embedded-toolchain-target"
+require recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb
 
+SDKIMAGE_FEATURES = "dev-pkgs"

recipes-qt/packagegroups/packagegroup-b2qt-embedded-qt5-toolchain-target.bb

@@ -35,11 +35,11 @@ inherit packagegroup qtquickcompiler
 
 PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
 
-MACHINE_EXTRA_INSTALL_QT_SDK ?= ""
+MACHINE_EXTRA_INSTALL_SDK ?= ""
 
 RDEPENDS_${PN} += " \
-    ${MACHINE_EXTRA_INSTALL_QT_SDK} \
-    packagegroup-b2qt-embedded-toolchain-target \
+    ${MACHINE_EXTRA_INSTALL_SDK} \
+    packagegroup-core-standalone-sdk-target \
     \
     qt3d-dev \
     qtbase-dev \

recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb

@@ -33,6 +33,8 @@ LICENSE = "The-Qt-Company-DCLA-2.1"
 
 inherit nativesdk packagegroup
 
+MACHINE_EXTRA_INSTALL_SDK_HOST ?= ""
+
 python __anonymous() {
     overrides = d.getVar("OVERRIDES", True).split(":")
     if "mingw32" not in overrides:

recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb

-############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the Boot to Qt meta layer.
-##
-## $QT_BEGIN_LICENSE:GPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 3 or (at your option) any later version
-## approved by the KDE Free Qt Foundation. The licenses are as published by
-## the Free Software Foundation and appearing in the file LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-
-DESCRIPTION = "Target packages for B2Qt on embedded Linux SDK"
-PR = "r0"
-LICENSE = "The-Qt-Company-DCLA-2.1"
-
-inherit packagegroup
-inherit bluetooth
-
-RDEPENDS_${PN} += "\
-    packagegroup-core-standalone-sdk-target \
-    base-files \
-    glib-2.0-dev \
-    openssl-dev \
-    libpng-dev \
-    tiff-dev \
-    alsa-dev \
-    dbus-dev \
-    freetype-dev \
-    fontconfig-dev \
-    ${@base_contains("DISTRO_FEATURES", "gstreamer010", "gstreamer-dev gst-plugins-base-dev", "", d)} \
-    ${@base_contains("DISTRO_FEATURES", "gstreamer", "gstreamer1.0-dev gstreamer1.0-plugins-base-dev", "", d)} \
-    icu-dev \
-    libxslt-dev \
-    ${@base_contains("DISTRO_FEATURES", "systemd", "systemd-dev", "udev-dev", d)} \
-    tslib-dev \
-    hunspell-dev \
-    libcap-dev \
-    wpa-supplicant-dev \
-    libmysqlclient-dev \
-    libpq-dev \
-    atk-dev \
-    libevent-dev \
-    ostree-dev \
-    ${@base_contains("DISTRO_FEATURES", "wayland", "libxkbcommon-dev libgbm-dev libdrm-dev", "", d)} \
-    ${@base_contains("DISTRO_FEATURES", "bluetooth", "${BLUEZ}-dev", "", d)} \
-    ${MACHINE_EXTRA_INSTALL_SDK} \
-    "