15 files changed, 129 insertions, 23 deletions

diff --git a/b2qt-init-build-env b/b2qt-init-build-env
index 0ccd952..a367d31 100755
--- a/b2qt-init-build-env
+++ b/b2qt-init-build-env
@@ -48,6 +48,10 @@ while test -n "$1"; do
       shift
       DEVICE=$1
       ;;
+    "--repo-url")
+      shift
+      REPO_URL="--repo-url $1"
+      ;;
     *)
       if [ -n "$COMMAND" ]; then
         echo "Unknown argument: $1"
@@ -70,6 +74,10 @@ if [ -n "${REFERENCE}" ]; then
     REFERENCE="--reference $(readlink -f ${REFERENCE})"
 fi
 
+if [ -z "${REPO_URL}" ]; then
+    REPO_URL="--repo-url git://github.com/theqtcompany/git-repo"
+fi
+
 get_repo() {
   REPO="./repo"
   if [ -n "$(command -v repo)" ]; then
@@ -126,7 +134,7 @@ mirror() {
   mkdir -p .repo/manifests
   cp ${DIR}/scripts/manifest.xml .repo/manifests/
   MANIFEST="manifest.xml"
-  ${REPO} init -u ${PWD}/.repo/repo -b default -m ${MANIFEST} -g all --mirror
+  ${REPO} init ${REPO_URL} -u ${PWD}/.repo/repo -b default -m ${MANIFEST} -g all --mirror
   ${REPO} sync
 }
 
@@ -146,7 +154,7 @@ init() {
   else
     MANIFEST="manifest.xml"
   fi
-  ${REPO} init -u ${PWD}/.repo/repo -b default -m ${MANIFEST} -g "${PROJECT_GROUPS}" ${REFERENCE}
+  ${REPO} init ${REPO_URL} -u ${PWD}/.repo/repo -b default -m ${MANIFEST} -g "${PROJECT_GROUPS}" ${REFERENCE}
   ${REPO} sync
 
   if [ ! -e "sources/meta-b2qt" ]; then
diff --git a/meta-architech-extras/recipes/linux/linux-imx_3.0.35.bb b/meta-architech-extras/recipes/linux/linux-imx_3.0.35.bb
index 4fbd2b3..8a2fd54 100644
--- a/meta-architech-extras/recipes/linux/linux-imx_3.0.35.bb
+++ b/meta-architech-extras/recipes/linux/linux-imx_3.0.35.bb
@@ -32,6 +32,7 @@ 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
 }
 
 # bbappend in meta-tibidabo still tries to use PRINC, set to -1 to prevent errors
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
 }
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
 }
diff --git a/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb b/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb
index 98ff5cc..45d3148 100644
--- a/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb
+++ b/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb
@@ -65,4 +65,5 @@ create_sdk_files_append () {
     echo 'TargetSpec = devices/linux-oe-generic-g++' >> $qtconf
 }
 
-SDK_POST_INSTALL_COMMAND += "$SUDO_EXEC sed -i -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:g" $native_sysroot/mkspecs/qdevice.pri ;"
+SDK_POST_INSTALL_COMMAND += "$SUDO_EXEC sed -i -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:g" \
+    $target_sdk_dir/sysroots/@REAL_MULTIMACH_TARGET_SYS@/usr/lib/${QT_DIR_NAME}/mkspecs/qdevice.pri ;"
diff --git a/recipes-qt/qt5-addons/qtcharts_2.0.bb b/recipes-qt/qt5-addons/qtcharts_2.0.bb
index 216268a..c4d88f4 100644
--- a/recipes-qt/qt5-addons/qtcharts_2.0.bb
+++ b/recipes-qt/qt5-addons/qtcharts_2.0.bb
@@ -37,12 +37,3 @@ BRANCH = "master"
 S = "${WORKDIR}/git"
 
 DEPENDS = "qtbase qtdeclarative qtmultimedia"
-
-PACKAGES =+ "${PN}-designer"
-DEBIAN_NOAUTONAME_${PN}-designer = "1"
-
-FILES_${PN}-designer = " \
-    ${OE_QMAKE_PATH_QML}/QtCharts/designer \
-    "
-
-RRECOMMENDS_${PN}-dev += "${PN}-designer"
diff --git a/recipes-qt/qt5-addons/qtdatavisualization_1.2.bb b/recipes-qt/qt5-addons/qtdatavisualization_1.2.bb
index 1a06675..11c4279 100644
--- a/recipes-qt/qt5-addons/qtdatavisualization_1.2.bb
+++ b/recipes-qt/qt5-addons/qtdatavisualization_1.2.bb
@@ -37,7 +37,3 @@ BRANCH = "master"
 S = "${WORKDIR}/git"
 
 DEPENDS += "qtbase qtdeclarative qtmultimedia"
-
-FILES_${PN}-qmlplugins += " \
-    ${OE_QMAKE_PATH_QML}/QtDataVisualization/designer/* \
-    "
diff --git a/recipes/openssl/openssl/0001-Support-SYSROOT-in-c_rehash.patch b/recipes/openssl/openssl/0001-Support-SYSROOT-in-c_rehash.patch
new file mode 100644
index 0000000..9aa9648
--- /dev/null
+++ b/recipes/openssl/openssl/0001-Support-SYSROOT-in-c_rehash.patch
@@ -0,0 +1,96 @@
+From 9cf8fa1c4dae07a6aff194a3632bc499a813d3f8 Mon Sep 17 00:00:00 2001
+From: Samuli Piippo <samuli.piippo@theqtcompany.com>
+Date: Wed, 9 Sep 2015 13:37:28 +0300
+Subject: [PATCH] Support SYSROOT in c_rehash
+
+update-ca-certificates is ran during image creation, which in turn runs
+c_rehash. Since the symlinks in /etc/ssl/certs/ are pointing to absolute
+location, c_rehash does not find the actual files. Add support for SYSROOT
+environment variable and use it to locate the actual files during image
+creation.
+
+Upstream-status: Pending
+---
+ tools/c_rehash.in | 30 +++++++++++++++++-------------
+ 1 file changed, 17 insertions(+), 13 deletions(-)
+
+diff --git a/tools/c_rehash.in b/tools/c_rehash.in
+index 92cb503..f3d2703 100644
+--- a/tools/c_rehash.in
++++ b/tools/c_rehash.in
+@@ -7,6 +7,7 @@ my $dir;
+ my $prefix;
+ 
+ my $openssl = $ENV{OPENSSL} || "openssl";
++my $sysroot = $ENV{SYSROOT} || "";
+ my $pwd;
+ my $verbose = 0;
+ my $symlink_exists=eval {symlink("",""); 1};
+@@ -101,16 +102,17 @@ sub hash_dir {
+                }
+        }
+        FILE: foreach $fname (grep {/\.(pem)|(crt)|(cer)|(crl)$/} @flist) {
++               $fullname = $sysroot . readlink($fname);
+                # Check to see if certificates and/or CRLs present.
+-               my ($cert, $crl) = check_file($fname);
++               my ($cert, $crl) = check_file($fullname);
+                if(!$cert && !$crl) {
+                        print STDERR "WARNING: $fname does not contain a certificate or CRL: skipping\n";
+                        next;
+                }
+-               link_hash_cert($fname) if($cert);
+-               link_hash_cert_old($fname) if($cert);
+-               link_hash_crl($fname) if($crl);
+-               link_hash_crl_old($fname) if($crl);
++               link_hash_cert($fname, $fullname) if($cert);
++               link_hash_cert_old($fname, $fullname) if($cert);
++               link_hash_crl($fname, $fullname) if($crl);
++               link_hash_crl_old($fname, $fullname) if($crl);
+        }
+ }
+ 
+@@ -143,9 +145,10 @@ sub check_file {
+ 
+ sub link_hash_cert {
+                my $fname = $_[0];
+-               my $x509hash = $_[1] || '-subject_hash';
+-               $fname =~ s/'/'\\''/g;
+-               my ($hash, $fprint) = `"$openssl" x509 $x509hash -fingerprint -noout -in "$fname"`;
++               my $fullname = $_[1];
++               my $x509hash = $_[2] || '-subject_hash';
++               $fullname =~ s/'/'\\''/g;
++               my ($hash, $fprint) = `"$openssl" x509 $x509hash -fingerprint -noout -in "$fullname"`;
+                chomp $hash;
+                chomp $fprint;
+                $fprint =~ s/^.*=//;
+@@ -176,11 +179,11 @@ sub link_hash_cert {
+ }
+ 
+ sub link_hash_cert_old {
+-               link_hash_cert($_[0], '-subject_hash_old');
++               link_hash_cert($_[0], $_[1], '-subject_hash_old');
+ }
+ 
+ sub link_hash_crl_old {
+-               link_hash_crl($_[0], '-hash_old');
++               link_hash_crl($_[0], $_[1], '-hash_old');
+ }
+ 
+ 
+@@ -188,9 +191,10 @@ sub link_hash_crl_old {
+ 
+ sub link_hash_crl {
+                my $fname = $_[0];
+-               my $crlhash = $_[1] || "-hash";
+-               $fname =~ s/'/'\\''/g;
+-               my ($hash, $fprint) = `"$openssl" crl $crlhash -fingerprint -noout -in '$fname'`;
++               my $fullname = $_[1];
++               my $crlhash = $_[2] || "-hash";
++               $fullname =~ s/'/'\\''/g;
++               my ($hash, $fprint) = `"$openssl" crl $crlhash -fingerprint -noout -in '$fullname'`;
+                chomp $hash;
+                chomp $fprint;
+                $fprint =~ s/^.*=//;
+-- 
+1.9.1
+
diff --git a/recipes/openssl/openssl_1.%.bbappend b/recipes/openssl/openssl_1.%.bbappend
index 461cb45..ce68b59 100644
--- a/recipes/openssl/openssl_1.%.bbappend
+++ b/recipes/openssl/openssl_1.%.bbappend
@@ -20,6 +20,9 @@
 ##
 #############################################################################
 
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+SRC_URI += "file://0001-Support-SYSROOT-in-c_rehash.patch"
+
 PACKAGECONFIG += "perl"
 
 do_install_append () {
diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb
index 34a53c9..82e801b 100644
--- a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb
+++ b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb
@@ -59,6 +59,7 @@ RDEPENDS_${PN} = "\
         tzdata-asia \
         tzdata-europe \
         atk \
+        libevent \
         ${@base_contains("DISTRO_FEATURES", "wayland", "wayland weston weston-examples", "", d)} \
         ${MACHINE_EXTRA_INSTALL} \
         "
diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb
index f567f4e..b31ea3f 100644
--- a/recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb
+++ b/recipes/packagegroup/packagegroup-b2qt-embedded-toolchain-target.bb
@@ -49,6 +49,7 @@ RDEPENDS_${PN} += "\
     libmysqlclient-dev \
     libpq-dev \
     atk-dev \
+    libevent-dev \
     ${@base_contains("DISTRO_FEATURES", "wayland", "libwayland-egl-mx6-dev libxkbcommon-dev libgbm-dev libdrm-dev", "", d)} \
     ${@base_contains("DISTRO_FEATURES", "bluetooth", "bluez4-dev", "", d)} \
     ${MACHINE_EXTRA_INSTALL_SDK} \
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>