diff options
| author |   Graeme Gregory <dp@xora.org.uk> | 2009-07-10 22:11:52 +0100 |
|---|---|---|
| committer | Graeme Gregory <dp@xora.org.uk> | 2009-07-10 22:11:52 +0100 |
| commit | 0b207488de111a97eabcaeefa9a904431407ecff (patch) | |
| tree | add82cc7c27af1a2f85c457d0cca51dee89eb466 /classes | |
| parent | 8b0c5558ac548345d6ae363c4105488d5f1e4900 (diff) | |
| download | openembedded-0b207488de111a97eabcaeefa9a904431407ecff.tar.gz | |
Revert "base.bbclass: add support for machine configuration fallback"
This reverts commit 6633c4c95a713bc365f5d87acc4a94621ed50034.
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/base.bbclass | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index 7f2e81f139..bc50c67d4b 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -1179,11 +1179,10 @@ def base_after_parse(d): override = bb.data.getVar('SRC_URI_OVERRIDES_PACKAGE_ARCH', d, 1) if override != '0': paths = [] - 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) + 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) if len(paths) != 0: for s in srcuri.split(): if not s.startswith("file://"): |