1 files changed, 17 insertions, 12 deletions

diff --git a/meta/classes/multimachine.bbclass b/meta/classes/multimachine.bbclass
index 4359d6c669..0bd6abe419 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)
 }