[oe] [PATCH] amend.bbclass: don't parse same amend.inc if FILESPATH references it multiple times

Denys Dmytriyenko denis at denix.org
Fri Jun 4 20:13:31 UTC 2010


Signed-off-by: Denys Dmytriyenko <denis at denix.org>
---
 classes/amend.bbclass |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/classes/amend.bbclass b/classes/amend.bbclass
index cddd28c..fb67b4e 100644
--- a/classes/amend.bbclass
+++ b/classes/amend.bbclass
@@ -21,7 +21,13 @@ python () {
     depends = d.getVar("__depends", 0) or []
     d.setVar("__depends", depends + [(file, 0) for file in amendfiles if not os.path.exists(file)])
 
+    # Make sure we don't parse the same amend.inc file more than once, if
+    # there are duplicates in FILESPATH
+    seen = set()
+
     for file in amendfiles:
         if os.path.exists(file):
-            bb.parse.handle(file, d, 1)
+            if file not in seen:
+                bb.parse.handle(file, d, 1)
+                seen.add(file)
 }
-- 
1.6.3.3





More information about the Openembedded-devel mailing list