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, 10 insertions, 7 deletions

diff --git a/scripts/configure-qtcreator.sh b/scripts/configure-qtcreator.sh
index 4ffe64f..7661297 100755
--- a/scripts/configure-qtcreator.sh
+++ b/scripts/configure-qtcreator.sh
@@ -29,7 +29,7 @@ ABI="arm-linux-generic-elf-32bit"
 
 printUsage ()
 {
-    echo "Usage: $0 <toolchain-environment-setup-file> [--remove]"
+    echo "Usage: $0 <toolchain-environment-setup-file> [--remove] [--sdktool <path>]"
 }
 
 while test -n "$1"; do
@@ -37,17 +37,19 @@ while test -n "$1"; do
     "--help" | "-h")
       printUsage
       exit 0
-      shift
       ;;
     "--remove")
       REMOVEONLY=1
+      ;;
+    "--sdktool")
       shift
+      SDKTOOL=$1
       ;;
     *)
       CONFIG=$1
-      shift
       ;;
   esac
+  shift
 done
 
 if [ ! -f "$CONFIG" ]; then
@@ -65,12 +67,13 @@ fi
 
 source $CONFIG
 
-if [ ! -d "${OECORE_NATIVE_SYSROOT}/mkspecs/${MKSPEC}" ]; then
-    echo Error: $CONFIG is invalid.
+MKSPECPATH=$(find ${OECORE_TARGET_SYSROOT} -name $(basename ${MKSPEC}))
+if [ ! -d "${MKSPECPATH}" ]; then
+    echo "Error: could not find mkspec ${MKSPEC} from the toolchain"
     exit 1
 fi
 
-MACHINE=$(grep '^MACHINE' ${OECORE_NATIVE_SYSROOT}/mkspecs/qdevice.pri | cut -d'=' -f2 | tr -d ' ')
+MACHINE=$(grep '^MACHINE' ${MKSPECPATH}/../../qdevice.pri | cut -d'=' -f2 | tr -d ' ')
 
 RELEASE=$(qmake -query QT_VERSION)
 
diff --git a/scripts/manifest_qt5.xml b/scripts/manifest_qt5.xml
index 1a50a10..69eb254 100644
--- a/scripts/manifest_qt5.xml
+++ b/scripts/manifest_qt5.xml
@@ -7,7 +7,7 @@
 
   <project name="meta-qt5"
            remote="playground"
-           revision="5.5"
+           revision="5.5-next"
            path="sources/meta-qt5"/>
 
 </manifest>