Merge branch 'stable' into dev

* stable:
  udev: disable udev-cache also for beagleboard
  busybox: use ifplugd to enable hotplug networking
  Move libgl workaround to libsdl
  imx53: change to correct GPU driver package
  emulator: don't build mesa with llvm anymore
  Fix emulator hdd image building
  emulator: alsa config to allow multiple source to play audio
  hunspell: use multple checksums for hunspell srcs
  Changes to init script
  Add script to initialize yocto build env
  Add missing copyright headers
  Update copyright year to 2014

Change-Id: Ieb1810ad0fd0faf10b2a83d222e5615bd8a34290

56 files changed, 271 insertions, 117 deletions

diff --git a/README b/README
index eb529bf..ea8d774 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ##
 ## This file is part of the Qt Enterprise Embedded Scripts of the Qt
 ## framework.
diff --git a/b2qt-init-build-env b/b2qt-init-build-env
new file mode 100755
index 0000000..8c4da01
--- /dev/null
+++ b/b2qt-init-build-env
@@ -0,0 +1,76 @@
+#!/bin/sh
+#############################################################################
+##
+## 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$
+##
+#############################################################################
+
+set -e
+
+if [ $# -ne 1 ]; then
+    echo "Usage: $0 <yocto build directory>"
+    exit 1
+fi
+
+mkdir -p ${1}
+
+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
+fi
+
+if [ ! -d ${BUILDDIR}/poky/meta-openembedded ]; then
+    git clone git://git.openembedded.org/meta-openembedded ${BUILDDIR}/poky/meta-openembedded -b dora
+fi
+
+if [ ! -d ${BUILDDIR}/poky/meta-ti ]; then
+    git clone git://git.yoctoproject.org/meta-ti ${BUILDDIR}/poky/meta-ti -b dora
+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
+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
+fi
+
+if [ ! -d ${BUILDDIR}/poky/meta-raspberrypi ]; then
+    git clone git://git.yoctoproject.org/meta-raspberrypi ${BUILDDIR}/poky/meta-raspberrypi -b dora
+fi
+
+if [ ! -d ${BUILDDIR}/poky/meta-b2qt ]; then
+    ln -s ${DIR} ${BUILDDIR}/poky/meta-b2qt
+fi
+
+echo
+echo "Yocto build system is ready"
+echo "next initialize the build env for your target machine, for example:"
+echo
+echo "cd ${BUILDDIR}"
+echo "export TEMPLATECONF=meta-b2qt/conf"
+echo "export MACHINE=raspberrypi"
+echo ". ./poky/oe-init-build-env build-raspberrypi"
+echo
+echo "and build B2Qt image with:"
+echo
+echo "bitbake b2qt-embedded-image"
+echo
diff --git a/classes/image-hdd.bbclass b/classes/image-hdd.bbclass
index fb59c20..46146b7 100644
--- a/classes/image-hdd.bbclass
+++ b/classes/image-hdd.bbclass
@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ##
 ## This file is part of the Qt Enterprise Embedded Scripts of the Qt
 ## framework.
@@ -34,7 +34,9 @@ SYSLINUX_DEFAULT_CONSOLE = "console=ttyS0,115200"
 inherit image_types boot-directdisk
 
 create_hdd_image () {
-        ln -fs ${IMAGE_NAME}.hdddirect ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.hdd
+        cd ${DEPLOY_DIR_IMAGE}
+        rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.hdd
+        ln -s ${IMAGE_NAME}.hdddirect ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.hdd
 }
 
 python do_hddimg() {
@@ -42,4 +44,3 @@ python do_hddimg() {
 }
 
 addtask hddimg after do_bootdirectdisk before do_build
-do_hddimg[nostamp] = "1"
diff --git a/classes/image_types_sdcard.bbclass b/classes/image_types_sdcard.bbclass
index 221ccd4..e562530 100644
--- a/classes/image_types_sdcard.bbclass
+++ b/classes/image_types_sdcard.bbclass
@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ##
 ## This file is part of the Qt Enterprise Embedded Scripts of the Qt
 ## framework.
diff --git a/conf/bblayers.conf.sample b/conf/bblayers.conf.sample
index 4e3fb71..5a95ec2 100644
--- a/conf/bblayers.conf.sample
+++ b/conf/bblayers.conf.sample
@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ##
 ## This file is part of the Qt Enterprise Embedded Scripts of the Qt
 ## framework.
diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf
index 033ae54..cde0b02 100644
--- a/conf/distro/b2qt.conf
+++ b/conf/distro/b2qt.conf
@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ##
 ## This file is part of the Qt Enterprise Embedded Scripts of the Qt
 ## framework.
diff --git a/conf/distro/include/am335x-evm.conf b/conf/distro/include/am335x-evm.conf
index b653d44..5799db7 100644
--- a/conf/distro/include/am335x-evm.conf
+++ b/conf/distro/include/am335x-evm.conf
@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ##
 ## This file is part of the Qt Enterprise Embedded Scripts of the Qt
 ## framework.
@@ -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 0b6454f..dab0c5a 100644
--- a/conf/distro/include/beagleboard.conf
+++ b/conf/distro/include/beagleboard.conf
@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ##
 ## This file is part of the Qt Enterprise Embedded Scripts of the Qt
 ## framework.
@@ -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 528b41d..ba13aaa 100644
--- a/conf/distro/include/beaglebone.conf
+++ b/conf/distro/include/beaglebone.conf
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2013 Digia Plc
+## Copyright (C) 2014 Digia Plc
 ## All rights reserved.
 ## For any questions to Digia, please use contact form at http://qt.digia.com
 ##
@@ -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/emulator.conf b/conf/distro/include/emulator.conf
index d3d5efd..dee1df3 100644
--- a/conf/distro/include/emulator.conf
+++ b/conf/distro/include/emulator.conf
@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ##
 ## This file is part of the Qt Enterprise Embedded Scripts of the Qt
 ## framework.
@@ -32,9 +32,7 @@ MACHINE_EXTRA_RRECOMMENDS += "\
 kernel_autoload_snd-intel8x0 = "snd-intel8x0"
 
 MACHINE_EXTRA_INSTALL = "\
-        llvm3.3 \
         libegl-mesa \
-        libegl-gallium \
         libgles2-mesa \
         mount-vboxsf \
         "
diff --git a/conf/distro/include/imx53qsb.conf b/conf/distro/include/imx53qsb.conf
index ca8595d..d83f6b4 100644
--- a/conf/distro/include/imx53qsb.conf
+++ b/conf/distro/include/imx53qsb.conf
@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ##
 ## This file is part of the Qt Enterprise Embedded Scripts of the Qt
 ## framework.
@@ -22,10 +22,8 @@
 
 IMAGE_FSTYPES = "tar.gz"
 
-PREFERRED_PROVIDER_virtual/libgl = "amd-gpu-x11-bin-mx51"
-
 MACHINE_EXTRA_INSTALL = "\
-        amd-gpu-x11-bin-mx51 \
+        amd-gpu-bin-mx51 \
         "
 
 MACHINE_EXTRA_INSTALL_SDK = " \
diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf
index dbb9478..b761ddd 100644
--- a/conf/distro/include/nitrogen6x.conf
+++ b/conf/distro/include/nitrogen6x.conf
@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ##
 ## This file is part of the Qt Enterprise Embedded Scripts of the Qt
 ## framework.
diff --git a/conf/distro/include/raspberrypi.conf b/conf/distro/include/raspberrypi.conf
index 19b2fdd..97513a8 100644
--- a/conf/distro/include/raspberrypi.conf
+++ b/conf/distro/include/raspberrypi.conf
@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ##
 ## This file is part of the Qt Enterprise Embedded Scripts of the Qt
 ## framework.
@@ -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 \
diff --git a/conf/layer.conf b/conf/layer.conf
index 952abcb..9a74df6 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ##
 ## This file is part of the Qt Enterprise Embedded Scripts of the Qt
 ## framework.
diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index f64c0b8..a9e1b34 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ##
 ## This file is part of the Qt Enterprise Embedded Scripts of the Qt
 ## framework.
diff --git a/conf/machine/emulator.conf b/conf/machine/emulator.conf
index f2628d5..14cce96 100644
--- a/conf/machine/emulator.conf
+++ b/conf/machine/emulator.conf
@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ##
 ## This file is part of the Qt Enterprise Embedded Scripts of the Qt
 ## framework.
diff --git a/recipes/adbd/adbd.bb b/recipes/adbd/adbd.bb
index 582305b..1feb7c3 100644
--- a/recipes/adbd/adbd.bb
+++ b/recipes/adbd/adbd.bb
@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ##
 ## This file is part of the Qt Enterprise Embedded Scripts of the Qt
 ## framework.
diff --git a/recipes/alsa/alsa-state.bbappend b/recipes/alsa/alsa-state.bbappend
index d1017c3..c9fba43 100644
--- a/recipes/alsa/alsa-state.bbappend
+++ b/recipes/alsa/alsa-state.bbappend
@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ##
 ## This file is part of the Qt Enterprise Embedded Scripts of the Qt
 ## framework.
diff --git a/recipes/alsa/alsa-state/emulator/asound.conf b/recipes/alsa/alsa-state/emulator/asound.conf
new file mode 100644
index 0000000..edd2e82
--- /dev/null
+++ b/recipes/alsa/alsa-state/emulator/asound.conf
@@ -0,0 +1,4 @@
+pcm.!default {
+    type plug
+    slave.pcm "dmix"
+}
diff --git a/recipes/alsa/alsa-state/raspberrypi/asound.conf b/recipes/alsa/alsa-state/raspberrypi/asound.conf
index 0d270a5..83f7f9a 100644
--- a/recipes/alsa/alsa-state/raspberrypi/asound.conf
+++ b/recipes/alsa/alsa-state/raspberrypi/asound.conf
@@ -1,25 +1,3 @@
-#############################################################################
-##
-## Copyright (C) 2013 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$
-##
-#############################################################################
-
 pcm.!default {
         type hw
         card 0
diff --git a/recipes/amd-gpu-x11-bin-mx51/amd-gpu-x11-bin-mx51_11.09.01.bbappend b/recipes/amd-gpu-x11-bin-mx51/amd-gpu-x11-bin-mx51_11.09.01.bbappend
index 3c48097..40075c0 100644
--- a/recipes/amd-gpu-x11-bin-mx51/amd-gpu-x11-bin-mx51_11.09.01.bbappend
+++ b/recipes/amd-gpu-x11-bin-mx51/amd-gpu-x11-bin-mx51_11.09.01.bbappend
@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ##
 ## This file is part of the Qt Enterprise Embedded Scripts of the Qt
 ## framework.
@@ -22,5 +22,3 @@
 
 # dependency to x11 only when distro features have it
 DEPENDS = "${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11', '', d)}"
-
-PROVIDES += "virtual/libgl"
diff --git a/recipes/base-files/base-files_3.0.14.bbappend b/recipes/base-files/base-files_3.0.14.bbappend
index c276c57..4b8908a 100644
--- a/recipes/base-files/base-files_3.0.14.bbappend
+++ b/recipes/base-files/base-files_3.0.14.bbappend
@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ##
 ## This file is part of the Qt Enterprise Embedded Scripts of the Qt
 ## framework.
diff --git a/recipes/busybox/busybox/busybox-ifplugd.sh b/recipes/busybox/busybox/busybox-ifplugd.sh
new file mode 100755
index 0000000..9ea40a8
--- /dev/null
+++ b/recipes/busybox/busybox/busybox-ifplugd.sh
@@ -0,0 +1,32 @@
+#!/bin/sh
+DAEMON=/usr/sbin/ifplugd
+NAME=ifplugd
+DESC="Busybox IFPLUG Server"
+ARGS="-i eth0"
+
+test -f $DAEMON || exit 1
+
+set -e
+
+case "$1" in
+        start)
+                echo -n "starting $DESC: $NAME... "
+                /sbin/start-stop-daemon -S -b -n $NAME -a $DAEMON -- $ARGS
+                echo "done."
+        ;;
+        stop)
+                echo -n "stopping $DESC: $NAME... "
+                /sbin/start-stop-daemon -K -n $NAME
+                echo "done."
+        ;;
+        restart)
+                echo "restarting $DESC: $NAME... "
+                $0 stop
+                $0 start
+                echo "done."
+        ;;
+        *)
+                echo "Usage: $0 {start|stop|restart}"
+                exit 1
+        ;;
+esac
diff --git a/recipes/busybox/busybox/ifplugd.action b/recipes/busybox/busybox/ifplugd.action
new file mode 100755
index 0000000..44fe040
--- /dev/null
+++ b/recipes/busybox/busybox/ifplugd.action
@@ -0,0 +1,6 @@
+#/bin/sh
+if [ "${2}" == "up" ]; then
+    ifup ${1}
+else
+    ifdown ${1}
+fi
diff --git a/recipes/busybox/busybox/network.cfg b/recipes/busybox/busybox/network.cfg
new file mode 100644
index 0000000..f858907
--- /dev/null
+++ b/recipes/busybox/busybox/network.cfg
@@ -0,0 +1 @@
+CONFIG_IFPLUGD=y
diff --git a/recipes/busybox/busybox_1.21.1.bbappend b/recipes/busybox/busybox_1.21.1.bbappend
new file mode 100644
index 0000000..fe5d5ea
--- /dev/null
+++ b/recipes/busybox/busybox_1.21.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/
+}
diff --git a/recipes/hunspell/hunspell_1.3.2.bb b/recipes/hunspell/hunspell_1.3.2.bb
index c9d6aba..beb071d 100644
--- a/recipes/hunspell/hunspell_1.3.2.bb
+++ b/recipes/hunspell/hunspell_1.3.2.bb
@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ##
 ## This file is part of the Qt Enterprise Embedded Scripts of the Qt
 ## framework.
@@ -24,13 +24,17 @@ DESCRIPTION = "Hunspell"
 LICENSE = "LGPLv2"
 LIC_FILES_CHKSUM = "file://${WORKDIR}/hunspell-${PV}/COPYING;md5=ed3a37b3ba6d6be3e08ab45987cf1b88"
 
-SRC_URI = "http://downloads.sourceforge.net/hunspell/hunspell-${PV}.tar.gz \
-           http://ftp.halifax.rwth-aachen.de/gentoo/distfiles/myspell-en_GB-20081002.zip \
-           http://downloads.sourceforge.net/project/ayaspell/hunspell-ar/20080110/hunspell-ar_20080110.tar.gz \
+SRC_URI = "http://downloads.sourceforge.net/hunspell/hunspell-${PV}.tar.gz;name=hunspell \
+           http://ftp.halifax.rwth-aachen.de/gentoo/distfiles/myspell-en_GB-20081002.zip;name=dict-en \
+           http://downloads.sourceforge.net/project/ayaspell/hunspell-ar/20080110/hunspell-ar_20080110.tar.gz;name=dict-ar \
           "
 
-SRC_URI[md5sum] = "69990932920960eb765fd35883640124"
-SRC_URI[sha256sum] = "88d9eebbe05de29d17f4420ebaec9249441ce01d61b5d6c7ecba040e250e2d91"
+SRC_URI[hunspell.md5sum] = "3121aaf3e13e5d88dfff13fb4a5f1ab8"
+SRC_URI[hunspell.sha256sum] = "b4edd4a4ee944cb9f485b35473e46b729ed768e9d24da8e78e4c4c6ca56addbd"
+SRC_URI[dict-en.md5sum] = "6fb885d57899c3e6aa2b27f3510deb37"
+SRC_URI[dict-en.sha256sum] = "f4b43083923e2998298fd270a8a9f9ed570f4fbebeaa46ce5f1788b76920308b"
+SRC_URI[dict-ar.md5sum] = "69990932920960eb765fd35883640124"
+SRC_URI[dict-ar.sha256sum] = "88d9eebbe05de29d17f4420ebaec9249441ce01d61b5d6c7ecba040e250e2d91"
 
 PR = "r0"
 
diff --git a/recipes/images/b2qt-embedded-image.bb b/recipes/images/b2qt-embedded-image.bb
index e7811cc..a9ec3bf 100644
--- a/recipes/images/b2qt-embedded-image.bb
+++ b/recipes/images/b2qt-embedded-image.bb
@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ##
 ## This file is part of the Qt Enterprise Embedded Scripts of the Qt
 ## framework.
diff --git a/recipes/init-ifupdown/init-ifupdown_1.0.bbappend b/recipes/init-ifupdown/init-ifupdown_1.0.bbappend
index eb545f7..fee5390 100644
--- a/recipes/init-ifupdown/init-ifupdown_1.0.bbappend
+++ b/recipes/init-ifupdown/init-ifupdown_1.0.bbappend
@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ##
 ## This file is part of the Qt Enterprise Embedded Scripts of the Qt
 ## framework.
diff --git a/recipes/initscripts/initscripts_1.0.bbappend b/recipes/initscripts/initscripts_1.0.bbappend
index 9c159bc..8473b89 100644
--- a/recipes/initscripts/initscripts_1.0.bbappend
+++ b/recipes/initscripts/initscripts_1.0.bbappend
@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ##
 ## This file is part of the Qt Enterprise Embedded Scripts of the Qt
 ## framework.
diff --git a/recipes/libgles/libgles-omap3_4.05.00.03.bbappend b/recipes/libgles/libgles-omap3_4.05.00.03.bbappend
index 97bb2b3..73a2408 100644
--- a/recipes/libgles/libgles-omap3_4.05.00.03.bbappend
+++ b/recipes/libgles/libgles-omap3_4.05.00.03.bbappend
@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ##
 ## This file is part of the Qt Enterprise Embedded Scripts of the Qt
 ## framework.
@@ -27,8 +27,6 @@ TOOLCHAIN_PATH = "${STAGING_DIR_TARGET}"
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 SRC_URI += " file://0001-Add-GLchar-typedef.patch"
 
-PROVIDES += "virtual/libgl"
-
 LIBGLESWINDOWSYSTEM = "libpvrPVR2D_FLIPWSEGL.so.1"
 
 do_install_append() {
diff --git a/recipes/libgles/libgles-omap3_4.09.00.01.bbappend b/recipes/libgles/libgles-omap3_4.09.00.01.bbappend
index 5ef2e29..6a37c89 100644
--- a/recipes/libgles/libgles-omap3_4.09.00.01.bbappend
+++ b/recipes/libgles/libgles-omap3_4.09.00.01.bbappend
@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ##
 ## This file is part of the Qt Enterprise Embedded Scripts of the Qt
 ## framework.
@@ -22,8 +22,6 @@
 
 BINLOCATION_omap3  = "${S}/gfx_rel_es5.x"
 
-PROVIDES += "virtual/libgl"
-
 LIBGLESWINDOWSYSTEM = "libpvrPVR2D_FLIPWSEGL.so.1"
 
 do_install_append() {
diff --git a/recipes/libgles/libgles-omap3_5.00.00.01.bbappend b/recipes/libgles/libgles-omap3_5.00.00.01.bbappend
index 1398af0..5446ffa 100644
--- a/recipes/libgles/libgles-omap3_5.00.00.01.bbappend
+++ b/recipes/libgles/libgles-omap3_5.00.00.01.bbappend
@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ##
 ## This file is part of the Qt Enterprise Embedded Scripts of the Qt
 ## framework.
@@ -25,8 +25,6 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 BINLOCATION_omap3  = "${S}/gfx_rel_es5.x"
 BINLOCATION_beaglebone  = "${S}/gfx_rel_es8.x"
 
-PROVIDES += "virtual/libgl"
-
 LIBGLESWINDOWSYSTEM = "libpvrPVR2D_FLIPWSEGL.so.1"
 
 do_install_append() {
diff --git a/recipes/libgles/libgles-omap3_5.01.00.01.bbappend b/recipes/libgles/libgles-omap3_5.01.00.01.bbappend
index 17666cb..82bfdb2 100644
--- a/recipes/libgles/libgles-omap3_5.01.00.01.bbappend
+++ b/recipes/libgles/libgles-omap3_5.01.00.01.bbappend
@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ##
 ## This file is part of the Qt Enterprise Embedded Scripts of the Qt
 ## framework.
@@ -25,8 +25,6 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 BINLOCATION_omap3  = "${S}/gfx_rel_es5.x"
 BINLOCATION_beaglebone  = "${S}/gfx_rel_es8.x"
 
-PROVIDES += "virtual/libgl"
-
 LIBGLESWINDOWSYSTEM = "libpvrPVR2D_FLIPWSEGL.so.1"
 
 # Inhibit warnings about files being stripped.
diff --git a/recipes/libsdl/libsdl_1.2.15.bbappend b/recipes/libsdl/libsdl_1.2.15.bbappend
new file mode 100644
index 0000000..36424fd
--- /dev/null
+++ b/recipes/libsdl/libsdl_1.2.15.bbappend
@@ -0,0 +1 @@
+DEPENDS_remove = "virtual/libgl"
diff --git a/recipes/linux/linux-am335x-psp_3.2.bbappend b/recipes/linux/linux-am335x-psp_3.2.bbappend
index c8f0f68..313111b 100644
--- a/recipes/linux/linux-am335x-psp_3.2.bbappend
+++ b/recipes/linux/linux-am335x-psp_3.2.bbappend
@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ##
 ## This file is part of the Qt Enterprise Embedded Scripts of the Qt
 ## framework.
diff --git a/recipes/linux/linux-boundary_3.0.35.bbappend b/recipes/linux/linux-boundary_3.0.35.bbappend
index fa0488a..610dc4d 100644
--- a/recipes/linux/linux-boundary_3.0.35.bbappend
+++ b/recipes/linux/linux-boundary_3.0.35.bbappend
@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ##
 ## This file is part of the Qt Enterprise Embedded Scripts of the Qt
 ## framework.
diff --git a/recipes/linux/linux-mainline_3.2.bbappend b/recipes/linux/linux-mainline_3.2.bbappend
index 6ca8c2e..4c2cb59 100644
--- a/recipes/linux/linux-mainline_3.2.bbappend
+++ b/recipes/linux/linux-mainline_3.2.bbappend
@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ##
 ## This file is part of the Qt Enterprise Embedded Scripts of the Qt
 ## framework.
diff --git a/recipes/linux/linux-ti-staging_3.12.bbappend b/recipes/linux/linux-ti-staging_3.12.bbappend
index 5bc8967..fe2bdd2 100644
--- a/recipes/linux/linux-ti-staging_3.12.bbappend
+++ b/recipes/linux/linux-ti-staging_3.12.bbappend
@@ -1 +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$
+##
+#############################################################################
+
 KERNEL_DEVICETREE_b2qt = "am335x-evm.dtb am335x-evmsk.dtb am335x-bone.dtb am335x-boneblack.dtb"
diff --git a/recipes/linux/linux-yocto_3.10.bbappend b/recipes/linux/linux-yocto_3.10.bbappend
index 9cd7e69..2645cbc 100644
--- a/recipes/linux/linux-yocto_3.10.bbappend
+++ b/recipes/linux/linux-yocto_3.10.bbappend
@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ##
 ## This file is part of the Qt Enterprise Embedded Scripts of the Qt
 ## framework.
diff --git a/recipes/mesa/mesa_9.1.6.bbappend b/recipes/mesa/mesa_9.1.6.bbappend
index 6c11709..627f70b 100644
--- a/recipes/mesa/mesa_9.1.6.bbappend
+++ b/recipes/mesa/mesa_9.1.6.bbappend
@@ -1,6 +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"
-PACKAGECONFIG = "egl gles dri gallium gallium-llvm gallium-egl"
-GALLIUMDRIVERS_LLVM = ""
 DRIDRIVERS_remove = "swrast,radeon,r200,nouveau,i965,i915"
 DRIDRIVERS_append += "swrast"
 EXTRA_OECONF += "--with-dri-drivers="""
diff --git a/recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb b/recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb
index f9cded9..c0afb90 100644
--- a/recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb
+++ b/recipes/meta/meta-toolchain-b2qt-embedded-sdk.bb
@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ##
 ## This file is part of the Qt Enterprise Embedded Scripts of the Qt
 ## framework.
diff --git a/recipes/mkcard/mkcard_0.5.bb b/recipes/mkcard/mkcard_0.5.bb
index d1da05a..8d71f81 100644
--- a/recipes/mkcard/mkcard_0.5.bb
+++ b/recipes/mkcard/mkcard_0.5.bb
@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ##
 ## This file is part of the Qt Enterprise Embedded Scripts of the Qt
 ## framework.
diff --git a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb
index 7194f91..f32bac4 100644
--- a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb
+++ b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb
@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ##
 ## This file is part of the Qt Enterprise Embedded Scripts of the Qt
 ## framework.
diff --git a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb
index 58bed38..4cdd404 100644
--- a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb
+++ b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-target.bb
@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ##
 ## This file is part of the Qt Enterprise Embedded Scripts of the Qt
 ## framework.
diff --git a/recipes/psplash/psplash_git.bbappend b/recipes/psplash/psplash_git.bbappend
index f9f3a6e..a5017cc 100644
--- a/recipes/psplash/psplash_git.bbappend
+++ b/recipes/psplash/psplash_git.bbappend
@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ##
 ## This file is part of the Qt Enterprise Embedded Scripts of the Qt
 ## framework.
diff --git a/recipes/u-boot/u-boot-am33x_2013.01.01.bbappend b/recipes/u-boot/u-boot-am33x_2013.01.01.bbappend
index bd00147..2b1c656 100644
--- a/recipes/u-boot/u-boot-am33x_2013.01.01.bbappend
+++ b/recipes/u-boot/u-boot-am33x_2013.01.01.bbappend
@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ##
 ## This file is part of the Qt Enterprise Embedded Scripts of the Qt
 ## framework.
diff --git a/recipes/u-boot/u-boot-beagleboard_2011.09.bbappend b/recipes/u-boot/u-boot-beagleboard_2011.09.bbappend
index 6d0e105..f6fbde1 100644
--- a/recipes/u-boot/u-boot-beagleboard_2011.09.bbappend
+++ b/recipes/u-boot/u-boot-beagleboard_2011.09.bbappend
@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ##
 ## This file is part of the Qt Enterprise Embedded Scripts of the Qt
 ## framework.
diff --git a/recipes/u-boot/u-boot-script-boundary_git.bbappend b/recipes/u-boot/u-boot-script-boundary_git.bbappend
index 3fc3b47..083b2fd 100644
--- a/recipes/u-boot/u-boot-script-boundary_git.bbappend
+++ b/recipes/u-boot/u-boot-script-boundary_git.bbappend
@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ##
 ## This file is part of the Qt Enterprise Embedded Scripts of the Qt
 ## framework.
diff --git a/recipes/u-boot/u-boot-ti-staging_2013.10.bbappend b/recipes/u-boot/u-boot-ti-staging_2013.10.bbappend
index 8caf0c5..bad928b 100644
--- a/recipes/u-boot/u-boot-ti-staging_2013.10.bbappend
+++ b/recipes/u-boot/u-boot-ti-staging_2013.10.bbappend
@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ##
 ## This file is part of the Qt Enterprise Embedded Scripts of the Qt
 ## framework.
diff --git a/recipes/udev/udev/beagleboard/udev-cache.default b/recipes/udev/udev/beagleboard/udev-cache.default
new file mode 100644
index 0000000..d0050b8
--- /dev/null
+++ b/recipes/udev/udev/beagleboard/udev-cache.default
@@ -0,0 +1,4 @@
+# Default for /etc/init.d/udev
+
+# Comment this out to disable device cache
+#DEVCACHE="/etc/dev.tar"
diff --git a/recipes/udev/udev_182.bbappend b/recipes/udev/udev_182.bbappend
index 970f8fb..4cee6a2 100644
--- a/recipes/udev/udev_182.bbappend
+++ b/recipes/udev/udev_182.bbappend
@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ##
 ## This file is part of the Qt Enterprise Embedded Scripts of the Qt
 ## framework.
diff --git a/recipes/userland/userland_git.bbappend b/recipes/userland/userland_git.bbappend
deleted file mode 100644
index 0e748cd..0000000
--- a/recipes/userland/userland_git.bbappend
+++ /dev/null
@@ -1,23 +0,0 @@
-#############################################################################
-##
-## Copyright (C) 2013 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$
-##
-#############################################################################
-
-PROVIDES = "virtual/libgl virtual/libgles1 virtual/libgles2 virtual/egl"
diff --git a/recipes/v86d/v86d_0.1.10.bbappend b/recipes/v86d/v86d_0.1.10.bbappend
index e2a9b43..d551a9f 100644
--- a/recipes/v86d/v86d_0.1.10.bbappend
+++ b/recipes/v86d/v86d_0.1.10.bbappend
@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ##
 ## This file is part of the Qt Enterprise Embedded Scripts of the Qt
 ## framework.
diff --git a/recipes/virtualbox/mount-vboxsf_4.2.14.bb b/recipes/virtualbox/mount-vboxsf_4.2.14.bb
index 656f379..4026d3a 100644
--- a/recipes/virtualbox/mount-vboxsf_4.2.14.bb
+++ b/recipes/virtualbox/mount-vboxsf_4.2.14.bb
@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ##
 ## This file is part of the Qt Enterprise Embedded Scripts of the Qt
 ## framework.
diff --git a/recipes/virtualbox/virtualbox-guest-additions_4.2.14.bb b/recipes/virtualbox/virtualbox-guest-additions_4.2.14.bb
index 09358df..128cad0 100644
--- a/recipes/virtualbox/virtualbox-guest-additions_4.2.14.bb
+++ b/recipes/virtualbox/virtualbox-guest-additions_4.2.14.bb
@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ##
 ## This file is part of the Qt Enterprise Embedded Scripts of the Qt
 ## framework.