From 1d2f3957b5c1e90b0e57ddb2488594e2db65e320 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 22 Jun 2011 16:10:16 +0100 Subject: classes/conf: Drop MULTIMACH_ARCH variable, it adds unused complexity and serves no useful purpose (From OE-Core rev: e623d3015bbdeb2b42b9763937be899a1fa9c0ca) Signed-off-by: Richard Purdie Signed-off-by: Richard Purdie --- meta/classes/base.bbclass | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'meta/classes/base.bbclass') 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): -- cgit v1.2.3-54-g00ecf