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

* origin/fido:
  automotive: update src uris after repos were opened
  colibri-vf: change partition alignment to 1M
  Make ABI selection more robust in configure-qtcreator.sh

Conflicts:
	recipes-qt/automotive/neptune-ui_git.bb
	recipes-qt/automotive/qtapplicationmanager_git.bb
	recipes-qt/automotive/qtivi_git.bb

Change-Id: I86763619f24b40e9ac62a8c1ae84acf4ffeb4be7

6 files changed, 47 insertions, 5 deletions

diff --git a/classes/abi-arch.bbclass b/classes/abi-arch.bbclass
new file mode 100644
index 0000000..826fed4
--- /dev/null
+++ b/classes/abi-arch.bbclass
@@ -0,0 +1,41 @@
+##############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:COMM$
+##
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## $QT_END_LICENSE$
+##
+##############################################################################
+
+# map target architecture to abi architectures used by Qt Creator
+valid_archs = "arm x86 itanium mips ppc sh"
+
+def map_abi_arch(a, d):
+    import re
+
+    valid_archs = d.getVar('valid_archs', True).split()
+
+    if   re.match('i.86$', a):                  return 'x86'
+    elif re.match('x86.64$', a):                return 'x86'
+    elif re.match('armeb$', a):                 return 'arm'
+    elif re.match('aarch64', a):                return 'arm'
+    elif re.match('mips(el|64|64el)$', a):      return 'mips'
+    elif re.match('p(pc|owerpc)(|64)', a):      return 'ppc'
+    elif re.match('sh(3|4)$', a):               return 'sh'
+    elif a in valid_archs:                      return a
+    else:
+        bb.error("cannot map '%s' to a abi architecture" % a)
+
+ABI = "${@map_abi_arch(d.getVar('TARGET_ARCH', True), d)}"
diff --git a/classes/populate_b2qt_qt5_sdk.bbclass b/classes/populate_b2qt_qt5_sdk.bbclass
index d6b2b10..ae88685 100644
--- a/classes/populate_b2qt_qt5_sdk.bbclass
+++ b/classes/populate_b2qt_qt5_sdk.bbclass
@@ -19,7 +19,7 @@
 ##
 ##############################################################################
 
-inherit populate_b2qt_sdk populate_sdk_qt5_base
+inherit populate_b2qt_sdk populate_sdk_qt5_base abi-arch siteinfo
 
 SDK_MKSPEC_DIR = "${SDK_OUTPUT}${SDKTARGETSYSROOT}${libdir}/${QT_DIR_NAME}/mkspecs"
 SDK_MKSPEC = "devices/linux-oe-generic-g++"
@@ -65,7 +65,7 @@ create_qtcreator_configure_script () {
     # add qtcreator configuration script
     install -m 0755 ${B2QTBASE}/scripts/configure-qtcreator.sh ${SDK_OUTPUT}/${SDKPATH}
     sed -i -e '/^CONFIG=/c\CONFIG="${SDKPATH}/environment-setup-${REAL_MULTIMACH_TARGET_SYS}"' ${SDK_OUTPUT}/${SDKPATH}/configure-qtcreator.sh
-    sed -i -e '/^ABI=/c\ABI="${ARCH}-linux-generic-elf-${SITEINFO_BITS}bit"' ${SDK_OUTPUT}/${SDKPATH}/configure-qtcreator.sh
+    sed -i -e '/^ABI=/c\ABI="${ABI}-linux-generic-elf-${SITEINFO_BITS}bit"' ${SDK_OUTPUT}/${SDKPATH}/configure-qtcreator.sh
 }
 
 create_qtcreator_configure_script_mingw32 () {
diff --git a/conf/distro/include/colibri-vf.conf b/conf/distro/include/colibri-vf.conf
index 0d31f99..6512f2b 100644
--- a/conf/distro/include/colibri-vf.conf
+++ b/conf/distro/include/colibri-vf.conf
@@ -24,6 +24,7 @@ include conf/distro/include/toradex.inc
 DEPLOY_CONF_NAME = "Toradex Colibri VF"
 
 IMAGE_FSTYPES += "ext3 sdcard"
+IMAGE_ROOTFS_ALIGNMENT_colibri-vf = "1024"
 
 BOOTFS_CONTENT = "\
     u-boot-${MACHINE}.imx:u-boot.imx \
diff --git a/recipes-qt/automotive/neptune-ui_git.bb b/recipes-qt/automotive/neptune-ui_git.bb
index 702ca90..5f8d9cf 100644
--- a/recipes-qt/automotive/neptune-ui_git.bb
+++ b/recipes-qt/automotive/neptune-ui_git.bb
@@ -26,7 +26,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=bc0cb4bfd3f72b3fe47b2b2d0d89762c"
 inherit qt5-module sdk-sources systemd
 
 SRC_URI = " \
-    git://codereview.qt-project.org/qt-apps/neptune-ui;branch=${BRANCH};protocol=ssh;sdk-uri=5.7/Src/neptune-ui \
+    git://codereview.qt-project.org/qt-apps/neptune-ui;branch=${BRANCH};protocol=ssh \
     file://neptune.service \
     "
 
diff --git a/recipes-qt/automotive/qtapplicationmanager_git.bb b/recipes-qt/automotive/qtapplicationmanager_git.bb
index 240fedc..db16275 100644
--- a/recipes-qt/automotive/qtapplicationmanager_git.bb
+++ b/recipes-qt/automotive/qtapplicationmanager_git.bb
@@ -26,7 +26,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=317fda864ac33d41406ff3938c3e78d1"
 inherit qmake5 sdk-sources
 
 SRC_URI = " \
-    git://codereview.qt-project.org/qt/qtapplicationmanager;branch=${BRANCH};protocol=ssh;sdk-uri=5.7/Src/qtapplicationmanager \
+    git://codereview.qt-project.org/qt/qtapplicationmanager;branch=${BRANCH};protocol=ssh \
     "
 
 SRCREV = "97530155847257102fe0a159c681857fb9eb1194"
diff --git a/recipes-qt/automotive/qtivi_git.bb b/recipes-qt/automotive/qtivi_git.bb
index 9149c76..88990de 100644
--- a/recipes-qt/automotive/qtivi_git.bb
+++ b/recipes-qt/automotive/qtivi_git.bb
@@ -30,7 +30,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
 inherit qt5-module sdk-sources
 
 SRC_URI = " \
-    git://codereview.qt-project.org/qt/tqtc-qtivi;branch=${BRANCH};protocol=ssh;sdk-uri=5.7/Src/qtivi \
+    git://codereview.qt-project.org/qt/qtivi;branch=${BRANCH};protocol=ssh \
     "
 
 SRCREV = "b850b82e70e9585097ceb2812002bb4a7ddba06f"