From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Fri, 27 May 2011 14:13:54 +0000 (+0100)
Subject: bitbake/cooker.py: Ensure BBFILES is processed in order
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c12dd868368bdc3a4f800e075a30c67edca28d47;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

bitbake/cooker.py: Ensure BBFILES is processed in order

The files found by collect_bbfiles should be processed in order but due
to being processed using python's set(), the order was not being preserved.

Use a list instead as whilst the code is slightly more ugly, order
is preserved.

Addresses [YOCTO #1100]

Acked-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py
index 415e1f3011a..43b36adcdeb 100644
--- a/lib/bb/cooker.py
+++ b/lib/bb/cooker.py
@@ -944,16 +944,21 @@ class BBCooker:
             collectlog.error("no recipe files to build, check your BBPATH and BBFILES?")
             bb.event.fire(CookerExit(), self.configuration.event_data)
 
-        newfiles = set()
+        # Can't use set here as order is important
+        newfiles = []
         for f in files:
             if os.path.isdir(f):
                 dirfiles = self.find_bbfiles(f)
-                newfiles.update(dirfiles)
+                for g in dirfiles:
+                    if g not in newfiles:
+                        newfiles.append(g)
             else:
                 globbed = glob.glob(f)
                 if not globbed and os.path.exists(f):
                     globbed = [f]
-                newfiles.update(globbed)
+                for g in globbed:
+                    if g not in newfiles:
+                        newfiles.append(g)
 
         bbmask = bb.data.getVar('BBMASK', self.configuration.data, 1)