Skip to contentSkip to conversation

bitbake: cooker: sort file pn-buildlist

PATCH New Stefan Christ 1 participant 1 message Sep 8, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 bitbake: cooker: sort file pn-buildlist

The list of recipe names in the file pn-buildlist should be sorted/deterministic. This makes it easier to compare multiple files, e.g. with vimdiff.

---
 lib/bb/cooker.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
lib/bb/cooker.py +5 -4
index a0d7d59..b2fc1ed 100644
@@ -869,16 +869,17 @@ class BBCooker:
         depgraph = self.generateTaskDepTreeData(pkgs_to_build, task)
 
         # Prints a flattened form of package-depends below where subpackages of a package are merged into the main pn
+        with open('pn-buildlist', 'w') as buildlist_file:
+            for pn in sorted(depgraph["pn"]):  # be deterministic
+                buildlist_file.write(pn + "\n")
+        logger.info("PN build list saved to 'pn-buildlist'")
+
         depends_file = file('pn-depends.dot', 'w' )
-        buildlist_file = file('pn-buildlist', 'w' )
         print("digraph depends {", file=depends_file)
         for pn in depgraph["pn"]:
             fn = depgraph["pn"][pn]["filename"]
             version = depgraph["pn"][pn]["version"]
             print('"%s" [label="%s %s\\n%s"]' % (pn, pn, version, fn), file=depends_file)
-            print("%s" % pn, file=buildlist_file)
-        buildlist_file.close()
-        logger.info("PN build list saved to 'pn-buildlist'")
         for pn in depgraph["depends"]:
             for depend in depgraph["depends"][pn]:
                 print('"%s" -> "%s"' % (pn, depend), file=depends_file)
Signature · 1 line
1.9.1