aboutsummaryrefslogtreecommitdiffstats
path: root/doc/user-manual/user-manual-execution.xml
diff options
context:
space:
mode:
authorScott Rifenbark <scott.m.rifenbark@intel.com>2014-03-07 12:41:08 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-09 18:57:14 -0700
commit2d4b09be70c6df0c1605f7e291149c682999cf50 (patch)
tree52f57b7fcc7b41523788c5b3065df4840bc0bfb5 /doc/user-manual/user-manual-execution.xml
parent5cd310d1df194cd171691a4bcfb98024e2bc66b8 (diff)
downloadbitbake-2d4b09be70c6df0c1605f7e291149c682999cf50.tar.gz
user-manual: Review edits applied throughout from Paul Eggleton.
Applied review edits from Paul Eggleton spanning the entire book. Small areas affected in all chapters except the "Hello World" Appendix. Noteworthy changes in the variables chapter where I added two new variables: BBINCLUDELOGS_LINES and BB_CONSOLELOG. Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com>
Diffstat (limited to 'doc/user-manual/user-manual-execution.xml')
-rw-r--r--doc/user-manual/user-manual-execution.xml12
1 files changed, 7 insertions, 5 deletions
diff --git a/doc/user-manual/user-manual-execution.xml b/doc/user-manual/user-manual-execution.xml
index 6110a93e2..a67516e85 100644
--- a/doc/user-manual/user-manual-execution.xml
+++ b/doc/user-manual/user-manual-execution.xml
@@ -85,8 +85,10 @@
Next, the <filename>bitbake.conf</filename> file is searched
using the <filename>BBPATH</filename> variable that was
just constructed.
- The <filename>bitbake.conf</filename> file usually indicates
- all the other key include files to parse.
+ The <filename>bitbake.conf</filename> file may also include other
+ configuration files using the
+ <filename>include</filename> or
+ <filename>require</filename> directives.
</para>
<para>
@@ -358,11 +360,11 @@
<para>
As an example of adding an extra provider, suppose a recipe named
- <filename>package1.bb</filename> contained the following:
+ <filename>foo_1.0.bb</filename> contained the following:
<literallayout class='monospaced'>
- PROVIDES += "virtual/package"
+ PROVIDES += "virtual/bar_1.0"
</literallayout>
- The recipe now provides both "package1" and "virtual/package".
+ The recipe now provides both "foo_1.0" and "virtual/bar_1.0".
The "virtual/" namespace is often used to denote cases where
multiple providers are expected with the user choosing between
them.