diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-06-22 16:10:16 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-06-28 13:45:55 +0100 |
| commit | e623d3015bbdeb2b42b9763937be899a1fa9c0ca (patch) | |
| tree | daad2115efe99a2b20caa97961bd4df11db34e1a /meta/classes/base.bbclass | |
| parent | 4ac0b49b65106c2214ae80517fe9f66630d4540c (diff) | |
| download | openembedded-core-e623d3015bbdeb2b42b9763937be899a1fa9c0ca.tar.gz openembedded-core-e623d3015bbdeb2b42b9763937be899a1fa9c0ca.tar.bz2 openembedded-core-e623d3015bbdeb2b42b9763937be899a1fa9c0ca.zip | |
classes/conf: Drop MULTIMACH_ARCH variable, it adds unused complexity and serves no useful purpose
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/base.bbclass')
| -rw-r--r-- | meta/classes/base.bbclass | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index f390f0804f..0bea639a95 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -362,11 +362,8 @@ python () { if local.startswith(mp): #bb.note("overriding PACKAGE_ARCH from %s to %s" % (pkg_arch, mach_arch)) bb.data.setVar('PACKAGE_ARCH', "${MACHINE_ARCH}", d) - bb.data.setVar('MULTIMACH_ARCH', mach_arch, d) return - multiarch = pkg_arch - packages = bb.data.getVar('PACKAGES', d, 1).split() for pkg in packages: pkgarch = bb.data.getVar("PACKAGE_ARCH_%s" % pkg, d, 1) @@ -375,10 +372,7 @@ python () { # if multiple differences are present? # Look through PACKAGE_ARCHS for the priority order? if pkgarch and pkgarch == mach_arch: - multiarch = mach_arch - break - - bb.data.setVar('MULTIMACH_ARCH', multiarch, d) + bb.fatal("Recipe %s is marked as only being architecture specific but seems to have machine specific packages?" % d.getVar("PN", True)) } def check_gcc3(data): |