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, 2 insertions, 0 deletions

diff --git a/meta-toradex-extras/recipes/linux/linux-toradex-fsl_git.bbappend b/meta-toradex-extras/recipes/linux/linux-toradex-fsl_git.bbappend
index 1e2b5f3..3f07de3 100644
--- a/meta-toradex-extras/recipes/linux/linux-toradex-fsl_git.bbappend
+++ b/meta-toradex-extras/recipes/linux/linux-toradex-fsl_git.bbappend
@@ -32,6 +32,7 @@ RDEPENDS_kernel-base = ""
 config_script () {
     # FunctionFS for adb
     echo "CONFIG_USB_FUNCTIONFS=m"  >> ${S}/.config
+    echo "CONFIG_USB_ACM=m"         >> ${S}/.config
 }
 
 B = "${S}"
diff --git a/meta-toradex-extras/recipes/linux/linux-toradex-vf_4.%.bbappend b/meta-toradex-extras/recipes/linux/linux-toradex-vf_4.%.bbappend
index 76bf87d..fd9ad55 100644
--- a/meta-toradex-extras/recipes/linux/linux-toradex-vf_4.%.bbappend
+++ b/meta-toradex-extras/recipes/linux/linux-toradex-vf_4.%.bbappend
@@ -29,5 +29,6 @@ SRC_URI += " \
 do_configure_prepend () {
     # FunctionFS for adb
     echo "CONFIG_USB_FUNCTIONFS=m"  >> ${WORKDIR}/defconfig
+    echo "CONFIG_USB_ACM=m"         >> ${WORKDIR}/defconfig
     echo "TOUCHSCREEN_FUSION_F0710A=y" >> ${WORKDIR}/defconfig
 }