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

1 files changed, 23 insertions, 1 deletions

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"