1 files changed, 25 insertions, 15 deletions

diff --git a/classes/sdk-sources.bbclass b/classes/sdk-sources.bbclass
index 5f75357..b12f371 100644
--- a/classes/sdk-sources.bbclass
+++ b/classes/sdk-sources.bbclass
@@ -1,23 +1,31 @@
-##############################################################################
+############################################################################
 ##
 ## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
+## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
 ##
-## $QT_BEGIN_LICENSE:COMM$
-##
+## $QT_BEGIN_LICENSE:GPL$
 ## 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.
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
 ##
 ## $QT_END_LICENSE$
 ##
-##############################################################################
+############################################################################
 
 python do_fetch () {
     src_uri = (d.getVar('SRC_URI', True) or "").split()
@@ -44,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
@@ -56,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):