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>

13 files changed, 0 insertions, 59 deletions

diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf
index f5839a3..c488d5c 100644
--- a/conf/distro/b2qt.conf
+++ b/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"
diff --git a/conf/distro/include/am335x-evm.conf b/conf/distro/include/am335x-evm.conf
index cc4f573..62e5ecd 100644
--- a/conf/distro/include/am335x-evm.conf
+++ b/conf/distro/include/am335x-evm.conf
@@ -42,6 +42,3 @@ DISTRO_FEATURES_remove = "webengine"
 MACHINE_EXTRA_INSTALL += "\
         lighttpd \
         "
-
-MACHINE_EXTRA_INSTALL_SDK += "\
-        "
diff --git a/conf/distro/include/beagleboard.conf b/conf/distro/include/beagleboard.conf
index 7f42acf..59eb076 100644
--- a/conf/distro/include/beagleboard.conf
+++ b/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"
diff --git a/conf/distro/include/beaglebone.conf b/conf/distro/include/beaglebone.conf
index a9fa010..15faa2a 100644
--- a/conf/distro/include/beaglebone.conf
+++ b/conf/distro/include/beaglebone.conf
@@ -43,7 +43,4 @@ MACHINE_EXTRA_INSTALL += "\
         bb-org-overlays \
         "
 
-MACHINE_EXTRA_INSTALL_SDK += "\
-        "
-
 ADB_PRODUCTID = "0xD002"
diff --git a/conf/distro/include/colibri-vf.conf b/conf/distro/include/colibri-vf.conf
index d75bd9b..accd2ca 100644
--- a/conf/distro/include/colibri-vf.conf
+++ b/conf/distro/include/colibri-vf.conf
@@ -52,7 +52,3 @@ DISTRO_FEATURES_remove = "webengine"
 MACHINE_EXTRA_INSTALL += "\
         opengldummy \
         "
-
-MACHINE_EXTRA_INSTALL_SDK += "\
-        opengldummy-dev \
-        "
diff --git a/conf/distro/include/emulator.conf b/conf/distro/include/emulator.conf
index cd3a80a..75fbbf7 100644
--- a/conf/distro/include/emulator.conf
+++ b/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 \
-        "
diff --git a/conf/distro/include/imx6-egl.inc b/conf/distro/include/imx6-egl.inc
index 8c4bbcd..efe3c18 100644
--- a/conf/distro/include/imx6-egl.inc
+++ b/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)} \
-    "
diff --git a/conf/distro/include/imx6.inc b/conf/distro/include/imx6.inc
index 25eb691..8605b1a 100644
--- a/conf/distro/include/imx6.inc
+++ b/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 \
-    "
-
diff --git a/conf/distro/include/imx7dsabresd.conf b/conf/distro/include/imx7dsabresd.conf
index b21e5b1..dbf04a1 100644
--- a/conf/distro/include/imx7dsabresd.conf
+++ b/conf/distro/include/imx7dsabresd.conf
@@ -52,7 +52,3 @@ DISTRO_FEATURES_remove = "webengine"
 
 MACHINE_EXTRA_INSTALL += "\
         "
-
-MACHINE_EXTRA_INSTALL_SDK += "\
-        "
-
diff --git a/conf/distro/include/intel-corei7-64.conf b/conf/distro/include/intel-corei7-64.conf
index d350c0e..d7db6f2 100644
--- a/conf/distro/include/intel-corei7-64.conf
+++ b/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 \
-        "
-
diff --git a/conf/distro/include/nvidia-logan.conf b/conf/distro/include/nvidia-logan.conf
index 0dc1d84..5474921 100644
--- a/conf/distro/include/nvidia-logan.conf
+++ b/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"
 
diff --git a/conf/distro/include/raspberrypi.inc b/conf/distro/include/raspberrypi.inc
index fb56934..5c76a83 100644
--- a/conf/distro/include/raspberrypi.inc
+++ b/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 \
diff --git a/conf/distro/include/ti.inc b/conf/distro/include/ti.inc
index a97511a..074a186 100644
--- a/conf/distro/include/ti.inc
+++ b/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 \
-    "