From 8aee6b32a09dbbce304018f169eb6623182622c5 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 20 Nov 2006 09:16:34 +0000 Subject: classes: Standardise whitespace in anonymous python methods and factor out functions for more efficent use by bitbake (as also patched in OE) git-svn-id: https://svn.o-hand.com/repos/poky/trunk@875 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- meta/classes/multimachine.bbclass | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) (limited to 'meta/classes/multimachine.bbclass') diff --git a/meta/classes/multimachine.bbclass b/meta/classes/multimachine.bbclass index 4359d6c66..0bd6abe41 100644 --- a/meta/classes/multimachine.bbclass +++ b/meta/classes/multimachine.bbclass @@ -4,19 +4,24 @@ STAGING_KERNEL_DIR = "${STAGING_DIR}/${MULTIMACH_ARCH}-${TARGET_OS}/kernel" # Find any machine specific sub packages and if present, mark the # whole package as machine specific for multimachine purposes. -python __anonymous () { - packages = bb.data.getVar('PACKAGES', d, 1).split() - macharch = bb.data.getVar('MACHINE_ARCH', d, 1) - multiarch = bb.data.getVar('PACKAGE_ARCH', d, 1) - for pkg in packages: - pkgarch = bb.data.getVar("PACKAGE_ARCH_%s" % pkg, d, 1) +def multi_machine_after_parse(d): + import bb + packages = bb.data.getVar('PACKAGES', d, 1).split() + macharch = bb.data.getVar('MACHINE_ARCH', d, 1) + multiarch = bb.data.getVar('PACKAGE_ARCH', d, 1) + + for pkg in packages: + pkgarch = bb.data.getVar("PACKAGE_ARCH_%s" % pkg, d, 1) - # We could look for != PACKAGE_ARCH here but how to choose - # if multiple differences are present? - # Look through PACKAGE_ARCHS for the priority order? - if pkgarch and pkgarch == macharch: - multiarch = macharch + # We could look for != PACKAGE_ARCH here but how to choose + # if multiple differences are present? + # Look through PACKAGE_ARCHS for the priority order? + if pkgarch and pkgarch == macharch: + multiarch = macharch - bb.data.setVar('MULTIMACH_ARCH', multiarch, d) + bb.data.setVar('MULTIMACH_ARCH', multiarch, d) + +python __anonymous () { + multi_machine_after_parse(d) } -- cgit v1.2.3