diff options
| author |   Richard Purdie <rpurdie@rpsys.net> | 2007-08-12 11:50:11 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@rpsys.net> | 2007-08-12 11:50:11 +0000 |
| commit | 1b4c9f6fa0d9a1dfac45d47a54f8490eecee2612 (patch) | |
| tree | 399b392ce2ad3732ea4f79f4e3eefb7a577753fb /classes | |
| parent | 5911c511647dfab0eec6e5c31b9176b82909fb1a (diff) | |
| download | openembedded-1b4c9f6fa0d9a1dfac45d47a54f8490eecee2612.tar.gz | |
base.bbclass: Optimise the SRC_URI_OVERRIDES_PACKAGE_ARCH code so localpath is only called if its possible there are machine override matches. Also document some code hiding bugs for post 1.8.8 removal
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/base.bbclass | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index 0be217fce4..5c4ac1d827 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -586,6 +586,8 @@ python base_do_unpack() { except bb.MalformedUrl, e: raise FuncFailed('Unable to generate local path for malformed uri: %s' % e) # dont need any parameters for extraction, strip them off + # RP: Insane. localpath shouldn't have parameters + # RP: Scehdule for removal with bitbake 1.8.8 local = re.sub(';.*$', '', local) local = os.path.realpath(local) ret = oe_unpack_file(local, localdata, url) @@ -858,6 +860,12 @@ def base_after_parse(d): paths = [] for p in [ "${PF}", "${P}", "${PN}", "files", "" ]: paths.append(bb.data.expand(os.path.join("${FILE_DIRNAME}", p, "${MACHINE}"), d)) + path = bb.data.expand(os.path.join("${FILE_DIRNAME}", p, "${MACHINE}"), d) + if os.path.isdir(path): + paths.append(path) + if len(paths) == 0: + return + for s in bb.data.getVar('SRC_URI', d, 1).split(): if not s.startswith("file://"): continue |