From: Chris Larson <chris_larson@mentor.com>
Date: Mon, 24 May 2010 03:15:01 +0000 (-0700)
Subject: amend.bbclass: load *all* available amend.inc files in FILESPATH, not the first
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9e028bae96b39f7e3a800572e2fa4ad1b4ce006f;p=openembedded.git

amend.bbclass: load *all* available amend.inc files in FILESPATH, not the first

While this deviates from ordinary BBPATH/FILESPATH behavior by bitbake and
OpenEmbedded, amend.inc is a special case.  It's highly unintuitive for
someone to create, say, files/busybox/amend.inc relative to TOPDIR, with
${TOPDIR}/files in FILESPATHBASE, and suddenly things break, because that
amend.inc overrides one in an overlay.

Signed-off-by: Chris Larson <chris_larson@mentor.com>
---

diff --git a/classes/amend.bbclass b/classes/amend.bbclass
index bcb93d4e75..cddd28caea 100644
--- a/classes/amend.bbclass
+++ b/classes/amend.bbclass
@@ -21,9 +21,7 @@ python () {
     depends = d.getVar("__depends", 0) or []
     d.setVar("__depends", depends + [(file, 0) for file in amendfiles if not os.path.exists(file)])
 
-    existing = (file for file in amendfiles if os.path.exists(file))
-    try:
-        bb.parse.handle(existing.next(), d, 1)
-    except StopIteration:
-        pass
+    for file in amendfiles:
+        if os.path.exists(file):
+            bb.parse.handle(file, d, 1)
 }