summaryrefslogtreecommitdiffstats
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:19:15 +0100
commit4283ae56a90c21bc626fabfc51dd1b3a062b8838 (patch)
tree9662a3c9ae466f50bfd38a3eb61a9a014765558e
parentc5820a3961347a7a02dbbbf76400af0f0fe60435 (diff)
downloadpoky-4283ae56a90c21bc626fabfc51dd1b3a062b8838.tar.gz
bitbake: 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. (Bitbake rev: f169ac5da18d55a40d0554668e1a0ace70f94768) Signed-off-by: Scott Rifenbark <srifenbark@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/doc/bitbake-user-manual/bitbake-user-manual-metadata.xml18
1 files changed, 13 insertions, 5 deletions
diff --git a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-metadata.xml b/bitbake/doc/bitbake-user-manual/bitbake-user-manual-metadata.xml
index 310b9d20d6..b2595c93f5 100644
--- a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-metadata.xml
+++ b/bitbake/doc/bitbake-user-manual/bitbake-user-manual-metadata.xml
@@ -923,6 +923,14 @@
923 inherited class within your recipe by doing so 923 inherited class within your recipe by doing so
924 after the "inherit" statement. 924 after the "inherit" statement.
925 </note> 925 </note>
926 If you want to use the directive to inherit
927 multiple classes, you can separate the classes with spaces.
928 The following example shows how to inherit both the
929 <filename>autotools</filename> and <filename>pkgconfig</filename>
930 classes:
931 <literallayout class='monospaced'>
932 inherit autotools pkgconfig
933 </literallayout>
926 </para> 934 </para>
927 935
928 <para> 936 <para>
@@ -1076,8 +1084,9 @@
1076 1084
1077 <para> 1085 <para>
1078 When creating a configuration file (<filename>.conf</filename>), 1086 When creating a configuration file (<filename>.conf</filename>),
1079 you can use the <filename>INHERIT</filename> directive to 1087 you can use the
1080 inherit a class. 1088 <link linkend='var-INHERIT'><filename>INHERIT</filename></link>
1089 configuration directive to inherit a class.
1081 BitBake only supports this directive when used within 1090 BitBake only supports this directive when used within
1082 a configuration file. 1091 a configuration file.
1083 </para> 1092 </para>
@@ -1099,8 +1108,7 @@
1099 <note> 1108 <note>
1100 Because <filename>.conf</filename> files are parsed 1109 Because <filename>.conf</filename> files are parsed
1101 first during BitBake's execution, using 1110 first during BitBake's execution, using
1102 <link linkend='var-INHERIT'><filename>INHERIT</filename></link> 1111 <filename>INHERIT</filename> to inherit a class effectively
1103 to inherit a class effectively
1104 inherits the class globally (i.e. for all recipes). 1112 inherits the class globally (i.e. for all recipes).
1105 </note> 1113 </note>
1106 If you want to use the directive to inherit 1114 If you want to use the directive to inherit
@@ -1111,7 +1119,7 @@
1111 <filename>autotools</filename> and <filename>pkgconfig</filename> 1119 <filename>autotools</filename> and <filename>pkgconfig</filename>
1112 classes: 1120 classes:
1113 <literallayout class='monospaced'> 1121 <literallayout class='monospaced'>
1114 inherit autotools pkgconfig 1122 INHERIT += "autotools pkgconfig"
1115 </literallayout> 1123 </literallayout>
1116 </para> 1124 </para>
1117 </section> 1125 </section>