Merge remote-tracking branch 'origin/dizzy' into dev

openssl/c_rehash patch updated to apply again.

* origin/dizzy:
  Fix c_rehash run during image creation
  Include CDC-ACM kernel module
  Use mirror from github to clone git-repo tool
  Add libevent to toolchain and image
  Use correct path for mkspecs
  qt5: remove separate designer packages
  qt5: use 5.5-next branch for meta-qt5
  qt5: patch qdevice.conf from correct location

Change-Id: I6998da6dc050c17aa1cbf20d50bcf0d14fc4ee8e

2 files changed, 3 insertions, 0 deletions

diff --git a/meta-fsl-extras/recipes/linux/linux-boundary_3.10.%.bbappend b/meta-fsl-extras/recipes/linux/linux-boundary_3.10.%.bbappend
index 1d7f942..c25739b 100644
--- a/meta-fsl-extras/recipes/linux/linux-boundary_3.10.%.bbappend
+++ b/meta-fsl-extras/recipes/linux/linux-boundary_3.10.%.bbappend
@@ -45,4 +45,6 @@ do_configure_prepend() {
     # enable uvcvideo module
     echo "CONFIG_MEDIA_USB_SUPPORT=y"       >> ${WORKDIR}/defconfig
     echo "CONFIG_USB_VIDEO_CLASS=m"         >> ${WORKDIR}/defconfig
+
+    echo "CONFIG_USB_ACM=m"                 >> ${WORKDIR}/defconfig
 }
diff --git a/meta-fsl-extras/recipes/linux/linux-imx_3.14.%.bbappend b/meta-fsl-extras/recipes/linux/linux-imx_3.14.%.bbappend
index e12bde0..602c3df 100644
--- a/meta-fsl-extras/recipes/linux/linux-imx_3.14.%.bbappend
+++ b/meta-fsl-extras/recipes/linux/linux-imx_3.14.%.bbappend
@@ -32,4 +32,5 @@ do_configure_prepend() {
     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
+    echo "CONFIG_USB_ACM=m"                 >> ${WORKDIR}/defconfig
 }