Move libgl workaround to libsdl

libsdl tries to pull in mesa, so workaround was added to machines
configs to prevent that. Now remove dependency to libgl from libsdl
that was causing that.

Change-Id: I425aa45cdc32842d573354eaaab7ed67ee5bb7b5
Reviewed-by: Samuli Piippo <samuli.piippo@digia.com>

5 files changed, 0 insertions, 6 deletions

diff --git a/conf/distro/include/am335x-evm.conf b/conf/distro/include/am335x-evm.conf
index 36f28d0..5799db7 100644
--- a/conf/distro/include/am335x-evm.conf
+++ b/conf/distro/include/am335x-evm.conf
@@ -22,7 +22,6 @@
 
 IMAGE_FSTYPES = "tar.gz"
 
-PREFERRED_PROVIDER_virtual/libgl = "libgles-omap3"
 PREFERRED_VERSION_libgles-omap3 = "4.09.00.01"
 PREFERRED_VERSION_omap3-sgx-modules = "4.09.00.01"
 
diff --git a/conf/distro/include/beagleboard.conf b/conf/distro/include/beagleboard.conf
index a48ad21..dab0c5a 100644
--- a/conf/distro/include/beagleboard.conf
+++ b/conf/distro/include/beagleboard.conf
@@ -30,7 +30,6 @@ BOOT_SCRIPTS = "\
 SDCARD_GENERATION_COMMAND = "generate_imx_sdcard"
 UBOOT_SUFFIX = "img"
 
-PREFERRED_PROVIDER_virtual/libgl = "libgles-omap3"
 PREFERRED_VERSION_libgles-omap3 = "4.09.00.01"
 PREFERRED_VERSION_omap3-sgx-modules = "4.09.00.01"
 
diff --git a/conf/distro/include/beaglebone.conf b/conf/distro/include/beaglebone.conf
index 243532b..ba13aaa 100644
--- a/conf/distro/include/beaglebone.conf
+++ b/conf/distro/include/beaglebone.conf
@@ -17,7 +17,6 @@
 ############################################################################
 IMAGE_FSTYPES = "tar.gz"
 
-PREFERRED_PROVIDER_virtual/libgl = "libgles-omap3"
 PREFERRED_VERSION_libgles-omap3 = "5.01.00.01"
 PREFERRED_VERSION_omap3-sgx-modules = "5.01.00.01"
 
diff --git a/conf/distro/include/imx53qsb.conf b/conf/distro/include/imx53qsb.conf
index 261bc29..d83f6b4 100644
--- a/conf/distro/include/imx53qsb.conf
+++ b/conf/distro/include/imx53qsb.conf
@@ -22,8 +22,6 @@
 
 IMAGE_FSTYPES = "tar.gz"
 
-PREFERRED_PROVIDER_virtual/libgl = "amd-gpu-x11-bin-mx51"
-
 MACHINE_EXTRA_INSTALL = "\
         amd-gpu-bin-mx51 \
         "
diff --git a/conf/distro/include/raspberrypi.conf b/conf/distro/include/raspberrypi.conf
index 8a72f7e..97513a8 100644
--- a/conf/distro/include/raspberrypi.conf
+++ b/conf/distro/include/raspberrypi.conf
@@ -23,7 +23,6 @@
 IMAGE_FSTYPES = "tar.gz ext3 rpi-sdimg"
 
 PREFERRED_PROVIDER_virtual/libgles1 = "userland"
-PREFERRED_PROVIDER_virtual/libgl = "userland"
 
 MACHINE_EXTRA_INSTALL = "\
         userland \