From 9d8cec2395c0e8876630b951a0cbca126aeff715 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@digia.com>
Date: Thu, 27 Mar 2014 15:58:16 +0200
Subject: sdk: include python modules for QtWebEngine support

Some additional python modules are required to build QtWebEngine

Task-number: QTEE-443
Change-Id: I47e0d9e8cf1b253e166684b32f2c7141a89749f5
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
---
 .../nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb            | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb
index 9c92438..281204c 100644
--- a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb
+++ b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb
@@ -30,6 +30,10 @@ require recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb
 RDEPENDS_${PN} = "\
     python-nativesdk \
     python-subprocess-nativesdk \
+    python-compiler-nativesdk \
+    python-multiprocessing-nativesdk \
+    python-shell-nativesdk \
+    python-threading-nativesdk \
     "
 
 
-- 
cgit v1.2.3-54-g00ecf


From ae6d3b0c8cd8a8851ac141c5427ea05a257fedba Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@digia.com>
Date: Tue, 6 May 2014 12:00:50 +0300
Subject: bootfs: correctly check for empty define

Change-Id: Iece54b106059bfba07adfbd84a1ae76b9104b43f
Reviewed-by: Kalle Viironen <kalle.viironen@digia.com>
---
 classes/bootfs-image.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/bootfs-image.bbclass b/classes/bootfs-image.bbclass
index 5292965..cbb6c4c 100644
--- a/classes/bootfs-image.bbclass
+++ b/classes/bootfs-image.bbclass
@@ -26,7 +26,7 @@ BOOTFS_LINK_NAME = "${IMAGE_BASENAME}-boot-${MACHINE}"
 BOOTFS_DEPENDS ?= ""
 
 fakeroot do_bootfs () {
-	if [ -n ${BOOTFS_CONTENT} ]; then
+	if [ -z "${BOOTFS_CONTENT}" ]; then
 		exit 0
 	fi
 
-- 
cgit v1.2.3-54-g00ecf


From 5f01870ba086f2f840a7d570a60368cf42b728c0 Mon Sep 17 00:00:00 2001
From: Andy Nichols <andy.nichols@digia.com>
Date: Mon, 12 May 2014 12:48:32 +0200
Subject: Add linux-firmware to b2qt default base packages

This should enable the binary firmware blobs that come with the
Linux kernel to be deployed to the device image which will enable
any kernel modules that require them to work.  This situation comes
up frequently among wifi drivers (like ralink devices) and should
allow us to support a more complete range of available USB wifi
hardware.

Change-Id: I8167e35e7d49e0823ad63d60ab5962fd049439e1
Reviewed-by: Gatis Paeglis <gatis.paeglis@digia.com>
Reviewed-by: Samuli Piippo <samuli.piippo@digia.com>
---
 recipes/packagegroup/packagegroup-b2qt-embedded-base.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb
index 0942a7e..e7f15bb 100644
--- a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb
+++ b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb
@@ -45,5 +45,6 @@ RDEPENDS_${PN} = "\
         alsa-utils-amixer \
         hunspell \
         ca-certificates \
+        linux-firmware \
         ${MACHINE_EXTRA_INSTALL} \
         "
-- 
cgit v1.2.3-54-g00ecf


From 317ae0bf0492694183fe09293628f2873f74ed3a Mon Sep 17 00:00:00 2001
From: Rainer Keller <rainer.keller@digia.com>
Date: Thu, 8 May 2014 14:02:04 +0200
Subject: Enable USB serial drivers

Change-Id: I867ed5cb5e78fade52a56715f21a9fc2823a1ce8
Reviewed-by: Samuli Piippo <samuli.piippo@digia.com>
---
 recipes/linux/linux-am335x-psp_3.2.bbappend  | 6 ++++++
 recipes/linux/linux-boundary_3.0.35.bbappend | 6 ++++++
 recipes/linux/linux-mainline_3.2.bbappend    | 6 ++++++
 3 files changed, 18 insertions(+)

diff --git a/recipes/linux/linux-am335x-psp_3.2.bbappend b/recipes/linux/linux-am335x-psp_3.2.bbappend
index 313111b..fd7dd31 100644
--- a/recipes/linux/linux-am335x-psp_3.2.bbappend
+++ b/recipes/linux/linux-am335x-psp_3.2.bbappend
@@ -30,5 +30,11 @@ do_configure_append() {
 
 	echo "CONFIG_DEVTMPFS=y"                >> ${S}/.config
 
+	# Enable USB serial support
+	echo "CONFIG_USB_SERIAL=m"              >> ${S}/.config
+	echo "CONFIG_USB_SERIAL_GENERIC=y"      >> ${S}/.config
+	echo "CONFIG_USB_SERIAL_FTDI_SIO=m"     >> ${S}/.config
+	echo "CONFIG_USB_SERIAL_PL2303=m"       >> ${S}/.config
+
 	yes '' | oe_runmake oldconfig
 }
diff --git a/recipes/linux/linux-boundary_3.0.35.bbappend b/recipes/linux/linux-boundary_3.0.35.bbappend
index 610dc4d..dd9420e 100644
--- a/recipes/linux/linux-boundary_3.0.35.bbappend
+++ b/recipes/linux/linux-boundary_3.0.35.bbappend
@@ -28,4 +28,10 @@ do_configure_prepend() {
 
 	# FunctionFS for adb
 	echo "CONFIG_USB_FUNCTIONFS=m"  >> ${WORKDIR}/defconfig
+
+	# Enable USB serial support
+	echo "CONFIG_USB_SERIAL=m"              >> ${WORKDIR}/defconfig
+	echo "CONFIG_USB_SERIAL_GENERIC=y"      >> ${WORKDIR}/defconfig
+	echo "CONFIG_USB_SERIAL_FTDI_SIO=m"     >> ${WORKDIR}/defconfig
+	echo "CONFIG_USB_SERIAL_PL2303=m"       >> ${WORKDIR}/defconfig
 }
diff --git a/recipes/linux/linux-mainline_3.2.bbappend b/recipes/linux/linux-mainline_3.2.bbappend
index 4c2cb59..9e195dc 100644
--- a/recipes/linux/linux-mainline_3.2.bbappend
+++ b/recipes/linux/linux-mainline_3.2.bbappend
@@ -29,6 +29,12 @@ do_configure_prepend() {
 	echo "CONFIG_USB_FUNCTIONFS_RNDIS=n"    >> ${WORKDIR}/defconfig
 	echo "CONFIG_USB_FUNCTIONFS_GENERIC=y"  >> ${WORKDIR}/defconfig
 
+	# Enable USB serial support
+	echo "CONFIG_USB_SERIAL=m"              >> ${WORKDIR}/defconfig
+	echo "CONFIG_USB_SERIAL_GENERIC=y"      >> ${WORKDIR}/defconfig
+	echo "CONFIG_USB_SERIAL_FTDI_SIO=m"     >> ${WORKDIR}/defconfig
+	echo "CONFIG_USB_SERIAL_PL2303=m"       >> ${WORKDIR}/defconfig
+
 	# Remove beagleboard logo
 	if [ -e ${WORKDIR}/${LOGO_SIZE}/logo_linux_clut224.ppm ]; then
 		rm ${WORKDIR}/${LOGO_SIZE}/logo_linux_clut224.ppm
-- 
cgit v1.2.3-54-g00ecf


From 119c32c43cd29c782971094ad0ed351acc4efb85 Mon Sep 17 00:00:00 2001
From: Andy Nichols <andy.nichols@digia.com>
Date: Mon, 12 May 2014 12:29:11 +0200
Subject: Remove irda, pcmcia, pci, 3g, nfc, zeroconf features from distro

irda is support for infra-red communication
pcmcia and pci are not relevant for any of the reference devices
3g adds Ofono to the stack and since we are not making phones,
this is completely unnecessary waste of resources.
zeroconf adds the Avahi daemon that is a rarely necessary
zero-configuration networking manager.
nfc is something we support, but none of the reference devices
comes with this hardware, and would require an external device that
has not been tested by us at all.  It's likely that an end user
that wants to use custom hardware will need to rebuild the stack
anyway so they can just add any of these additional features back
to their distro as necessary when they build their own stack.

Change-Id: If3951a4170d94ed8db1d40c2bb2d47cf569dc36a
Reviewed-by: Samuli Piippo <samuli.piippo@digia.com>
---
 conf/distro/b2qt.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf
index 66ddcf1..14ee4ce 100644
--- a/conf/distro/b2qt.conf
+++ b/conf/distro/b2qt.conf
@@ -39,7 +39,7 @@ include conf/distro/include/${MACHINE}.conf
 
 SYSVINIT_ENABLED_GETTYS = ""
 
-DISTRO_FEATURES_DEFAULT = "alsa argp bluetooth ext2 irda largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g nfc"
+DISTRO_FEATURES_DEFAULT = "alsa argp bluetooth ext2 largefile usbgadget usbhost wifi xattr nfs"
 POKY_DEFAULT_DISTRO_FEATURES = "largefile opengl multiarch"
 DISTRO_FEATURES_BACKFILL_CONSIDERED = "pulseaudio"
 
-- 
cgit v1.2.3-54-g00ecf


From c646d169017decabe4280dbece71425d982e4411 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@digia.com>
Date: Fri, 9 May 2014 09:07:07 +0300
Subject: Move to version 1.6

Change-Id: Ide554381076519287e874d5c6bb0b5b9de7060c6
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
---
 conf/distro/b2qt.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf
index 14ee4ce..8819c93 100644
--- a/conf/distro/b2qt.conf
+++ b/conf/distro/b2qt.conf
@@ -24,7 +24,7 @@ include conf/distro/poky.conf
 
 DISTRO = "b2qt"
 DISTRO_NAME = "Boot to Qt for Embedded Linux"
-DISTRO_VERSION = "1.5"
+DISTRO_VERSION = "1.6"
 SDK_VERSION := "${DISTRO_VERSION}"
 
 MAINTAINER = "B2Qt <B2Qt@digia.com>"
-- 
cgit v1.2.3-54-g00ecf


From c8dfbb1fb309f2c364948b5ea2b76808207fd3c1 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@digia.com>
Date: Tue, 13 May 2014 09:49:36 +0300
Subject: Update used branch to daisy

Readme and init script updated to use correct upstream branches

Change-Id: Id38e09adcff67142009a8a5c4b563cabe1173433
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
---
 README              | 14 +++++++-------
 b2qt-init-build-env | 12 ++++++------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/README b/README
index a2aa884..e23e4e2 100644
--- a/README
+++ b/README
@@ -29,26 +29,26 @@ OpenEmbedded and Yocto.
 This layer depends on:
 
 URI: git://git.openembedded.org/openembedded-core
-branch: dora
+branch: daisy
 revision: HEAD
 
 URI: git://git.openembedded.org/meta-openembedded
 layer: meta-oe
-branch: dora
+branch: daisy
 revision: HEAD
 
 URI: git://git.yoctoproject.org/meta-ti
-branch: dora
+branch: daisy
 revision: HEAD
 
 URI: git://git.yoctoproject.org/meta-fsl-arm
-branch: dora
+branch: daisy
 revision: HEAD
 
-URI: git://github.com/Freescale/meta-fsl-arm-extra.git
-branch: dora
+URI: git://github.com/Freescale/meta-fsl-arm-extra
+branch: daisy
 revision: HEAD
 
 URI: git://git.yoctoproject.org/meta-raspberrypi
-branch: dora
+branch: daisy
 revision: HEAD
diff --git a/b2qt-init-build-env b/b2qt-init-build-env
index 8c4da01..952e4a3 100755
--- a/b2qt-init-build-env
+++ b/b2qt-init-build-env
@@ -34,27 +34,27 @@ DIR=$(readlink -f $(dirname $0))
 BUILDDIR=$(readlink -f $1)
 
 if [ ! -d ${BUILDDIR}/poky ]; then
-    git clone git://git.yoctoproject.org/poky ${BUILDDIR}/poky -b dora
+    git clone git://git.yoctoproject.org/poky ${BUILDDIR}/poky -b daisy
 fi
 
 if [ ! -d ${BUILDDIR}/poky/meta-openembedded ]; then
-    git clone git://git.openembedded.org/meta-openembedded ${BUILDDIR}/poky/meta-openembedded -b dora
+    git clone git://git.openembedded.org/meta-openembedded ${BUILDDIR}/poky/meta-openembedded -b daisy
 fi
 
 if [ ! -d ${BUILDDIR}/poky/meta-ti ]; then
-    git clone git://git.yoctoproject.org/meta-ti ${BUILDDIR}/poky/meta-ti -b dora
+    git clone git://git.yoctoproject.org/meta-ti ${BUILDDIR}/poky/meta-ti -b daisy
 fi
 
 if [ ! -d ${BUILDDIR}/poky/meta-fsl-arm ]; then
-    git clone git://git.yoctoproject.org/meta-fsl-arm ${BUILDDIR}/poky/meta-fsl-arm -b dora
+    git clone git://git.yoctoproject.org/meta-fsl-arm ${BUILDDIR}/poky/meta-fsl-arm -b daisy
 fi
 
 if [ ! -d ${BUILDDIR}/poky/meta-fsl-arm-extra ]; then
-    git clone git://github.com/Freescale/meta-fsl-arm-extra.git ${BUILDDIR}/poky/meta-fsl-arm-extra -b dora
+    git clone git://github.com/Freescale/meta-fsl-arm-extra.git ${BUILDDIR}/poky/meta-fsl-arm-extra -b daisy
 fi
 
 if [ ! -d ${BUILDDIR}/poky/meta-raspberrypi ]; then
-    git clone git://git.yoctoproject.org/meta-raspberrypi ${BUILDDIR}/poky/meta-raspberrypi -b dora
+    git clone git://git.yoctoproject.org/meta-raspberrypi ${BUILDDIR}/poky/meta-raspberrypi -b daisy
 fi
 
 if [ ! -d ${BUILDDIR}/poky/meta-b2qt ]; then
-- 
cgit v1.2.3-54-g00ecf


From 41492a41524e7e3d04fde75774f29b0a86761819 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@digia.com>
Date: Fri, 9 May 2014 09:04:46 +0300
Subject: libgles: inhibit QA error for files already being stripped

Logic for INHIBIT_PACKAGE_DEBUG_SPLIT and INHIBIT_PACKAGE_STRIP
was changed.

Change-Id: Id0670aa1d56cf54187d7ad7cba05d22b4a0ccdb2
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
---
 recipes/libgles/libgles-omap3_4.09.00.01.bbappend | 2 +-
 recipes/libgles/libgles-omap3_5.00.00.01.bbappend | 2 +-
 recipes/libgles/libgles-omap3_5.01.00.01.bbappend | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/recipes/libgles/libgles-omap3_4.09.00.01.bbappend b/recipes/libgles/libgles-omap3_4.09.00.01.bbappend
index 6a37c89..0646e73 100644
--- a/recipes/libgles/libgles-omap3_4.09.00.01.bbappend
+++ b/recipes/libgles/libgles-omap3_4.09.00.01.bbappend
@@ -29,7 +29,7 @@ do_install_append() {
 }
 
 # Inhibit warnings about files being stripped.
-INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
+INHIBIT_PACKAGE_STRIP = "1"
 
 pkg_postinst_${PN}_append() {
 ESREV=$(echo ${BINLOCATION} | grep -Po '(\d+)(?!.*\d)' )
diff --git a/recipes/libgles/libgles-omap3_5.00.00.01.bbappend b/recipes/libgles/libgles-omap3_5.00.00.01.bbappend
index 5446ffa..f0b5754 100644
--- a/recipes/libgles/libgles-omap3_5.00.00.01.bbappend
+++ b/recipes/libgles/libgles-omap3_5.00.00.01.bbappend
@@ -32,7 +32,7 @@ do_install_append() {
 }
 
 # Inhibit warnings about files being stripped.
-INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
+INHIBIT_PACKAGE_SPLIT = "1"
 
 pkg_postinst_${PN}_append() {
 ESREV=$(echo ${BINLOCATION} | grep -Po '(\d+)(?!.*\d)' )
diff --git a/recipes/libgles/libgles-omap3_5.01.00.01.bbappend b/recipes/libgles/libgles-omap3_5.01.00.01.bbappend
index 82bfdb2..9a90577 100644
--- a/recipes/libgles/libgles-omap3_5.01.00.01.bbappend
+++ b/recipes/libgles/libgles-omap3_5.01.00.01.bbappend
@@ -28,7 +28,7 @@ BINLOCATION_beaglebone  = "${S}/gfx_rel_es8.x"
 LIBGLESWINDOWSYSTEM = "libpvrPVR2D_FLIPWSEGL.so.1"
 
 # Inhibit warnings about files being stripped.
-INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
+INHIBIT_PACKAGE_STRIP = "1"
 
 pkg_postinst_${PN}_append() {
 ESREV=$(echo ${BINLOCATION} | grep -Po '(\d+)(?!.*\d)' )
-- 
cgit v1.2.3-54-g00ecf


From 0c8417be83c71907f223a1666f0a2269942c9c1a Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@digia.com>
Date: Fri, 9 May 2014 09:14:22 +0300
Subject: nitrogen6x: use preferred version for kernel

Need to change the preferred kernel version until it's done correctly
in upstream.

Change-Id: Ib75eb4731eb8f30c73353261e045d6fe5056a77a
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
---
 conf/distro/include/nitrogen6x.conf | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf
index 2a64026..3dddcc1 100644
--- a/conf/distro/include/nitrogen6x.conf
+++ b/conf/distro/include/nitrogen6x.conf
@@ -31,6 +31,8 @@ BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy u-boot-script-bounda
 
 EXTRA_IMAGEDEPENDS += "u-boot-script-boundary"
 
+PREFERRED_VERSION_linux-boundary = "3.10.17"
+
 MACHINE_EXTRA_INSTALL = "\
         libgal-mx6 \
         libegl-mx6 \
-- 
cgit v1.2.3-54-g00ecf


From 2ee4cf43c8ac22da5b44bc7cdda93a3c9c6a4190 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@digia.com>
Date: Fri, 9 May 2014 09:15:31 +0300
Subject: busybox: upstream version has changed

Change-Id: If2e48d5dc3ccd16669ebb85076ca6a68473bb83e
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
---
 recipes/busybox/busybox_1.21.1.bbappend | 46 ---------------------------------
 recipes/busybox/busybox_1.22.1.bbappend | 46 +++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 46 deletions(-)
 delete mode 100644 recipes/busybox/busybox_1.21.1.bbappend
 create mode 100644 recipes/busybox/busybox_1.22.1.bbappend

diff --git a/recipes/busybox/busybox_1.21.1.bbappend b/recipes/busybox/busybox_1.21.1.bbappend
deleted file mode 100644
index fe5d5ea..0000000
--- a/recipes/busybox/busybox_1.21.1.bbappend
+++ /dev/null
@@ -1,46 +0,0 @@
-#############################################################################
-##
-## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-##
-## This file is part of the Qt Enterprise Embedded Scripts of the Qt
-## framework.
-##
-## $QT_BEGIN_LICENSE$
-## Commercial License Usage Only
-## Licensees holding valid commercial Qt license agreements with Digia
-## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
-## may use this file in accordance with the terms contained in said license
-## agreement.
-##
-## For further information use the contact form at
-## http://qt.digia.com/contact-us.
-##
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-SRC_URI += "\
-    file://network.cfg \
-    file://busybox-ifplugd.sh \
-    file://ifplugd.action \
-    "
-
-PACKAGES =+ "${PN}-ifplugd"
-FILES_${PN}-ifplugd = "\
-    ${sysconfdir}/init.d/busybox-ifplugd.sh \
-    ${sysconfdir}/etc/ifplugd/ifplugd.action \
-    "
-
-INITSCRIPT_PACKAGES += "${PN}-ifplugd"
-INITSCRIPT_NAME_${PN}-ifplugd = "busybox-ifplugd.sh"
-
-RRECOMMENDS_${PN} += "${PN}-ifplugd"
-
-do_install_append () {
-	install -m 0755 ${WORKDIR}/busybox-ifplugd.sh ${D}${sysconfdir}/init.d/
-
-	install -d ${D}${sysconfdir}/ifplugd
-	install -m 0755 ${WORKDIR}/ifplugd.action ${D}${sysconfdir}/ifplugd/
-}
diff --git a/recipes/busybox/busybox_1.22.1.bbappend b/recipes/busybox/busybox_1.22.1.bbappend
new file mode 100644
index 0000000..fe5d5ea
--- /dev/null
+++ b/recipes/busybox/busybox_1.22.1.bbappend
@@ -0,0 +1,46 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://qt.digia.com/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+SRC_URI += "\
+    file://network.cfg \
+    file://busybox-ifplugd.sh \
+    file://ifplugd.action \
+    "
+
+PACKAGES =+ "${PN}-ifplugd"
+FILES_${PN}-ifplugd = "\
+    ${sysconfdir}/init.d/busybox-ifplugd.sh \
+    ${sysconfdir}/etc/ifplugd/ifplugd.action \
+    "
+
+INITSCRIPT_PACKAGES += "${PN}-ifplugd"
+INITSCRIPT_NAME_${PN}-ifplugd = "busybox-ifplugd.sh"
+
+RRECOMMENDS_${PN} += "${PN}-ifplugd"
+
+do_install_append () {
+	install -m 0755 ${WORKDIR}/busybox-ifplugd.sh ${D}${sysconfdir}/init.d/
+
+	install -d ${D}${sysconfdir}/ifplugd
+	install -m 0755 ${WORKDIR}/ifplugd.action ${D}${sysconfdir}/ifplugd/
+}
-- 
cgit v1.2.3-54-g00ecf


From 2eaa24792624942fa185a0e6bc25ac133d48f8ea Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@digia.com>
Date: Fri, 9 May 2014 09:15:57 +0300
Subject: gpu-viv-bin-mx6q: upstream version has changed

Change-Id: Iec1d295bab4a3d883e2cd29935d084e1e9cdc4b6
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
---
 recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.17-1.0.0-hfp.bbappend | 1 +
 recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.9-1.0.0-hfp.bbappend  | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.17-1.0.0-hfp.bbappend
 delete mode 100644 recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.9-1.0.0-hfp.bbappend

diff --git a/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.17-1.0.0-hfp.bbappend b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.17-1.0.0-hfp.bbappend
new file mode 100644
index 0000000..bed361e
--- /dev/null
+++ b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.17-1.0.0-hfp.bbappend
@@ -0,0 +1 @@
+RDEPENDS_libgl-mx6-dev = ""
diff --git a/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.9-1.0.0-hfp.bbappend b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.9-1.0.0-hfp.bbappend
deleted file mode 100644
index bed361e..0000000
--- a/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.9-1.0.0-hfp.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-RDEPENDS_libgl-mx6-dev = ""
-- 
cgit v1.2.3-54-g00ecf


From f50ebc6dfc356534e0325aadef55cde9ff9dc93f Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@digia.com>
Date: Fri, 9 May 2014 09:16:49 +0300
Subject: wpa-supplicant: upstream version has changed

Change-Id: Iea1cb967d7a8afeb4dd34be1779971ad2451ff3c
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
---
 recipes/wpa-supplicant/wpa-supplicant_2.0.bbappend | 18 ------------------
 recipes/wpa-supplicant/wpa-supplicant_2.1.bbappend | 18 ++++++++++++++++++
 2 files changed, 18 insertions(+), 18 deletions(-)
 delete mode 100644 recipes/wpa-supplicant/wpa-supplicant_2.0.bbappend
 create mode 100644 recipes/wpa-supplicant/wpa-supplicant_2.1.bbappend

diff --git a/recipes/wpa-supplicant/wpa-supplicant_2.0.bbappend b/recipes/wpa-supplicant/wpa-supplicant_2.0.bbappend
deleted file mode 100644
index 9a200b2..0000000
--- a/recipes/wpa-supplicant/wpa-supplicant_2.0.bbappend
+++ /dev/null
@@ -1,18 +0,0 @@
-do_install_append () {
-	install -d ${D}${includedir}/wpa-supplicant
-
-	install -m 0644 ${S}/src/common/wpa_ctrl.c ${D}${includedir}/wpa-supplicant/
-	install -m 0644 ${S}/src/common/wpa_ctrl.h ${D}${includedir}/wpa-supplicant/
-
-	install -m 0644 ${S}/src/utils/build_config.h ${D}${includedir}/wpa-supplicant/
-	install -m 0644 ${S}/src/utils/common.h ${D}${includedir}/wpa-supplicant/
-	install -m 0644 ${S}/src/utils/includes.h ${D}${includedir}/wpa-supplicant/
-	install -m 0644 ${S}/src/utils/os.h ${D}${includedir}/wpa-supplicant/
-	install -m 0644 ${S}/src/utils/os_unix.c ${D}${includedir}/wpa-supplicant/
-	install -m 0644 ${S}/src/utils/trace.h ${D}${includedir}/wpa-supplicant/
-	install -m 0644 ${S}/src/utils/wpa_debug.h ${D}${includedir}/wpa-supplicant/
-	install -m 0644 ${S}/src/utils/wpabuf.h ${D}${includedir}/wpa-supplicant/
-}
-
-FILES_${PN}-dev += "${includedir}/wpa-supplicant/*"
-
diff --git a/recipes/wpa-supplicant/wpa-supplicant_2.1.bbappend b/recipes/wpa-supplicant/wpa-supplicant_2.1.bbappend
new file mode 100644
index 0000000..9a200b2
--- /dev/null
+++ b/recipes/wpa-supplicant/wpa-supplicant_2.1.bbappend
@@ -0,0 +1,18 @@
+do_install_append () {
+	install -d ${D}${includedir}/wpa-supplicant
+
+	install -m 0644 ${S}/src/common/wpa_ctrl.c ${D}${includedir}/wpa-supplicant/
+	install -m 0644 ${S}/src/common/wpa_ctrl.h ${D}${includedir}/wpa-supplicant/
+
+	install -m 0644 ${S}/src/utils/build_config.h ${D}${includedir}/wpa-supplicant/
+	install -m 0644 ${S}/src/utils/common.h ${D}${includedir}/wpa-supplicant/
+	install -m 0644 ${S}/src/utils/includes.h ${D}${includedir}/wpa-supplicant/
+	install -m 0644 ${S}/src/utils/os.h ${D}${includedir}/wpa-supplicant/
+	install -m 0644 ${S}/src/utils/os_unix.c ${D}${includedir}/wpa-supplicant/
+	install -m 0644 ${S}/src/utils/trace.h ${D}${includedir}/wpa-supplicant/
+	install -m 0644 ${S}/src/utils/wpa_debug.h ${D}${includedir}/wpa-supplicant/
+	install -m 0644 ${S}/src/utils/wpabuf.h ${D}${includedir}/wpa-supplicant/
+}
+
+FILES_${PN}-dev += "${includedir}/wpa-supplicant/*"
+
-- 
cgit v1.2.3-54-g00ecf


From 343343291c20d9108bec986a882dca8f68d1ae8b Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@digia.com>
Date: Fri, 9 May 2014 09:17:51 +0300
Subject: linux-yocto: upstream version has changed

Change-Id: Ie53b19ffa20d3c448528bf562aa4b20274011261
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
---
 recipes/linux/linux-yocto_3.10.bbappend | 29 -----------------------------
 recipes/linux/linux-yocto_3.14.bbappend | 29 +++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 29 deletions(-)
 delete mode 100644 recipes/linux/linux-yocto_3.10.bbappend
 create mode 100644 recipes/linux/linux-yocto_3.14.bbappend

diff --git a/recipes/linux/linux-yocto_3.10.bbappend b/recipes/linux/linux-yocto_3.10.bbappend
deleted file mode 100644
index 2645cbc..0000000
--- a/recipes/linux/linux-yocto_3.10.bbappend
+++ /dev/null
@@ -1,29 +0,0 @@
-#############################################################################
-##
-## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-##
-## This file is part of the Qt Enterprise Embedded Scripts of the Qt
-## framework.
-##
-## $QT_BEGIN_LICENSE$
-## Commercial License Usage Only
-## Licensees holding valid commercial Qt license agreements with Digia
-## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
-## may use this file in accordance with the terms contained in said license
-## agreement.
-##
-## For further information use the contact form at
-## http://qt.digia.com/contact-us.
-##
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-SRC_URI += "\
-    file://snd_intel8x0.cfg \
-    "
-
-KMACHINE_emulator = "qemux86"
-COMPATIBLE_MACHINE_emulator = "emulator"
diff --git a/recipes/linux/linux-yocto_3.14.bbappend b/recipes/linux/linux-yocto_3.14.bbappend
new file mode 100644
index 0000000..2645cbc
--- /dev/null
+++ b/recipes/linux/linux-yocto_3.14.bbappend
@@ -0,0 +1,29 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://qt.digia.com/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+SRC_URI += "\
+    file://snd_intel8x0.cfg \
+    "
+
+KMACHINE_emulator = "qemux86"
+COMPATIBLE_MACHINE_emulator = "emulator"
-- 
cgit v1.2.3-54-g00ecf


From 30329f83d5d5d2e3bca663e1e9016025ccd76cf1 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@digia.com>
Date: Fri, 9 May 2014 09:18:36 +0300
Subject: libsdl: disable dependency to libglu

Change-Id: I7e13486a6bd444557dbcb98ba794d6d335f25882
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
---
 recipes/libsdl/libsdl_1.2.15.bbappend | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes/libsdl/libsdl_1.2.15.bbappend b/recipes/libsdl/libsdl_1.2.15.bbappend
index 36424fd..3a08249 100644
--- a/recipes/libsdl/libsdl_1.2.15.bbappend
+++ b/recipes/libsdl/libsdl_1.2.15.bbappend
@@ -1 +1 @@
-DEPENDS_remove = "virtual/libgl"
+DEPENDS_remove = "virtual/libgl libglu"
-- 
cgit v1.2.3-54-g00ecf


From 320e03e97c777e4e63d0a1f45f75771182069e77 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@digia.com>
Date: Fri, 9 May 2014 09:19:07 +0300
Subject: gstreamer: include icydemuxer needed for internet radios

Change-Id: If3c7931f10b47f2d85e5b3f0f48573f0956621df
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
---
 recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer.bb
index f6a8a54..5a076c1 100644
--- a/recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer.bb
+++ b/recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer.bb
@@ -35,6 +35,7 @@ RDEPENDS_${PN} = "\
         gst-plugins-good-id3demux \
         gst-plugins-good-auparse \
         gst-plugins-good-isomp4 \
+        gst-plugins-good-icydemux \
         gst-plugins-ugly-rmdemux \
         gst-plugins-ugly-asf \
         gst-plugins-ugly-a52dec \
-- 
cgit v1.2.3-54-g00ecf


From 75738f4153d7088a389500bdbdb1d92735a90498 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@digia.com>
Date: Tue, 13 May 2014 09:50:49 +0300
Subject: sabresd: add function fs support to sabresd kernel

Function FS needed for the adb connection, include kernel support
in the SABRE SD kernel.

Change-Id: I00f635aff7e71a097941dc8b1ecfb07a4ee3177f
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
---
 recipes/linux/linux-imx_3.10.17.bbappend | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 recipes/linux/linux-imx_3.10.17.bbappend

diff --git a/recipes/linux/linux-imx_3.10.17.bbappend b/recipes/linux/linux-imx_3.10.17.bbappend
new file mode 100644
index 0000000..082c431
--- /dev/null
+++ b/recipes/linux/linux-imx_3.10.17.bbappend
@@ -0,0 +1,32 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://qt.digia.com/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+do_configure_prepend() {
+	# FunctionFS for adb
+	echo "CONFIG_USB_FUNCTIONFS=m"  >> ${WORKDIR}/defconfig
+
+	# Enable USB serial support
+	echo "CONFIG_USB_SERIAL=m"              >> ${WORKDIR}/defconfig
+	echo "CONFIG_USB_SERIAL_GENERIC=y"      >> ${WORKDIR}/defconfig
+	echo "CONFIG_USB_SERIAL_FTDI_SIO=m"     >> ${WORKDIR}/defconfig
+	echo "CONFIG_USB_SERIAL_PL2303=m"       >> ${WORKDIR}/defconfig
+}
-- 
cgit v1.2.3-54-g00ecf


From 7c9a43aa044ab46279f2ec33c92fcb91fc1b7202 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@digia.com>
Date: Thu, 8 May 2014 11:34:21 +0300
Subject: Include support for Freescale SABRE SD (iMX6Q)

Change-Id: Iaa6004f4c9e3d0ec1948d18561bcf0ead81cb7c4
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
---
 conf/distro/include/imx6qsabresd.conf | 49 +++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 conf/distro/include/imx6qsabresd.conf

diff --git a/conf/distro/include/imx6qsabresd.conf b/conf/distro/include/imx6qsabresd.conf
new file mode 100644
index 0000000..1298ee4
--- /dev/null
+++ b/conf/distro/include/imx6qsabresd.conf
@@ -0,0 +1,49 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://qt.digia.com/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+IMAGE_FSTYPES = "tar.gz ext3 sdcard"
+
+BOOTFS_CONTENT = "\
+    ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \
+    ${KERNEL_IMAGETYPE}-imx6q-sabresd.dtb:imx6q-sabresd.dtb \
+    ${KERNEL_IMAGETYPE}-imx6q-sabresd-hdcp.dtb:imx6q-sabresd-hdcp.dtb \
+    ${KERNEL_IMAGETYPE}-imx6q-sabresd-ldo.dtb:imx6q-sabresd-ldo.dtb \
+    u-boot-${MACHINE}.imx:u-boot.imx \
+    "
+BOOTFS_DEPENDS = "u-boot:do_deploy"
+
+MACHINE_EXTRA_INSTALL = "\
+        libgal-mx6 \
+        libegl-mx6 \
+        libgles2-mx6 \
+        gst-fsl-plugin \
+        "
+
+MACHINE_EXTRA_INSTALL_SDK = " \
+        libgal-mx6 \
+        libegl-mx6 \
+        libegl-mx6-dev \
+        libgles2-mx6 \
+        libgles2-mx6-dev \
+        "
+
+ADB_PRODUCTID = "0x0000"
-- 
cgit v1.2.3-54-g00ecf


From b20a3f58ee264318fa351e449821ce76035df5ef Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@digia.com>
Date: Fri, 9 May 2014 09:16:26 +0300
Subject: mesa: remove from emulator image

Mesa is no longer needed in emulator image since we are using
qtglesstreaming

Change-Id: I1b16cc11b73e58f7c489db77ed161aabff5b1061
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
---
 conf/distro/include/emulator.conf                  |   4 -
 ...void-use-of-AC_CHECK_FILE-for-cross-compi.patch |  65 ----
 ...0001-fix-xlib-dependency-from-pipe-loader.patch |  26 --
 ...move-the-power-of-two-sizeof-struct-cmd_b.patch |  42 ---
 ...ate-NativeDisplayType-depending-on-config.patch | 358 ---------------------
 recipes/mesa/mesa/fix-glsl-cross.patch             |  43 ---
 recipes/mesa/mesa/glapi.patch                      | 109 -------
 recipes/mesa/mesa_9.1.6.bbappend                   |  26 --
 8 files changed, 673 deletions(-)
 delete mode 100644 recipes/mesa/mesa/0001-configure-Avoid-use-of-AC_CHECK_FILE-for-cross-compi.patch
 delete mode 100644 recipes/mesa/mesa/0001-fix-xlib-dependency-from-pipe-loader.patch
 delete mode 100644 recipes/mesa/mesa/0001-llvmpipe-remove-the-power-of-two-sizeof-struct-cmd_b.patch
 delete mode 100644 recipes/mesa/mesa/EGL-Mutate-NativeDisplayType-depending-on-config.patch
 delete mode 100644 recipes/mesa/mesa/fix-glsl-cross.patch
 delete mode 100644 recipes/mesa/mesa/glapi.patch
 delete mode 100644 recipes/mesa/mesa_9.1.6.bbappend

diff --git a/conf/distro/include/emulator.conf b/conf/distro/include/emulator.conf
index dee1df3..9b22383 100644
--- a/conf/distro/include/emulator.conf
+++ b/conf/distro/include/emulator.conf
@@ -32,12 +32,8 @@ MACHINE_EXTRA_RRECOMMENDS += "\
 kernel_autoload_snd-intel8x0 = "snd-intel8x0"
 
 MACHINE_EXTRA_INSTALL = "\
-        libegl-mesa \
-        libgles2-mesa \
         mount-vboxsf \
         "
 
 MACHINE_EXTRA_INSTALL_SDK = "\
-        libegl-mesa-dev \
-        libgles2-mesa-dev \
         "
diff --git a/recipes/mesa/mesa/0001-configure-Avoid-use-of-AC_CHECK_FILE-for-cross-compi.patch b/recipes/mesa/mesa/0001-configure-Avoid-use-of-AC_CHECK_FILE-for-cross-compi.patch
deleted file mode 100644
index 9f7002a..0000000
--- a/recipes/mesa/mesa/0001-configure-Avoid-use-of-AC_CHECK_FILE-for-cross-compi.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 877b8ea9a79d1d51f8e6b032801731538590d39e Mon Sep 17 00:00:00 2001
-From: Jonathan Liu <net147@gmail.com>
-Date: Tue, 4 Jun 2013 06:04:44 -0700
-Subject: [PATCH] configure: Avoid use of AC_CHECK_FILE for cross compiling
-
-The AC_CHECK_FILE macro can't be used for cross compiling as it will
-result in "error: cannot check for file existence when cross compiling".
-Replace it with the AS_IF macro.
-
-Upstream-Status: Submitted
-http://lists.freedesktop.org/archives/mesa-dev/2013-June/040168.html
-
-Signed-off-by: Jonathan Liu <net147@gmail.com>
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- configure.ac | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 36065f1..2b4a374 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1694,8 +1694,8 @@ if test "x$enable_gallium_llvm" = xyes; then
-                 CLANG_LIBDIR=${LLVM_LIBDIR}
-             fi
-             CLANG_RESOURCE_DIR=$CLANG_LIBDIR/clang/${LLVM_VERSION}
--            AC_CHECK_FILE("$CLANG_RESOURCE_DIR/include/stddef.h",,
--                AC_MSG_ERROR([Could not find clang internal header stddef.h in $CLANG_RESOURCE_DIR Use --with-clang-libdir to specify the correct path to the clang libraries.]))
-+            AS_IF([test ! -f "$CLANG_RESOURCE_DIR/include/stddef.h"],
-+                [AC_MSG_ERROR([Could not find clang internal header stddef.h in $CLANG_RESOURCE_DIR Use --with-clang-libdir to specify the correct path to the clang libraries.])])
-         fi
-     else
- 	MESA_LLVM=0
-@@ -1912,7 +1912,7 @@ if test "x$MESA_LLVM" != x0; then
-     if test "x$with_llvm_shared_libs" = xyes; then
-         dnl We can't use $LLVM_VERSION because it has 'svn' stripped out,
-         LLVM_SO_NAME=LLVM-`$LLVM_CONFIG --version`
--        AC_CHECK_FILE("$LLVM_LIBDIR/lib$LLVM_SO_NAME.so", llvm_have_one_so=yes,)
-+        AS_IF([test -f "$LLVM_LIBDIR/lib$LLVM_SO_NAME.so"], [llvm_have_one_so=yes])
- 
-         if test "x$llvm_have_one_so" = xyes; then
-             dnl LLVM was built using auto*, so there is only one shared object.
-@@ -1920,8 +1920,8 @@ if test "x$MESA_LLVM" != x0; then
-         else
-             dnl If LLVM was built with CMake, there will be one shared object per
-             dnl component.
--            AC_CHECK_FILE("$LLVM_LIBDIR/libLLVMTarget.so",,
--                    AC_MSG_ERROR([Could not find llvm shared libraries:
-+            AS_IF([test ! -f "$LLVM_LIBDIR/libLLVMTarget.so"],
-+                    [AC_MSG_ERROR([Could not find llvm shared libraries:
- 	Please make sure you have built llvm with the --enable-shared option
- 	and that your llvm libraries are installed in $LLVM_LIBDIR
- 	If you have installed your llvm libraries to a different directory you
-@@ -1932,7 +1932,7 @@ if test "x$MESA_LLVM" != x0; then
- 		--enable-opencl
- 	If you do not want to build with llvm shared libraries and instead want to
- 	use llvm static libraries then remove these options from your configure
--	invocation and reconfigure.]))
-+	invocation and reconfigure.])])
- 
-            dnl We don't need to update LLVM_LIBS in this case because the LLVM
-            dnl install uses a shared object for each compoenent and we have
--- 
-1.8.2.1
-
diff --git a/recipes/mesa/mesa/0001-fix-xlib-dependency-from-pipe-loader.patch b/recipes/mesa/mesa/0001-fix-xlib-dependency-from-pipe-loader.patch
deleted file mode 100644
index a9f2394..0000000
--- a/recipes/mesa/mesa/0001-fix-xlib-dependency-from-pipe-loader.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 17d94fa96f095571651f0260378785c2a801ff16 Mon Sep 17 00:00:00 2001
-From: Samuli Piippo <samuli.piippo@digia.com>
-Date: Thu, 27 Jun 2013 14:49:54 +0300
-Subject: [PATCH] fix xlib dependency from pipe-loader
-
----
- src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c |    2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c b/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c
-index c2b78c6..8c59c83 100644
---- a/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c
-+++ b/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c
-@@ -31,7 +31,9 @@
- #include "util/u_dl.h"
- #include "sw/null/null_sw_winsys.h"
- #include "target-helpers/inline_sw_helper.h"
-+#ifdef X11
- #include "state_tracker/xlib_sw_winsys.h"
-+#endif
- 
- struct pipe_loader_sw_device {
-    struct pipe_loader_device base;
--- 
-1.7.10.4
-
diff --git a/recipes/mesa/mesa/0001-llvmpipe-remove-the-power-of-two-sizeof-struct-cmd_b.patch b/recipes/mesa/mesa/0001-llvmpipe-remove-the-power-of-two-sizeof-struct-cmd_b.patch
deleted file mode 100644
index b74fddc..0000000
--- a/recipes/mesa/mesa/0001-llvmpipe-remove-the-power-of-two-sizeof-struct-cmd_b.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 9915636fb8afe75ee2e8e013e4f495a4cb937afb Mon Sep 17 00:00:00 2001
-From: Brian Paul <brianp@vmware.com>
-Date: Wed, 6 Mar 2013 16:57:20 -0700
-Subject: [PATCH] llvmpipe: remove the power of two sizeof(struct cmd_block)
- assertion
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-It fails on 32-bit systems (I only tested on 64-bit).  Power of two
-size isn't required, so just remove the assertion.
-
-Reviewed-by: José Fonseca <jfonseca@vmware.com>
-
-Upstream-Status: Backport
-http://cgit.freedesktop.org/mesa/mesa/commit/?id=9915636fb8afe75ee2e8e013e4f495a4cb937afb
-
----
- src/gallium/drivers/llvmpipe/lp_scene.c | 7 -------
- 1 file changed, 7 deletions(-)
-
-diff --git a/src/gallium/drivers/llvmpipe/lp_scene.c b/src/gallium/drivers/llvmpipe/lp_scene.c
-index dd0943e..a0912eb 100644
---- a/src/gallium/drivers/llvmpipe/lp_scene.c
-+++ b/src/gallium/drivers/llvmpipe/lp_scene.c
-@@ -76,13 +76,6 @@ lp_scene_create( struct pipe_context *pipe )
-       assert(maxCommandBytes < LP_SCENE_MAX_SIZE);
-       /* We'll also need space for at least one other data block */
-       assert(maxCommandPlusData <= LP_SCENE_MAX_SIZE);
--
--      /* Ideally, the size of a cmd_block object will be a power of two
--       * in order to avoid wasting space when we allocation them from
--       * data blocks (which are power of two also).
--       */
--      assert(sizeof(struct cmd_block) ==
--             util_next_power_of_two(sizeof(struct cmd_block)));
-    }
- #endif
-
---
-1.8.3
-
diff --git a/recipes/mesa/mesa/EGL-Mutate-NativeDisplayType-depending-on-config.patch b/recipes/mesa/mesa/EGL-Mutate-NativeDisplayType-depending-on-config.patch
deleted file mode 100644
index 47ba167..0000000
--- a/recipes/mesa/mesa/EGL-Mutate-NativeDisplayType-depending-on-config.patch
+++ /dev/null
@@ -1,358 +0,0 @@
-From d52a7ec5dcdf3936bd727b854831efb90acfd2ba Mon Sep 17 00:00:00 2001
-From: Daniel Stone <daniel@fooishbar.org>
-Date: Fri, 24 May 2013 17:20:27 +0100
-Subject: [PATCH] EGL: Mutate NativeDisplayType depending on config
-
-If we go through ./configure without enabling X11 anywhere, then set the
-fallback types for EGL NativeDisplay and friends, rather than assuming
-X11/Xlib.
-
-Signed-off-by: Daniel Stone <daniel@fooishbar.org>
----
- configure.ac                 |    9 +++
- include/EGL/eglplatform.h    |  146 ------------------------------------------
- include/EGL/eglplatform.h.in |  146 ++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 155 insertions(+), 146 deletions(-)
- delete mode 100644 include/EGL/eglplatform.h
- create mode 100644 include/EGL/eglplatform.h.in
-
-diff --git a/configure.ac b/configure.ac
-index 4a98996..6fa77da 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1576,12 +1576,20 @@ fi
- 
- EGL_PLATFORMS="$egl_platforms"
- 
-+if echo "$egl_platforms" | grep 'x11' >/dev/null 2>&1; then
-+    MESA_EGL_NO_X11_HEADERS=0
-+else
-+    MESA_EGL_NO_X11_HEADERS=1
-+fi
-+
- AM_CONDITIONAL(HAVE_EGL_PLATFORM_X11, echo "$egl_platforms" | grep 'x11' >/dev/null 2>&1)
- AM_CONDITIONAL(HAVE_EGL_PLATFORM_WAYLAND, echo "$egl_platforms" | grep 'wayland' >/dev/null 2>&1)
- AM_CONDITIONAL(HAVE_EGL_PLATFORM_DRM, echo "$egl_platforms" | grep 'drm' >/dev/null 2>&1)
- AM_CONDITIONAL(HAVE_EGL_PLATFORM_FBDEV, echo "$egl_platforms" | grep 'fbdev' >/dev/null 2>&1)
- AM_CONDITIONAL(HAVE_EGL_PLATFORM_NULL, echo "$egl_platforms" | grep 'null' >/dev/null 2>&1)
- 
-+AC_SUBST([MESA_EGL_NO_X11_HEADERS])
-+
- AM_CONDITIONAL(HAVE_EGL_DRIVER_DRI2, test "x$HAVE_EGL_DRIVER_DRI2" != "x")
- AM_CONDITIONAL(HAVE_EGL_DRIVER_GLX, test "x$HAVE_EGL_DRIVER_GLX" != "x")
- 
-@@ -2053,6 +2061,7 @@ CXXFLAGS="$CXXFLAGS $USER_CXXFLAGS"
- 
- dnl Substitute the config
- AC_CONFIG_FILES([Makefile
-+                include/EGL/eglplatform.h
- 		src/Makefile
- 		src/egl/Makefile
- 		src/egl/drivers/Makefile
-diff --git a/include/EGL/eglplatform.h b/include/EGL/eglplatform.h
-deleted file mode 100644
-index 17fdc61..0000000
---- a/include/EGL/eglplatform.h
-+++ /dev/null
-@@ -1,146 +0,0 @@
--#ifndef __eglplatform_h_
--#define __eglplatform_h_
--
--/*
--** Copyright (c) 2007-2009 The Khronos Group Inc.
--**
--** Permission is hereby granted, free of charge, to any person obtaining a
--** copy of this software and/or associated documentation files (the
--** "Materials"), to deal in the Materials without restriction, including
--** without limitation the rights to use, copy, modify, merge, publish,
--** distribute, sublicense, and/or sell copies of the Materials, and to
--** permit persons to whom the Materials are furnished to do so, subject to
--** the following conditions:
--**
--** The above copyright notice and this permission notice shall be included
--** in all copies or substantial portions of the Materials.
--**
--** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
--** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
--** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
--** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
--** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
--** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
--** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
--*/
--
--/* Platform-specific types and definitions for egl.h
-- * $Revision: 12306 $ on $Date: 2010-08-25 09:51:28 -0700 (Wed, 25 Aug 2010) $
-- *
-- * Adopters may modify khrplatform.h and this file to suit their platform.
-- * You are encouraged to submit all modifications to the Khronos group so that
-- * they can be included in future versions of this file.  Please submit changes
-- * by sending them to the public Khronos Bugzilla (http://khronos.org/bugzilla)
-- * by filing a bug against product "EGL" component "Registry".
-- */
--
--#include <KHR/khrplatform.h>
--
--/* Macros used in EGL function prototype declarations.
-- *
-- * EGL functions should be prototyped as:
-- *
-- * EGLAPI return-type EGLAPIENTRY eglFunction(arguments);
-- * typedef return-type (EXPAPIENTRYP PFNEGLFUNCTIONPROC) (arguments);
-- *
-- * KHRONOS_APICALL and KHRONOS_APIENTRY are defined in KHR/khrplatform.h
-- */
--
--#ifndef EGLAPI
--#define EGLAPI KHRONOS_APICALL
--#endif
--
--#ifndef EGLAPIENTRY
--#define EGLAPIENTRY  KHRONOS_APIENTRY
--#endif
--#define EGLAPIENTRYP EGLAPIENTRY*
--
--/* The types NativeDisplayType, NativeWindowType, and NativePixmapType
-- * are aliases of window-system-dependent types, such as X Display * or
-- * Windows Device Context. They must be defined in platform-specific
-- * code below. The EGL-prefixed versions of Native*Type are the same
-- * types, renamed in EGL 1.3 so all types in the API start with "EGL".
-- *
-- * Khronos STRONGLY RECOMMENDS that you use the default definitions
-- * provided below, since these changes affect both binary and source
-- * portability of applications using EGL running on different EGL
-- * implementations.
-- */
--
--#if defined(_WIN32) || defined(__VC32__) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) /* Win32 and WinCE */
--#ifndef WIN32_LEAN_AND_MEAN
--#define WIN32_LEAN_AND_MEAN 1
--#endif
--#include <windows.h>
--
--typedef HDC     EGLNativeDisplayType;
--typedef HBITMAP EGLNativePixmapType;
--typedef HWND    EGLNativeWindowType;
--
--#elif defined(__WINSCW__) || defined(__SYMBIAN32__)  /* Symbian */
--
--typedef int   EGLNativeDisplayType;
--typedef void *EGLNativeWindowType;
--typedef void *EGLNativePixmapType;
--
--#elif defined(WL_EGL_PLATFORM)
--
--typedef struct wl_display     *EGLNativeDisplayType;
--typedef struct wl_egl_pixmap  *EGLNativePixmapType;
--typedef struct wl_egl_window  *EGLNativeWindowType;
--
--#elif defined(__GBM__)
--
--typedef struct gbm_device  *EGLNativeDisplayType;
--typedef struct gbm_bo      *EGLNativePixmapType;
--typedef void               *EGLNativeWindowType;
--
--#elif defined(ANDROID) /* Android */
--
--struct ANativeWindow;
--struct egl_native_pixmap_t;
--
--typedef struct ANativeWindow        *EGLNativeWindowType;
--typedef struct egl_native_pixmap_t  *EGLNativePixmapType;
--typedef void                        *EGLNativeDisplayType;
--
--#elif defined(__unix__)
--
--#ifdef MESA_EGL_NO_X11_HEADERS
--
--typedef void            *EGLNativeDisplayType;
--typedef khronos_uint32_t EGLNativePixmapType;
--typedef khronos_uint32_t EGLNativeWindowType;
--
--#else
--
--/* X11 (tentative)  */
--#include <X11/Xlib.h>
--#include <X11/Xutil.h>
--
--typedef Display *EGLNativeDisplayType;
--typedef Pixmap   EGLNativePixmapType;
--typedef Window   EGLNativeWindowType;
--
--#endif /* MESA_EGL_NO_X11_HEADERS */
--
--#else
--#error "Platform not recognized"
--#endif
--
--/* EGL 1.2 types, renamed for consistency in EGL 1.3 */
--typedef EGLNativeDisplayType NativeDisplayType;
--typedef EGLNativePixmapType  NativePixmapType;
--typedef EGLNativeWindowType  NativeWindowType;
--
--
--/* Define EGLint. This must be a signed integral type large enough to contain
-- * all legal attribute names and values passed into and out of EGL, whether
-- * their type is boolean, bitmask, enumerant (symbolic constant), integer,
-- * handle, or other.  While in general a 32-bit integer will suffice, if
-- * handles are 64 bit types, then EGLint should be defined as a signed 64-bit
-- * integer type.
-- */
--typedef khronos_int32_t EGLint;
--
--#endif /* __eglplatform_h */
-diff --git a/include/EGL/eglplatform.h.in b/include/EGL/eglplatform.h.in
-new file mode 100644
-index 0000000..5126c92
---- /dev/null
-+++ b/include/EGL/eglplatform.h.in
-@@ -0,0 +1,146 @@
-+#ifndef __eglplatform_h_
-+#define __eglplatform_h_
-+
-+/*
-+** Copyright (c) 2007-2009 The Khronos Group Inc.
-+**
-+** Permission is hereby granted, free of charge, to any person obtaining a
-+** copy of this software and/or associated documentation files (the
-+** "Materials"), to deal in the Materials without restriction, including
-+** without limitation the rights to use, copy, modify, merge, publish,
-+** distribute, sublicense, and/or sell copies of the Materials, and to
-+** permit persons to whom the Materials are furnished to do so, subject to
-+** the following conditions:
-+**
-+** The above copyright notice and this permission notice shall be included
-+** in all copies or substantial portions of the Materials.
-+**
-+** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-+** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-+** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-+** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-+** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
-+*/
-+
-+/* Platform-specific types and definitions for egl.h
-+ * $Revision: 12306 $ on $Date: 2010-08-25 09:51:28 -0700 (Wed, 25 Aug 2010) $
-+ *
-+ * Adopters may modify khrplatform.h and this file to suit their platform.
-+ * You are encouraged to submit all modifications to the Khronos group so that
-+ * they can be included in future versions of this file.  Please submit changes
-+ * by sending them to the public Khronos Bugzilla (http://khronos.org/bugzilla)
-+ * by filing a bug against product "EGL" component "Registry".
-+ */
-+
-+#include <KHR/khrplatform.h>
-+
-+/* Macros used in EGL function prototype declarations.
-+ *
-+ * EGL functions should be prototyped as:
-+ *
-+ * EGLAPI return-type EGLAPIENTRY eglFunction(arguments);
-+ * typedef return-type (EXPAPIENTRYP PFNEGLFUNCTIONPROC) (arguments);
-+ *
-+ * KHRONOS_APICALL and KHRONOS_APIENTRY are defined in KHR/khrplatform.h
-+ */
-+
-+#ifndef EGLAPI
-+#define EGLAPI KHRONOS_APICALL
-+#endif
-+
-+#ifndef EGLAPIENTRY
-+#define EGLAPIENTRY  KHRONOS_APIENTRY
-+#endif
-+#define EGLAPIENTRYP EGLAPIENTRY*
-+
-+/* The types NativeDisplayType, NativeWindowType, and NativePixmapType
-+ * are aliases of window-system-dependent types, such as X Display * or
-+ * Windows Device Context. They must be defined in platform-specific
-+ * code below. The EGL-prefixed versions of Native*Type are the same
-+ * types, renamed in EGL 1.3 so all types in the API start with "EGL".
-+ *
-+ * Khronos STRONGLY RECOMMENDS that you use the default definitions
-+ * provided below, since these changes affect both binary and source
-+ * portability of applications using EGL running on different EGL
-+ * implementations.
-+ */
-+
-+#if defined(_WIN32) || defined(__VC32__) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) /* Win32 and WinCE */
-+#ifndef WIN32_LEAN_AND_MEAN
-+#define WIN32_LEAN_AND_MEAN 1
-+#endif
-+#include <windows.h>
-+
-+typedef HDC     EGLNativeDisplayType;
-+typedef HBITMAP EGLNativePixmapType;
-+typedef HWND    EGLNativeWindowType;
-+
-+#elif defined(__WINSCW__) || defined(__SYMBIAN32__)  /* Symbian */
-+
-+typedef int   EGLNativeDisplayType;
-+typedef void *EGLNativeWindowType;
-+typedef void *EGLNativePixmapType;
-+
-+#elif defined(WL_EGL_PLATFORM)
-+
-+typedef struct wl_display     *EGLNativeDisplayType;
-+typedef struct wl_egl_pixmap  *EGLNativePixmapType;
-+typedef struct wl_egl_window  *EGLNativeWindowType;
-+
-+#elif defined(__GBM__)
-+
-+typedef struct gbm_device  *EGLNativeDisplayType;
-+typedef struct gbm_bo      *EGLNativePixmapType;
-+typedef void               *EGLNativeWindowType;
-+
-+#elif defined(ANDROID) /* Android */
-+
-+struct ANativeWindow;
-+struct egl_native_pixmap_t;
-+
-+typedef struct ANativeWindow        *EGLNativeWindowType;
-+typedef struct egl_native_pixmap_t  *EGLNativePixmapType;
-+typedef void                        *EGLNativeDisplayType;
-+
-+#elif defined(__unix__)
-+
-+#if @MESA_EGL_NO_X11_HEADERS@
-+
-+typedef void            *EGLNativeDisplayType;
-+typedef khronos_uint32_t EGLNativePixmapType;
-+typedef khronos_uint32_t EGLNativeWindowType;
-+
-+#else
-+
-+/* X11 (tentative)  */
-+#include <X11/Xlib.h>
-+#include <X11/Xutil.h>
-+
-+typedef Display *EGLNativeDisplayType;
-+typedef Pixmap   EGLNativePixmapType;
-+typedef Window   EGLNativeWindowType;
-+
-+#endif /* MESA_EGL_NO_X11_HEADERS */
-+
-+#else
-+#error "Platform not recognized"
-+#endif
-+
-+/* EGL 1.2 types, renamed for consistency in EGL 1.3 */
-+typedef EGLNativeDisplayType NativeDisplayType;
-+typedef EGLNativePixmapType  NativePixmapType;
-+typedef EGLNativeWindowType  NativeWindowType;
-+
-+
-+/* Define EGLint. This must be a signed integral type large enough to contain
-+ * all legal attribute names and values passed into and out of EGL, whether
-+ * their type is boolean, bitmask, enumerant (symbolic constant), integer,
-+ * handle, or other.  While in general a 32-bit integer will suffice, if
-+ * handles are 64 bit types, then EGLint should be defined as a signed 64-bit
-+ * integer type.
-+ */
-+typedef khronos_int32_t EGLint;
-+
-+#endif /* __eglplatform_h */
--- 
-1.7.10.4
-
diff --git a/recipes/mesa/mesa/fix-glsl-cross.patch b/recipes/mesa/mesa/fix-glsl-cross.patch
deleted file mode 100644
index 34226ea..0000000
--- a/recipes/mesa/mesa/fix-glsl-cross.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-The target libtool is used when building host binaries, which predictably
-doesn't work.
-
-Upstream-Status: Submitted (https://bugs.freedesktop.org/show_bug.cgi?id=44618)
-Signed-off-by: Jonathan Liu <net147@gmail.com>
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-diff --git a/src/glsl/builtin_compiler/Makefile.am b/src/glsl/builtin_compiler/Makefile.am
-index e11a17f..8ebe0a2 100644
---- a/src/glsl/builtin_compiler/Makefile.am
-+++ b/src/glsl/builtin_compiler/Makefile.am
-@@ -64,6 +64,8 @@ AM_CXXFLAGS = $(AM_CFLAGS)
- include ../Makefile.sources
- 
- noinst_PROGRAMS = builtin_compiler
-+
-+if !CROSS_COMPILING
- noinst_LTLIBRARIES = libglslcore.la libglcpp.la
- 
- libglcpp_la_SOURCES =					\
-@@ -73,6 +75,7 @@ libglcpp_la_SOURCES =					\
- libglslcore_la_SOURCES =				\
- 	$(BUILTIN_COMPILER_GENERATED_CXX_FILES)		\
- 	$(LIBGLSL_FILES)
-+endif
- 
- builtin_compiler_SOURCES = \
- 	$(top_srcdir)/src/mesa/main/hash_table.c	\
-@@ -81,4 +84,14 @@ builtin_compiler_SOURCES = \
- 	$(top_srcdir)/src/mesa/program/symbol_table.c	\
- 	$(BUILTIN_COMPILER_CXX_FILES)			\
- 	$(GLSL_COMPILER_CXX_FILES)
-+
-+if CROSS_COMPILING
-+builtin_compiler_SOURCES += \
-+	$(LIBGLCPP_GENERATED_FILES) \
-+	$(LIBGLCPP_FILES) \
-+	$(BUILTIN_COMPILER_GENERATED_CXX_FILES) \
-+	$(LIBGLSL_FILES)
-+builtin_compiler_CPPFLAGS = $(AM_CPPFLAGS)
-+else
- builtin_compiler_LDADD = libglslcore.la libglcpp.la
-+endif
diff --git a/recipes/mesa/mesa/glapi.patch b/recipes/mesa/mesa/glapi.patch
deleted file mode 100644
index 74cac0b..0000000
--- a/recipes/mesa/mesa/glapi.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From 5ea43e65498505fc5d11d63668cda165146eb55b Mon Sep 17 00:00:00 2001
-From: Andreas Boll <andreas.boll.dev@gmail.com>
-Date: Thu, 30 May 2013 11:32:43 +0000
-Subject: glapi: Add some missing static_dispatch="false" annotations to es_EXT.xml
-
-This fixes the following build errors on powerpc:
-
-  CC     glapi_dispatch.lo
-  In file included from glapi_dispatch.c:90:0:
-  ../../../../../src/mapi/glapi/glapitemp.h:1640:1: error: no previous
-  prototype for 'glReadBufferNV' [-Werror=missing-prototypes]
-  ../../../../../src/mapi/glapi/glapitemp.h:4198:1: error: no previous
-  prototype for 'glDrawBuffersNV' [-Werror=missing-prototypes]
-  ../../../../../src/mapi/glapi/glapitemp.h:6377:1: error: no previous
-  prototype for 'glFlushMappedBufferRangeEXT'
-  [-Werror=missing-prototypes]
-  ../../../../../src/mapi/glapi/glapitemp.h:6389:1: error: no previous
-  prototype for 'glMapBufferRangeEXT' [-Werror=missing-prototypes]
-  ../../../../../src/mapi/glapi/glapitemp.h:6401:1: error: no previous
-  prototype for 'glBindVertexArrayOES' [-Werror=missing-prototypes]
-  ../../../../../src/mapi/glapi/glapitemp.h:6413:1: error: no previous
-  prototype for 'glDeleteVertexArraysOES' [-Werror=missing-prototypes]
-  ../../../../../src/mapi/glapi/glapitemp.h:6433:1: error: no previous
-  prototype for 'glGenVertexArraysOES' [-Werror=missing-prototypes]
-  ../../../../../src/mapi/glapi/glapitemp.h:6445:1: error: no previous
-  prototype for 'glIsVertexArrayOES' [-Werror=missing-prototypes]
-
-NOTE: This is a candidate for the 9.0 and 9.1 branches.
-
-Reviewed-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
-Reviewed-by: Brian Paul <brianp@vmware.com>
----
-diff --git a/src/mapi/glapi/gen/es_EXT.xml b/src/mapi/glapi/gen/es_EXT.xml
-index ff378ac..f412333 100644
---- a/src/mapi/glapi/gen/es_EXT.xml
-+++ b/src/mapi/glapi/gen/es_EXT.xml
-@@ -689,22 +689,25 @@
- 
- <!-- 71. GL_OES_vertex_array_object -->
- <category name="GL_OES_vertex_array_object" number="71">
--    <function name="BindVertexArrayOES" alias="BindVertexArray" es2="2.0">
-+    <function name="BindVertexArrayOES" alias="BindVertexArray"
-+              static_dispatch="false" es2="2.0">
-         <param name="array" type="GLuint"/>
-     </function>
- 
-     <function name="DeleteVertexArraysOES" alias="DeleteVertexArrays"
--              es2="2.0">
-+              static_dispatch="false" es2="2.0">
-         <param name="n" type="GLsizei"/>
-         <param name="arrays" type="const GLuint *" count="n"/>
-     </function>
- 
--    <function name="GenVertexArraysOES" alias="GenVertexArrays" es2="2.0">
-+    <function name="GenVertexArraysOES" alias="GenVertexArrays"
-+              static_dispatch="false" es2="2.0">
-         <param name="n" type="GLsizei"/>
-         <param name="arrays" type="GLuint *" output="true" count="n"/>
-     </function>
- 
--    <function name="IsVertexArrayOES" alias="IsVertexArray" es2="2.0">
-+    <function name="IsVertexArrayOES" alias="IsVertexArray"
-+              static_dispatch="false" es2="2.0">
-         <param name="array" type="GLuint"/>
-         <return type="GLboolean"/>
-     </function>
-@@ -779,7 +782,8 @@
-         <size name="Get" mode="get"/>
-     </enum>
- 
--    <function name="DrawBuffersNV" alias="DrawBuffers" es2="2.0">
-+    <function name="DrawBuffersNV" alias="DrawBuffers"
-+              static_dispatch="false" es2="2.0">
-         <param name="n" type="GLsizei" counter="true"/>
-         <param name="bufs" type="const GLenum *" count="n"/>
-     </function>
-@@ -787,7 +791,8 @@
- 
- <!-- 93. GL_NV_read_buffer -->
- <category name="GL_NV_read_buffer">
--    <function name="ReadBufferNV" alias="ReadBuffer" es2="2.0">
-+    <function name="ReadBufferNV" alias="ReadBuffer"
-+              static_dispatch="false" es2="2.0">
-         <param name="mode" type="GLenum"/>
-     </function>
- </category>
-@@ -815,8 +820,8 @@
-     <enum name="MAP_FLUSH_EXPLICIT_BIT_EXT"               value="0x0010"/>
-     <enum name="MAP_UNSYNCHRONIZED_BIT_EXT"               value="0x0020"/>
- 
--    <function name="MapBufferRangeEXT" alias="MapBufferRange" es1="1.0"
--              es2="2.0">
-+    <function name="MapBufferRangeEXT" alias="MapBufferRange"
-+              static_dispatch="false" es1="1.0" es2="2.0">
-         <param name="target" type="GLenum"/>
-         <param name="offset" type="GLintptr"/>
-         <param name="size" type="GLsizeiptr"/>
-@@ -825,7 +830,7 @@
-     </function>
- 
-     <function name="FlushMappedBufferRangeEXT" alias="FlushMappedBufferRange"
--              es1="1.0" es2="2.0">
-+              static_dispatch="false" es1="1.0" es2="2.0">
-         <param name="target" type="GLenum"/>
-         <param name="offset" type="GLintptr"/>
-         <param name="length" type="GLsizeiptr"/>
---
-cgit v0.9.0.2-2-gbebe
-
diff --git a/recipes/mesa/mesa_9.1.6.bbappend b/recipes/mesa/mesa_9.1.6.bbappend
deleted file mode 100644
index 627f70b..0000000
--- a/recipes/mesa/mesa_9.1.6.bbappend
+++ /dev/null
@@ -1,26 +0,0 @@
-#############################################################################
-##
-## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-##
-## This file is part of the Qt Enterprise Embedded Scripts of the Qt
-## framework.
-##
-## $QT_BEGIN_LICENSE$
-## Commercial License Usage Only
-## Licensees holding valid commercial Qt license agreements with Digia
-## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
-## may use this file in accordance with the terms contained in said license
-## agreement.
-##
-## For further information use the contact form at
-## http://qt.digia.com/contact-us.
-##
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-EGL_PLATFORMS = "fbdev"
-DRIDRIVERS_remove = "swrast,radeon,r200,nouveau,i965,i915"
-DRIDRIVERS_append += "swrast"
-EXTRA_OECONF += "--with-dri-drivers="""
-- 
cgit v1.2.3-54-g00ecf


From f64f1f26dfad731f4506107ba62eb745831d323d Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@digia.com>
Date: Wed, 14 May 2014 11:42:00 +0300
Subject: imx6: kernel update for nitrogen6x

Correctly append new kernel configs for the updated kernel version
and include device tree files in the boot image.

Change-Id: I3d7c826e3e96338048e82b23a6723212e4adbd03
Reviewed-by: Kalle Viironen <kalle.viironen@digia.com>
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
---
 conf/distro/include/nitrogen6x.conf           |  3 +++
 recipes/linux/linux-boundary_3.0.35.bbappend  | 37 ---------------------------
 recipes/linux/linux-boundary_3.10.17.bbappend | 37 +++++++++++++++++++++++++++
 3 files changed, 40 insertions(+), 37 deletions(-)
 delete mode 100644 recipes/linux/linux-boundary_3.0.35.bbappend
 create mode 100644 recipes/linux/linux-boundary_3.10.17.bbappend

diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf
index 3dddcc1..8066936 100644
--- a/conf/distro/include/nitrogen6x.conf
+++ b/conf/distro/include/nitrogen6x.conf
@@ -24,6 +24,9 @@ IMAGE_FSTYPES = "tar.gz"
 
 BOOTFS_CONTENT = "\
     ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \
+    ${KERNEL_IMAGETYPE}-imx6q-${MACHINE}.dtb:imx6q-${MACHINE}.dtb \
+    ${KERNEL_IMAGETYPE}-imx6dl-${MACHINE}.dtb:imx6dl-${MACHINE}.dtb \
+    ${KERNEL_IMAGETYPE}-imx6q-sabrelite.dtb:imx6q-sabrelite.dtb \
     6x_bootscript-${MACHINE}:6x_bootscript \
     6x_upgrade-${MACHINE}:6x_upgrade \
     "
diff --git a/recipes/linux/linux-boundary_3.0.35.bbappend b/recipes/linux/linux-boundary_3.0.35.bbappend
deleted file mode 100644
index dd9420e..0000000
--- a/recipes/linux/linux-boundary_3.0.35.bbappend
+++ /dev/null
@@ -1,37 +0,0 @@
-#############################################################################
-##
-## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-##
-## This file is part of the Qt Enterprise Embedded Scripts of the Qt
-## framework.
-##
-## $QT_BEGIN_LICENSE$
-## Commercial License Usage Only
-## Licensees holding valid commercial Qt license agreements with Digia
-## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
-## may use this file in accordance with the terms contained in said license
-## agreement.
-##
-## For further information use the contact form at
-## http://qt.digia.com/contact-us.
-##
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-
-do_configure_prepend() {
-	# Use multitouch protocol for touchscreen that support it
-	echo "CONFIG_TOUCHSCREEN_EGALAX_SINGLE_TOUCH=n"      >> ${WORKDIR}/defconfig
-	echo "CONFIG_TOUCHSCREEN_FT5X06_SINGLE_TOUCH=n"      >> ${WORKDIR}/defconfig
-
-	# FunctionFS for adb
-	echo "CONFIG_USB_FUNCTIONFS=m"  >> ${WORKDIR}/defconfig
-
-	# Enable USB serial support
-	echo "CONFIG_USB_SERIAL=m"              >> ${WORKDIR}/defconfig
-	echo "CONFIG_USB_SERIAL_GENERIC=y"      >> ${WORKDIR}/defconfig
-	echo "CONFIG_USB_SERIAL_FTDI_SIO=m"     >> ${WORKDIR}/defconfig
-	echo "CONFIG_USB_SERIAL_PL2303=m"       >> ${WORKDIR}/defconfig
-}
diff --git a/recipes/linux/linux-boundary_3.10.17.bbappend b/recipes/linux/linux-boundary_3.10.17.bbappend
new file mode 100644
index 0000000..dd9420e
--- /dev/null
+++ b/recipes/linux/linux-boundary_3.10.17.bbappend
@@ -0,0 +1,37 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://qt.digia.com/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+
+do_configure_prepend() {
+	# Use multitouch protocol for touchscreen that support it
+	echo "CONFIG_TOUCHSCREEN_EGALAX_SINGLE_TOUCH=n"      >> ${WORKDIR}/defconfig
+	echo "CONFIG_TOUCHSCREEN_FT5X06_SINGLE_TOUCH=n"      >> ${WORKDIR}/defconfig
+
+	# FunctionFS for adb
+	echo "CONFIG_USB_FUNCTIONFS=m"  >> ${WORKDIR}/defconfig
+
+	# Enable USB serial support
+	echo "CONFIG_USB_SERIAL=m"              >> ${WORKDIR}/defconfig
+	echo "CONFIG_USB_SERIAL_GENERIC=y"      >> ${WORKDIR}/defconfig
+	echo "CONFIG_USB_SERIAL_FTDI_SIO=m"     >> ${WORKDIR}/defconfig
+	echo "CONFIG_USB_SERIAL_PL2303=m"       >> ${WORKDIR}/defconfig
+}
-- 
cgit v1.2.3-54-g00ecf


From 97eb833c35d19c049bc2d19544165de0a9b340b6 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@digia.com>
Date: Fri, 9 May 2014 15:54:28 +0300
Subject: sabre: updated kernel arguments

- disabled cursor blinking and blanking
- activated hdmi output
- use i2c probe to detect if hdmi is used

Change-Id: I7c1b98c305d3c2c9ab098ba3cfba38ff2b6b78d1
Reviewed-by: Kalle Viironen <kalle.viironen@digia.com>
---
 ...001-Updated-kernel-arguments-for-sabre-sd.patch | 133 +++++++++++++++++++++
 recipes/u-boot/u-boot-fslc_2014.01.bbappend        |  26 ++++
 2 files changed, 159 insertions(+)
 create mode 100644 recipes/u-boot/u-boot-fslc/0001-Updated-kernel-arguments-for-sabre-sd.patch
 create mode 100644 recipes/u-boot/u-boot-fslc_2014.01.bbappend

diff --git a/recipes/u-boot/u-boot-fslc/0001-Updated-kernel-arguments-for-sabre-sd.patch b/recipes/u-boot/u-boot-fslc/0001-Updated-kernel-arguments-for-sabre-sd.patch
new file mode 100644
index 0000000..59a4505
--- /dev/null
+++ b/recipes/u-boot/u-boot-fslc/0001-Updated-kernel-arguments-for-sabre-sd.patch
@@ -0,0 +1,133 @@
+From 2288d6475ba3ab9a7fb3cd4aa0aa3a7c60dbfac6 Mon Sep 17 00:00:00 2001
+From: Samuli Piippo <samuli.piippo@digia.com>
+Date: Fri, 9 May 2014 10:23:50 +0300
+Subject: [PATCH] Updated kernel arguments for sabre sd
+
+- Enable I2C
+- detect if hdmi is used and change video arguments accordingly
+- disable blanking and cursor blinking
+
+---
+ board/freescale/mx6sabresd/mx6sabresd.c | 23 +++++++++++++++++++++++
+ include/configs/mx6sabre_common.h       | 21 +++++++++++++++++++++
+ 2 files changed, 44 insertions(+)
+
+diff --git a/board/freescale/mx6sabresd/mx6sabresd.c b/board/freescale/mx6sabresd/mx6sabresd.c
+index 12d8c56..303b774 100644
+--- a/board/freescale/mx6sabresd/mx6sabresd.c
++++ b/board/freescale/mx6sabresd/mx6sabresd.c
+@@ -12,6 +12,7 @@
+ #include <asm/arch/mx6-pins.h>
+ #include <asm/errno.h>
+ #include <asm/gpio.h>
++#include <asm/imx-common/mxc_i2c.h>
+ #include <asm/imx-common/iomux-v3.h>
+ #include <asm/imx-common/boot_mode.h>
+ #include <mmc.h>
+@@ -24,6 +25,7 @@
+ #include <ipu_pixfmt.h>
+ #include <asm/io.h>
+ #include <asm/arch/sys_proto.h>
++#include <i2c.h>
+ DECLARE_GLOBAL_DATA_PTR;
+ 
+ #define UART_PAD_CTRL  (PAD_CTL_PUS_100K_UP |			\
+@@ -40,6 +42,12 @@ DECLARE_GLOBAL_DATA_PTR;
+ #define SPI_PAD_CTRL (PAD_CTL_HYS | PAD_CTL_SPEED_MED | \
+ 		      PAD_CTL_DSE_40ohm | PAD_CTL_SRE_FAST)
+ 
++#define I2C_PAD_CTRL  (PAD_CTL_PUS_100K_UP |			\
++	PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_HYS |	\
++	PAD_CTL_ODE | PAD_CTL_SRE_FAST)
++
++#define I2C_PAD MUX_PAD_CTRL(I2C_PAD_CTRL)
++
+ int dram_init(void)
+ {
+ 	gd->ram_size = get_ram_size((void *)PHYS_SDRAM, PHYS_SDRAM_SIZE);
+@@ -130,6 +138,19 @@ iomux_v3_cfg_t const ecspi1_pads[] = {
+ 	MX6_PAD_KEY_ROW1__GPIO4_IO09 | MUX_PAD_CTRL(NO_PAD_CTRL),
+ };
+ 
++static struct i2c_pads_info i2c_pad_info1 = {
++	.scl = {
++		.i2c_mode = MX6_PAD_KEY_COL3__I2C2_SCL | I2C_PAD,
++		.gpio_mode = MX6_PAD_KEY_COL3__GPIO4_IO12 | I2C_PAD,
++		.gp = IMX_GPIO_NR(4, 12)
++	},
++	.sda = {
++		.i2c_mode = MX6_PAD_KEY_ROW3__I2C2_SDA | I2C_PAD,
++		.gpio_mode = MX6_PAD_KEY_ROW3__GPIO4_IO13 | I2C_PAD,
++		.gp = IMX_GPIO_NR(4, 13)
++	}
++};
++
+ static void setup_spi(void)
+ {
+ 	imx_iomux_v3_setup_multiple_pads(ecspi1_pads, ARRAY_SIZE(ecspi1_pads));
+@@ -477,6 +498,8 @@ int board_init(void)
+ 	setup_spi();
+ #endif
+ 
++	setup_i2c(1, CONFIG_SYS_I2C_SPEED, 0x7f, &i2c_pad_info1);
++
+ 	return 0;
+ }
+ 
+diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h
+index 5ee7fa5..b83bf74 100644
+--- a/include/configs/mx6sabre_common.h
++++ b/include/configs/mx6sabre_common.h
+@@ -85,6 +85,13 @@
+ /* Command definition */
+ #include <config_cmd_default.h>
+ 
++/* I2C Configs */
++#define CONFIG_CMD_I2C
++#define CONFIG_SYS_I2C
++#define CONFIG_SYS_I2C_MXC
++#define CONFIG_SYS_I2C_SPEED		100000
++#define CONFIG_I2C_EDID
++
+ #define CONFIG_CMD_BMODE
+ #define CONFIG_CMD_BOOTZ
+ #define CONFIG_CMD_SETEXPR
+@@ -117,6 +124,15 @@
+ #define EMMC_ENV ""
+ #endif
+ 
++#define VIDEOARGS \
++	"videoargs=" \
++	"i2c dev 1 ; " \
++	"if i2c probe 0x50 ; then " \
++		"setenv video mxcfb0:dev=hdmi,1280x720M@60,if=RGB24 ; " \
++	"else " \
++		"setenv video mxcfb0:dev=ldb,LDB-XGA,if=RGB666 ldb=sin1 ; " \
++	"fi\0"
++
+ #define CONFIG_EXTRA_ENV_SETTINGS \
+ 	"script=boot.scr\0" \
+ 	"uimage=uImage\0" \
+@@ -144,7 +160,11 @@
+ 			"fi; "	\
+ 		"fi\0" \
+ 	EMMC_ENV	  \
++	VIDEOARGS \
+ 	"mmcargs=setenv bootargs console=${console},${baudrate} " \
++		"video=${video} "\
++		"consoleblank=0 " \
++		"vt.global_cursor_default=0 " \
+ 		"root=${mmcroot}\0" \
+ 	"loadbootscript=" \
+ 		"fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
+@@ -153,6 +173,7 @@
+ 	"loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \
+ 	"loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
+ 	"mmcboot=echo Booting from mmc ...; " \
++		"run videoargs; " \
+ 		"run mmcargs; " \
+ 		"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
+ 			"if run loadfdt; then " \
+-- 
+1.8.3.2
+
diff --git a/recipes/u-boot/u-boot-fslc_2014.01.bbappend b/recipes/u-boot/u-boot-fslc_2014.01.bbappend
new file mode 100644
index 0000000..b4ff56f
--- /dev/null
+++ b/recipes/u-boot/u-boot-fslc_2014.01.bbappend
@@ -0,0 +1,26 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://qt.digia.com/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
+SRC_URI += " \
+        file://0001-Updated-kernel-arguments-for-sabre-sd.patch \
+        "
-- 
cgit v1.2.3-54-g00ecf


From 52b5016e0c35bd1e6459eb31f5502c6817c04367 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@digia.com>
Date: Thu, 15 May 2014 10:21:09 +0300
Subject: mesa: include gles development files in sdk

The sdk still needs to have gles development files, since the
qtqlesstream is not there yet.

Change-Id: I5a078171b28542ead2e96a9942b781a93f4b697e
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
---
 conf/distro/include/emulator.conf |  2 ++
 recipes/mesa/mesa_9.2.5.bbappend  | 26 ++++++++++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 recipes/mesa/mesa_9.2.5.bbappend

diff --git a/conf/distro/include/emulator.conf b/conf/distro/include/emulator.conf
index 9b22383..3d85b6a 100644
--- a/conf/distro/include/emulator.conf
+++ b/conf/distro/include/emulator.conf
@@ -36,4 +36,6 @@ MACHINE_EXTRA_INSTALL = "\
         "
 
 MACHINE_EXTRA_INSTALL_SDK = "\
+        libegl-mesa-dev \
+        libgles2-mesa-dev \
         "
diff --git a/recipes/mesa/mesa_9.2.5.bbappend b/recipes/mesa/mesa_9.2.5.bbappend
new file mode 100644
index 0000000..627f70b
--- /dev/null
+++ b/recipes/mesa/mesa_9.2.5.bbappend
@@ -0,0 +1,26 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://qt.digia.com/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+EGL_PLATFORMS = "fbdev"
+DRIDRIVERS_remove = "swrast,radeon,r200,nouveau,i965,i915"
+DRIDRIVERS_append += "swrast"
+EXTRA_OECONF += "--with-dri-drivers="""
-- 
cgit v1.2.3-54-g00ecf


From 506533ebc0e592b34d68bb1fa944866edf3e389d Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@digia.com>
Date: Fri, 16 May 2014 10:20:54 +0300
Subject: emulator: include mesa back to the image

Qt gets dependency to libEGL.so which need to be in the image as well.

Change-Id: I414198d06e42432cb03a58d70ce622a1eb8890a1
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
---
 conf/distro/include/emulator.conf | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/conf/distro/include/emulator.conf b/conf/distro/include/emulator.conf
index 3d85b6a..dee1df3 100644
--- a/conf/distro/include/emulator.conf
+++ b/conf/distro/include/emulator.conf
@@ -32,6 +32,8 @@ MACHINE_EXTRA_RRECOMMENDS += "\
 kernel_autoload_snd-intel8x0 = "snd-intel8x0"
 
 MACHINE_EXTRA_INSTALL = "\
+        libegl-mesa \
+        libgles2-mesa \
         mount-vboxsf \
         "
 
-- 
cgit v1.2.3-54-g00ecf


From 2548e68fdc74edc7b5da703565bc777da7f2cd8d Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@digia.com>
Date: Mon, 19 May 2014 17:59:31 +0300
Subject: openssl: make sure c_rehash is included in the image

And make /usr/lib/ssl/certs symbolic link to /etc/ssl/certs,
so that ca-certificates are used.

Task-number: QTEE-502
Change-Id: Id673b5db066b184465425b56df9c1fa41e68fa70
Reviewed-by: Kalle Viironen <kalle.viironen@digia.com>
---
 recipes/openssl/openssl_1.0.1g.bbappend            | 28 ++++++++++++++++++++++
 .../packagegroup-b2qt-embedded-base.bb             |  1 +
 2 files changed, 29 insertions(+)
 create mode 100644 recipes/openssl/openssl_1.0.1g.bbappend

diff --git a/recipes/openssl/openssl_1.0.1g.bbappend b/recipes/openssl/openssl_1.0.1g.bbappend
new file mode 100644
index 0000000..1ba0a2e
--- /dev/null
+++ b/recipes/openssl/openssl_1.0.1g.bbappend
@@ -0,0 +1,28 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://qt.digia.com/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+PACKAGECONFIG += "perl"
+
+do_install_append () {
+	rmdir ${D}${libdir}/ssl/certs
+	ln -s ${sysconfdir}/ssl/certs ${D}${libdir}/ssl/
+}
diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb
index e7f15bb..bcc7868 100644
--- a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb
+++ b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb
@@ -32,6 +32,7 @@ RDEPENDS_${PN} = "\
         psplash \
         openssh-sftp-server \
         openssl \
+        openssl-misc \
         libpng \
         jpeg \
         tiff \
-- 
cgit v1.2.3-54-g00ecf


From 39c91776f85b24b9f4a9e30df3160d53454bb658 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@digia.com>
Date: Tue, 20 May 2014 08:44:07 +0300
Subject: ca-certificates: enable c_rehash in update-ca-certificates

c_rehash was not called from update-ca-certificates and hashes were
not generated. Disabling the patch so that it's now again called.

Task-number: QTEE-502
Change-Id: I4640427d34f3875b3ddb953bb40a31f6a7d255ff
Reviewed-by: Kalle Viironen <kalle.viironen@digia.com>
---
 .../ca-certificates_20130610.bbappend              | 23 ++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 recipes/ca-certificates/ca-certificates_20130610.bbappend

diff --git a/recipes/ca-certificates/ca-certificates_20130610.bbappend b/recipes/ca-certificates/ca-certificates_20130610.bbappend
new file mode 100644
index 0000000..0964c85
--- /dev/null
+++ b/recipes/ca-certificates/ca-certificates_20130610.bbappend
@@ -0,0 +1,23 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://qt.digia.com/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+SRC_URI_remove = "file://0001-update-ca-certificates-remove-c-rehash.patch"
-- 
cgit v1.2.3-54-g00ecf


From 2ab3d7fc456ece32ab23e1909ea0d865955f29d9 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@digia.com>
Date: Wed, 21 May 2014 14:41:16 +0300
Subject: blacklist evbug kernel module

This was causing lot's of kernel messages from input devices.

Task-number: QTEE-565
Change-Id: I9460e2eb972b0201bb2caa5cce064b05619af561
Reviewed-by: Kalle Viironen <kalle.viironen@digia.com>
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
---
 recipes/base-files/base-files/blacklist.conf  |  1 +
 recipes/base-files/base-files_3.0.14.bbappend | 12 ++++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 recipes/base-files/base-files/blacklist.conf

diff --git a/recipes/base-files/base-files/blacklist.conf b/recipes/base-files/base-files/blacklist.conf
new file mode 100644
index 0000000..a8b8885
--- /dev/null
+++ b/recipes/base-files/base-files/blacklist.conf
@@ -0,0 +1 @@
+blacklist evbug
diff --git a/recipes/base-files/base-files_3.0.14.bbappend b/recipes/base-files/base-files_3.0.14.bbappend
index 4b8908a..6e083e2 100644
--- a/recipes/base-files/base-files_3.0.14.bbappend
+++ b/recipes/base-files/base-files_3.0.14.bbappend
@@ -20,7 +20,15 @@
 ##
 #############################################################################
 
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+SRC_URI += "\
+    file://blacklist.conf \
+    "
+
 do_install_append() {
-       ln -s /home/root ${D}/root
-       echo ${MACHINE_HOSTNAME} > ${D}${sysconfdir}/hostname
+	ln -s /home/root ${D}/root
+	echo ${MACHINE_HOSTNAME} > ${D}${sysconfdir}/hostname
+
+	install -m 0755 -d ${D}${sysconfdir}/modprobe.d
+	install -m 0644 ${WORKDIR}/blacklist.conf ${D}${sysconfdir}/modprobe.d
 }
-- 
cgit v1.2.3-54-g00ecf