diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-02-04 13:20:28 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-02-07 09:06:37 +0000 |
commit | 984e90f4d71d866580131c4927b0a77baf1bb9bd (patch) | |
tree | adfe717341c87f2719990a962951492b65c03c1c /meta/classes/utils.bbclass | |
parent | ca7adf75295c2a6041b891bfa61e0b4bc2f7c860 (diff) | |
download | poky-984e90f4d71d866580131c4927b0a77baf1bb9bd.tar.gz |
meta/classes: Update classes to use new fetcher API
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/utils.bbclass')
-rw-r--r-- | meta/classes/utils.bbclass | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/meta/classes/utils.bbclass b/meta/classes/utils.bbclass index 4d4b9953e2..455b49d54a 100644 --- a/meta/classes/utils.bbclass +++ b/meta/classes/utils.bbclass | |||
@@ -51,11 +51,12 @@ def machine_paths(d): | |||
51 | def is_machine_specific(d): | 51 | def is_machine_specific(d): |
52 | """Determine whether the current recipe is machine specific""" | 52 | """Determine whether the current recipe is machine specific""" |
53 | machinepaths = set(machine_paths(d)) | 53 | machinepaths = set(machine_paths(d)) |
54 | urldatadict = bb.fetch.init(d.getVar("SRC_URI", True).split(), d, True) | 54 | srcuri = d.getVar("SRC_URI", True).split() |
55 | for urldata in (urldata for urldata in urldatadict.itervalues() | 55 | for url in srcuri: |
56 | if urldata.type == "file"): | 56 | fetcher = bb.fetch2.Fetch([srcuri], d) |
57 | if any(urldata.localpath.startswith(mp + "/") for mp in machinepaths): | 57 | if url.startswith("file://"): |
58 | return True | 58 | if any(fetcher.localpath(url).startswith(mp + "/") for mp in machinepaths): |
59 | return True | ||
59 | 60 | ||
60 | def oe_popen_env(d): | 61 | def oe_popen_env(d): |
61 | env = d.getVar("__oe_popen_env", False) | 62 | env = d.getVar("__oe_popen_env", False) |