diff options
| author |   Graeme Gregory <dp@xora.org.uk> | 2009-07-10 21:45:15 +0100 |
|---|---|---|
| committer | Graeme Gregory <dp@xora.org.uk> | 2009-07-10 21:45:15 +0100 |
| commit | 8b0c5558ac548345d6ae363c4105488d5f1e4900 (patch) | |
| tree | c3150f54cd8e99cde963360e32ec3d14637ca501 /classes | |
| parent | 071dafded971a297dd50694595fa4455281ceb49 (diff) | |
| parent | 9756c8d5940e5f067c97dd37e2f30704eaa0927f (diff) | |
| download | openembedded-8b0c5558ac548345d6ae363c4105488d5f1e4900.tar.gz | |
Merge branch 'org.openembedded.dev' of git+ssh://git@git.openembedded.org/openembedded into org.openembedded.dev
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/base.bbclass | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index bc50c67d4b..7f2e81f139 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -1179,10 +1179,11 @@ def base_after_parse(d): override = bb.data.getVar('SRC_URI_OVERRIDES_PACKAGE_ARCH', d, 1) if override != '0': paths = [] - for p in [ "${PF}", "${P}", "${PN}", "files", "" ]: - path = bb.data.expand(os.path.join("${FILE_DIRNAME}", p, "${MACHINE}"), d) - if os.path.isdir(path): - paths.append(path) + for a in [ "${MACHINE}" ] + bb.data.getVar('MACHINE_FALLBACK', d).split(): + for p in [ "${PF}", "${P}", "${PN}", "files", "" ]: + path = bb.data.expand(os.path.join("${FILE_DIRNAME}", p, a), d) + if os.path.isdir(path): + paths.append(path) if len(paths) != 0: for s in srcuri.split(): if not s.startswith("file://"): |