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

* origin/jethro: (26 commits)
  Fix colibri- vf & imx7 partitions
  Add u-boot script for iMX7
  Fix colibri-vf and imx6 build
  Fix colibri-vf build
  Add support for Toradex Colibri-iMX7
  Updated Boundary devices kernel version to 3.14.52
  Updated neptune-ui, qtivi, and appman sha
  Update GammaRay and enable workaround for Boot2Qt compatibility
  Added QMLLive to automotive images
  Update gammaray version to fc0b87dcff40276bc1e4ad6c86674363ca576617 --> 2.5
  Change git fetch protocol from ssh to http for automotive packages
  Change b2qt-addons fetch protocol from git to http
  b2qt-ota: update repository URL
  b2qt-demos: update qtwebbrowser url
  systemd: handle bind mounts set from initramfs
  Enable QT_QPA_EGLFS_FORCEVSYNC=1 on nitrogen6x device.
  Colibri fails to build after this change, so we revert it.
  Update Qt submodule revisions
  Updated Boundary devices kernel version to 3.14.52
  Update meta-mingw version
  ...

Change-Id: I951db6a4f523eb9a6ad72dc3013702a5ef44d56c

1 files changed, 10 insertions, 8 deletions

diff --git a/classes/sdk-sources.bbclass b/classes/sdk-sources.bbclass
index 435bb1a..b12f371 100644
--- a/classes/sdk-sources.bbclass
+++ b/classes/sdk-sources.bbclass
@@ -52,6 +52,7 @@ python do_fetch () {
 }
 
 python do_unpack () {
+    sdk_uds = [];
     src_uri = (d.getVar('SRC_URI', True) or "").split()
     if len(src_uri) == 0:
         return
@@ -64,17 +65,18 @@ python do_unpack () {
         for url in uris:
             ud = list(bb.fetch2.decodeurl(url))
             if ("sdk-uri" in ud[5]):
-                unpack_local_uri(ud, d)
+                sdk_uds.append(ud)
                 src_uri.remove(url)
 
-    if len(src_uri) == 0:
-        return
+    if len(src_uri) != 0:
+        try:
+            fetcher = bb.fetch2.Fetch(src_uri, d)
+            fetcher.unpack(rootdir)
+        except bb.fetch2.BBFetchException as e:
+            raise bb.build.FuncFailed(e)
 
-    try:
-        fetcher = bb.fetch2.Fetch(src_uri, d)
-        fetcher.unpack(rootdir)
-    except bb.fetch2.BBFetchException as e:
-        raise bb.build.FuncFailed(e)
+    for ud in sdk_uds:
+        unpack_local_uri(ud, d)
 }
 
 def unpack_local_uri(ud, d):