diff options
-rw-r--r-- | classes/sdk-sources.bbclass | 18 |
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 () { | |||
52 | } | 52 | } |
53 | 53 | ||
54 | python do_unpack () { | 54 | python do_unpack () { |
55 | sdk_uds = []; | ||
55 | src_uri = (d.getVar('SRC_URI', True) or "").split() | 56 | src_uri = (d.getVar('SRC_URI', True) or "").split() |
56 | if len(src_uri) == 0: | 57 | if len(src_uri) == 0: |
57 | return | 58 | return |
@@ -64,17 +65,18 @@ python do_unpack () { | |||
64 | for url in uris: | 65 | for url in uris: |
65 | ud = list(bb.fetch2.decodeurl(url)) | 66 | ud = list(bb.fetch2.decodeurl(url)) |
66 | if ("sdk-uri" in ud[5]): | 67 | if ("sdk-uri" in ud[5]): |
67 | unpack_local_uri(ud, d) | 68 | sdk_uds.append(ud) |
68 | src_uri.remove(url) | 69 | src_uri.remove(url) |
69 | 70 | ||
70 | if len(src_uri) == 0: | 71 | if len(src_uri) != 0: |
71 | return | 72 | try: |
73 | fetcher = bb.fetch2.Fetch(src_uri, d) | ||
74 | fetcher.unpack(rootdir) | ||
75 | except bb.fetch2.BBFetchException as e: | ||
76 | raise bb.build.FuncFailed(e) | ||
72 | 77 | ||
73 | try: | 78 | for ud in sdk_uds: |
74 | fetcher = bb.fetch2.Fetch(src_uri, d) | 79 | unpack_local_uri(ud, d) |
75 | fetcher.unpack(rootdir) | ||
76 | except bb.fetch2.BBFetchException as e: | ||
77 | raise bb.build.FuncFailed(e) | ||
78 | } | 80 | } |
79 | 81 | ||
80 | def unpack_local_uri(ud, d): | 82 | def unpack_local_uri(ud, d): |