Merge branch 'stable' into releaseQtEE_v3.0.0

* stable: (25 commits)
  blacklist evbug kernel module
  ca-certificates: enable c_rehash in update-ca-certificates
  openssl: make sure c_rehash is included in the image
  emulator: include mesa back to the image
  mesa: include gles development files in sdk
  sabre: updated kernel arguments
  imx6: kernel update for nitrogen6x
  mesa: remove from emulator image
  Include support for Freescale SABRE SD (iMX6Q)
  sabresd: add function fs support to sabresd kernel
  gstreamer: include icydemuxer needed for internet radios
  libsdl: disable dependency to libglu
  linux-yocto: upstream version has changed
  wpa-supplicant: upstream version has changed
  gpu-viv-bin-mx6q: upstream version has changed
  busybox: upstream version has changed
  nitrogen6x: use preferred version for kernel
  libgles: inhibit QA error for files already being stripped
  Update used branch to daisy
  Move to version 1.6
  ...

Change-Id: Ie81ed17be1096dbb37b1e5f023aa4eba846ca0fe

1 files changed, 10 insertions, 2 deletions

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
 }