summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert P. J. Day <rpjday@crashcourse.ca>2014-07-22 17:54:42 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-23 10:02:13 +0100
commit653b557770ed313f2a8279bc508640c285b6b3bc (patch)
tree19cfb448c5ecd2fa7498aecf7baa0a31656a3af9
parent8b7116d25ed6255a03895d835e5a0560858ab496 (diff)
downloadpoky-653b557770ed313f2a8279bc508640c285b6b3bc.tar.gz
bitbake: "per-package" should say "per-recipe"
(Bitbake rev: 1cd369883469747a8158826bb8d67dcca2a8577f) Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xbitbake/bin/bitbake2
-rw-r--r--bitbake/doc/bitbake-user-manual/bitbake-user-manual-intro.xml2
-rw-r--r--bitbake/doc/bitbake.12
-rw-r--r--bitbake/lib/bb/cooker.py2
4 files changed, 4 insertions, 4 deletions
diff --git a/bitbake/bin/bitbake b/bitbake/bin/bitbake
index e31a636024..39aa3ec383 100755
--- a/bitbake/bin/bitbake
+++ b/bitbake/bin/bitbake
@@ -148,7 +148,7 @@ class BitBakeConfigParameters(cookerdata.ConfigParameters):
148 parser.add_option("-s", "--show-versions", help = "Show current and preferred versions of all recipes.", 148 parser.add_option("-s", "--show-versions", help = "Show current and preferred versions of all recipes.",
149 action = "store_true", dest = "show_versions", default = False) 149 action = "store_true", dest = "show_versions", default = False)
150 150
151 parser.add_option("-e", "--environment", help = "Show the global or per-package environment complete with information about where variables were set/changed.", 151 parser.add_option("-e", "--environment", help = "Show the global or per-recipe environment complete with information about where variables were set/changed.",
152 action = "store_true", dest = "show_environment", default = False) 152 action = "store_true", dest = "show_environment", default = False)
153 153
154 parser.add_option("-g", "--graphviz", help = "Save dependency tree information for the specified targets in the dot syntax.", 154 parser.add_option("-g", "--graphviz", help = "Save dependency tree information for the specified targets in the dot syntax.",
diff --git a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-intro.xml b/bitbake/doc/bitbake-user-manual/bitbake-user-manual-intro.xml
index e68686cfb7..7e6131357a 100644
--- a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-intro.xml
+++ b/bitbake/doc/bitbake-user-manual/bitbake-user-manual-intro.xml
@@ -517,7 +517,7 @@
517 the dumped signature with the cached one. 517 the dumped signature with the cached one.
518 -p, --parse-only Quit after parsing the BB recipes. 518 -p, --parse-only Quit after parsing the BB recipes.
519 -s, --show-versions Show current and preferred versions of all recipes. 519 -s, --show-versions Show current and preferred versions of all recipes.
520 -e, --environment Show the global or per-package environment complete 520 -e, --environment Show the global or per-recipe environment complete
521 with information about where variables were 521 with information about where variables were
522 set/changed. 522 set/changed.
523 -g, --graphviz Save dependency tree information for the specified 523 -g, --graphviz Save dependency tree information for the specified
diff --git a/bitbake/doc/bitbake.1 b/bitbake/doc/bitbake.1
index 15a7f205aa..a6c8d97276 100644
--- a/bitbake/doc/bitbake.1
+++ b/bitbake/doc/bitbake.1
@@ -89,7 +89,7 @@ quit after parsing the BB files (developers only)
89show current and preferred versions of all packages 89show current and preferred versions of all packages
90.TP 90.TP
91.B \-e, \-\-environment 91.B \-e, \-\-environment
92show the global or per-package environment (this is what used to be bbread) 92show the global or per-recipe environment (this is what used to be bbread)
93.TP 93.TP
94.B \-g, \-\-graphviz 94.B \-g, \-\-graphviz
95emit the dependency trees of the specified packages in the dot syntax 95emit the dependency trees of the specified packages in the dot syntax
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index f44a08889a..ecb3f9b68b 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -402,7 +402,7 @@ class BBCooker:
402 402
403 def showEnvironment(self, buildfile = None, pkgs_to_build = []): 403 def showEnvironment(self, buildfile = None, pkgs_to_build = []):
404 """ 404 """
405 Show the outer or per-package environment 405 Show the outer or per-recipe environment
406 """ 406 """
407 fn = None 407 fn = None
408 envdata = None 408 envdata = None