From 0b207488de111a97eabcaeefa9a904431407ecff Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Fri, 10 Jul 2009 22:11:52 +0100
Subject: Revert "base.bbclass: add support for machine configuration fallback"

This reverts commit 6633c4c95a713bc365f5d87acc4a94621ed50034.
---
 classes/base.bbclass | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'classes')

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://"):
-- 
cgit 1.2.3-korg