aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Rifenbark <srifenbark@gmail.com>2017-09-02 10:16:23 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-09-13 17:16:01 +0100
commitf169ac5da18d55a40d0554668e1a0ace70f94768 (patch)
tree47b24a0c237ae34bc60d149dff7ca33bae07b7ae
parentfded970a0709d928f70224d8b61534e9353ee6dd (diff)
downloadbitbake-f169ac5da18d55a40d0554668e1a0ace70f94768.tar.gz
bitbake-f169ac5da18d55a40d0554668e1a0ace70f94768.tar.bz2
bitbake-f169ac5da18d55a40d0554668e1a0ace70f94768.zip
bitbake-user-manual: Updated inherit and INHERIT sections
Fixes [YOCTO #12031] Moved an inappropriate example from the bottom of the INHERIT Configuration Directive section up into the inherit directive section. Updated the example at the end of the INHERIT Configuration Directive section to apply to INHERIT. Signed-off-by: Scott Rifenbark <srifenbark@gmail.com>
-rw-r--r--doc/bitbake-user-manual/bitbake-user-manual-metadata.xml18
1 files changed, 13 insertions, 5 deletions
diff --git a/doc/bitbake-user-manual/bitbake-user-manual-metadata.xml b/doc/bitbake-user-manual/bitbake-user-manual-metadata.xml
index 310b9d20..b2595c93 100644
--- a/doc/bitbake-user-manual/bitbake-user-manual-metadata.xml
+++ b/doc/bitbake-user-manual/bitbake-user-manual-metadata.xml
@@ -923,6 +923,14 @@
inherited class within your recipe by doing so
after the "inherit" statement.
</note>
+ If you want to use the directive to inherit
+ multiple classes, you can separate the classes with spaces.
+ The following example shows how to inherit both the
+ <filename>autotools</filename> and <filename>pkgconfig</filename>
+ classes:
+ <literallayout class='monospaced'>
+ inherit autotools pkgconfig
+ </literallayout>
</para>
<para>
@@ -1076,8 +1084,9 @@
<para>
When creating a configuration file (<filename>.conf</filename>),
- you can use the <filename>INHERIT</filename> directive to
- inherit a class.
+ you can use the
+ <link linkend='var-INHERIT'><filename>INHERIT</filename></link>
+ configuration directive to inherit a class.
BitBake only supports this directive when used within
a configuration file.
</para>
@@ -1099,8 +1108,7 @@
<note>
Because <filename>.conf</filename> files are parsed
first during BitBake's execution, using
- <link linkend='var-INHERIT'><filename>INHERIT</filename></link>
- to inherit a class effectively
+ <filename>INHERIT</filename> to inherit a class effectively
inherits the class globally (i.e. for all recipes).
</note>
If you want to use the directive to inherit
@@ -1111,7 +1119,7 @@
<filename>autotools</filename> and <filename>pkgconfig</filename>
classes:
<literallayout class='monospaced'>
- inherit autotools pkgconfig
+ INHERIT += "autotools pkgconfig"
</literallayout>
</para>
</section>