Merge branch 'stable' into releaseQtEE_v2.0.0

* stable: (34 commits)
  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
  adb: use modprobe to load dependency modules
  udev: disable udev-cache on beaglebone
  Add support for BeagleBone Black
  Recipe for hunspell
  upgrade emulator components
  gpu-viv-bin-mx6q: remove dependency to mesa
  rpi: disable bbappend from meta-raspberrypi
  Install all kernel modules
  ...

Change-Id: I7adca9894ee35092d546babb1926edbf06300feb

12 files changed, 299 insertions, 15 deletions

diff --git a/conf/bblayers.conf.sample b/conf/bblayers.conf.sample
index 987a75d..5a95ec2 100644
--- a/conf/bblayers.conf.sample
+++ b/conf/bblayers.conf.sample
@@ -1,3 +1,25 @@
+#############################################################################
+##
+## 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$
+##
+#############################################################################
+
 # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
 # changes incompatibly
 LCONF_VERSION = "6"
diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf
index 1af10b5..cde0b02 100644
--- a/conf/distro/b2qt.conf
+++ b/conf/distro/b2qt.conf
@@ -1,8 +1,30 @@
+#############################################################################
+##
+## 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$
+##
+#############################################################################
+
 include conf/distro/poky.conf
 
 DISTRO = "b2qt"
 DISTRO_NAME = "Boot to Qt for Embedded Linux"
-DISTRO_VERSION = "1.4"
+DISTRO_VERSION = "1.5"
 SDK_VERSION := "${DISTRO_VERSION}"
 
 MAINTAINER = "B2Qt <B2Qt@digia.com>"
@@ -10,13 +32,15 @@ MAINTAINER = "B2Qt <B2Qt@digia.com>"
 SANITY_TESTED_DISTROS += " \
             Ubuntu 11.04 \n \
             LinuxMint-14 \n \
+            LinuxMint-16 \n \
             "
 
 include conf/distro/include/${MACHINE}.conf
 
 SYSVINIT_ENABLED_GETTYS = ""
 
-DISTRO_FEATURES ?= "alsa argp bluetooth ext2 largefile usbgadget usbhost wifi xattr nfs nfc ${DISTRO_FEATURES_LIBC}"
+DISTRO_FEATURES_DEFAULT = "alsa argp bluetooth ext2 irda largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g nfc"
+POKY_DEFAULT_DISTRO_FEATURES = "largefile opengl multiarch"
 DISTRO_FEATURES_BACKFILL_CONSIDERED = "pulseaudio"
 
 COMMERCIAL_AUDIO_PLUGINS ?= "gst-plugins-ugly-mad gst-plugins-ugly-mpegaudioparse"
diff --git a/conf/distro/include/am335x-evm.conf b/conf/distro/include/am335x-evm.conf
index 65d0ba4..5799db7 100644
--- a/conf/distro/include/am335x-evm.conf
+++ b/conf/distro/include/am335x-evm.conf
@@ -1,6 +1,27 @@
+#############################################################################
+##
+## 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"
 
-PREFERRED_PROVIDER_virtual/libgl = "libgles-omap3"
 PREFERRED_VERSION_libgles-omap3 = "4.09.00.01"
 PREFERRED_VERSION_omap3-sgx-modules = "4.09.00.01"
 
@@ -11,8 +32,11 @@ PREFERRED_VERSION_u-boot-am33x = "2013.01.01"
 MACHINE_EXTRA_INSTALL = "\
         libgles-omap3 \
         libgles-omap3-rawdemos \
+        lighttpd \
+        wayland \
         "
 
 MACHINE_EXTRA_INSTALL_SDK = "\
         libgles-omap3-dev \
+        wayland-dev \
         "
diff --git a/conf/distro/include/beagleboard.conf b/conf/distro/include/beagleboard.conf
index 728a3ea..dab0c5a 100644
--- a/conf/distro/include/beagleboard.conf
+++ b/conf/distro/include/beagleboard.conf
@@ -1,3 +1,25 @@
+#############################################################################
+##
+## 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_CLASSES += "image_types_sdcard"
 IMAGE_FSTYPES = "tar.gz ext3 sdcard"
 
@@ -8,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
new file mode 100644
index 0000000..ba13aaa
--- /dev/null
+++ b/conf/distro/include/beaglebone.conf
@@ -0,0 +1,34 @@
+############################################################################
+##
+## Copyright (C) 2014 Digia Plc
+## All rights reserved.
+## For any questions to Digia, please use contact form at http://qt.digia.com
+##
+## This file is part of QtEnterprise Embedded.
+##
+## Licensees holding valid Qt Enterprise licenses may use this file in
+## accordance with the Qt Enterprise License Agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and Digia.
+##
+## If you have questions regarding the use of this file, please use
+## contact form at http://qt.digia.com
+##
+############################################################################
+IMAGE_FSTYPES = "tar.gz"
+
+PREFERRED_VERSION_libgles-omap3 = "5.01.00.01"
+PREFERRED_VERSION_omap3-sgx-modules = "5.01.00.01"
+
+MACHINE_EXTRA_INSTALL = "\
+        libgles-omap3 \
+        libgles-omap3-rawdemos \
+        "
+
+MACHINE_EXTRA_INSTALL_SDK = "\
+        libgles-omap3-dev \
+        "
+
+ADB_PRODUCTID = "0xD002"
+
+DEFAULTTUNE = "armv7ahf-neon"
diff --git a/conf/distro/include/emulator.conf b/conf/distro/include/emulator.conf
index dfbda91..dee1df3 100644
--- a/conf/distro/include/emulator.conf
+++ b/conf/distro/include/emulator.conf
@@ -1,12 +1,38 @@
+#############################################################################
+##
+## 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_CLASSES += "image-hdd"
 IMAGE_ROOTFS_ALIGNMENT = "1048576"
 ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}.ext3"
 IMAGE_FSTYPES = "ext3"
 
+MACHINE_EXTRA_RRECOMMENDS += "\
+        kernel-module-snd-intel8x0 \
+        "
+
+kernel_autoload_snd-intel8x0 = "snd-intel8x0"
+
 MACHINE_EXTRA_INSTALL = "\
-        llvm3.2 \
         libegl-mesa \
-        libegl-gallium \
         libgles2-mesa \
         mount-vboxsf \
         "
diff --git a/conf/distro/include/imx53qsb.conf b/conf/distro/include/imx53qsb.conf
index 0d96d9a..d83f6b4 100644
--- a/conf/distro/include/imx53qsb.conf
+++ b/conf/distro/include/imx53qsb.conf
@@ -1,9 +1,29 @@
-IMAGE_FSTYPES = "tar.gz"
+#############################################################################
+##
+## 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$
+##
+#############################################################################
 
-PREFERRED_PROVIDER_virtual/libgl = "amd-gpu-x11-bin-mx51"
+IMAGE_FSTYPES = "tar.gz"
 
 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 cf99d11..b761ddd 100644
--- a/conf/distro/include/nitrogen6x.conf
+++ b/conf/distro/include/nitrogen6x.conf
@@ -1,3 +1,25 @@
+#############################################################################
+##
+## 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_CLASSES += "image_types_sdcard"
 IMAGE_FSTYPES = "tar.gz ext3 sdcard"
 
diff --git a/conf/distro/include/raspberrypi.conf b/conf/distro/include/raspberrypi.conf
index 8eada21..97513a8 100644
--- a/conf/distro/include/raspberrypi.conf
+++ b/conf/distro/include/raspberrypi.conf
@@ -1,12 +1,38 @@
+#############################################################################
+##
+## 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 rpi-sdimg"
 
-PREFERRED_PROVIDER_virtual/libgles1 = "vc-graphics"
-PREFERRED_PROVIDER_virtual/libgl = "vc-graphics"
+PREFERRED_PROVIDER_virtual/libgles1 = "userland"
 
 MACHINE_EXTRA_INSTALL = "\
-        vc-graphics \
+        userland \
         "
 
 MACHINE_EXTRA_INSTALL_SDK = " \
-        vc-graphics-dev \
+        userland-dev \
         "
+
+module_autoload_snd-bcm2835 = "snd-bcm2835"
+
+# additional memory for GPU
+GPU_MEM = "128"
diff --git a/conf/layer.conf b/conf/layer.conf
index 9e97746..9a74df6 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -1,3 +1,25 @@
+#############################################################################
+##
+## 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$
+##
+#############################################################################
+
 # We have a conf and classes directory, append to BBPATH
 BBPATH .= ":${LAYERDIR}"
 
diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index 00c9a07..a9e1b34 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -1,3 +1,25 @@
+#############################################################################
+##
+## 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$
+##
+#############################################################################
+
 #
 # This file is your local configuration file and is where all local user settings
 # are placed. The comments in this file give some guide to the options a new user
@@ -253,7 +275,7 @@ CONF_VERSION = "1"
 
 INHERIT += "rm_work"
 
-BBMASK = "meta-ti/recipes-misc"
+BBMASK = "meta-ti/recipes-misc|meta-raspberrypi/recipes-graphics/mesa/mesa_9.2.2.bbappend"
 ACCEPT_FSL_EULA = "1"
 LICENSE_FLAGS_WHITELIST = "commercial"
 
diff --git a/conf/machine/emulator.conf b/conf/machine/emulator.conf
index e118a44..14cce96 100644
--- a/conf/machine/emulator.conf
+++ b/conf/machine/emulator.conf
@@ -1,3 +1,25 @@
+#############################################################################
+##
+## 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$
+##
+#############################################################################
+
 #@TYPE: Machine
 #@NAME: virtual box emulator
 #@DESCRIPTION: Machine configuration for running a common x86
@@ -7,7 +29,6 @@ PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa"
 PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
-PREFERRED_VERSION_linux-yocto ?= "3.8%"
 
 require conf/machine/include/tune-i586.inc