summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2012-06-21 02:28:54 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-09 16:19:32 (GMT)
commit041a0e8dff1daf333613f3dd06a9bfc218213462 (patch)
tree6a1e6dc367009b7f90d5ff5114766ac657296bbf
parentc857fa97b417c26ef9625df453f98729ce217ecd (diff)
downloadpoky-041a0e8dff1daf333613f3dd06a9bfc218213462.tar.gz
bitbake: bitbake/cooker: Print which pkgs would be built in -g output
This is for giving the user a clear list to show which pkg would be built, we have the "bitbake -g", but it is not easy to read for people, it is for "dot". Improve the "bitbake -g" to also save a pn-buildlist: $ bitbake -g core-image-sato ... NOTE: PN build list saved to 'pn-buildlist' [snip] The contents of pn-buildlist: busybox shadow-native pth sysfsutils qemu-helper-native curl-native ncurses-native gdbm xserver-xorg linux-libc-headers [snip] [YOCTO #2404] (Bitbake rev: 18aff925aece774d0172894e25584353519ca03f) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xbitbake/bin/bitbake2
-rw-r--r--bitbake/lib/bb/cooker.py4
2 files changed, 5 insertions, 1 deletions
diff --git a/bitbake/bin/bitbake b/bitbake/bin/bitbake
index e55a538..1cee332 100755
--- a/bitbake/bin/bitbake
+++ b/bitbake/bin/bitbake
@@ -148,7 +148,7 @@ Default BBFILES are the .bb files in the current directory.""")
148 parser.add_option("-e", "--environment", help = "show the global or per-package environment (this is what used to be bbread)", 148 parser.add_option("-e", "--environment", help = "show the global or per-package environment (this is what used to be bbread)",
149 action = "store_true", dest = "show_environment", default = False) 149 action = "store_true", dest = "show_environment", default = False)
150 150
151 parser.add_option("-g", "--graphviz", help = "emit the dependency trees of the specified packages in the dot syntax", 151 parser.add_option("-g", "--graphviz", help = "emit the dependency trees of the specified packages in the dot syntax, and the pn-buildlist to show the build list",
152 action = "store_true", dest = "dot_graph", default = False) 152 action = "store_true", dest = "dot_graph", default = False)
153 153
154 parser.add_option("-I", "--ignore-deps", help = """Assume these dependencies don't exist and are already provided (equivalent to ASSUME_PROVIDED). Useful to make dependency graphs more appealing""", 154 parser.add_option("-I", "--ignore-deps", help = """Assume these dependencies don't exist and are already provided (equivalent to ASSUME_PROVIDED). Useful to make dependency graphs more appealing""",
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index 9b8d4b2..361bc88 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -534,11 +534,15 @@ class BBCooker:
534 534
535 # Prints a flattened form of package-depends below where subpackages of a package are merged into the main pn 535 # Prints a flattened form of package-depends below where subpackages of a package are merged into the main pn
536 depends_file = file('pn-depends.dot', 'w' ) 536 depends_file = file('pn-depends.dot', 'w' )
537 buildlist_file = file('pn-buildlist', 'w' )
537 print("digraph depends {", file=depends_file) 538 print("digraph depends {", file=depends_file)
538 for pn in depgraph["pn"]: 539 for pn in depgraph["pn"]:
539 fn = depgraph["pn"][pn]["filename"] 540 fn = depgraph["pn"][pn]["filename"]
540 version = depgraph["pn"][pn]["version"] 541 version = depgraph["pn"][pn]["version"]
541 print('"%s" [label="%s %s\\n%s"]' % (pn, pn, version, fn), file=depends_file) 542 print('"%s" [label="%s %s\\n%s"]' % (pn, pn, version, fn), file=depends_file)
543 print("%s" % pn, file=buildlist_file)
544 buildlist_file.close()
545 logger.info("PN build list saved to 'pn-buildlist'")
542 for pn in depgraph["depends"]: 546 for pn in depgraph["depends"]:
543 for depend in depgraph["depends"][pn]: 547 for depend in depgraph["depends"][pn]:
544 print('"%s" -> "%s"' % (pn, depend), file=depends_file) 548 print('"%s" -> "%s"' % (pn, depend), file=depends_file)