summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--documentation/bsp-guide/bsp.xml24
-rw-r--r--documentation/dev-manual/dev-manual-common-tasks.xml53
-rw-r--r--documentation/poky-ref-manual/ref-structure.xml11
-rw-r--r--documentation/poky-ref-manual/ref-variables.xml33
-rw-r--r--documentation/poky-ref-manual/technical-details.xml6
5 files changed, 94 insertions, 33 deletions
diff --git a/documentation/bsp-guide/bsp.xml b/documentation/bsp-guide/bsp.xml
index a53ea98d8a..020e3508fa 100644
--- a/documentation/bsp-guide/bsp.xml
+++ b/documentation/bsp-guide/bsp.xml
@@ -52,12 +52,17 @@
52 definition and from it build an image. 52 definition and from it build an image.
53 Here is an example: 53 Here is an example:
54 <literallayout class='monospaced'> 54 <literallayout class='monospaced'>
55 BBLAYERS = " \ 55 BBLAYERS = ?" \
56 /usr/local/src/yocto/meta \ 56 /usr/local/src/yocto/meta \
57 /usr/local/src/yocto/meta-yocto \ 57 /usr/local/src/yocto/meta-yocto \
58 /usr/local/src/yocto/meta-yocto-bsp \ 58 /usr/local/src/yocto/meta-yocto-bsp \
59 /usr/local/src/yocto/meta-&lt;bsp_name&gt; \ 59 /usr/local/src/yocto/meta-mylayer \
60 " 60 "
61
62 BBLAYERS_NON_REMOVABLE ?= " \
63 /usr/local/src/yocto/meta \
64 /usr/local/src/yocto/meta-yocto \
65 "
61 </literallayout> 66 </literallayout>
62 </para> 67 </para>
63 68
@@ -1293,12 +1298,17 @@
1293 <filename>bblayers.conf</filename> file. 1298 <filename>bblayers.conf</filename> file.
1294 Here is an example: 1299 Here is an example:
1295 <literallayout class='monospaced'> 1300 <literallayout class='monospaced'>
1296 BBLAYERS = " \ 1301 BBLAYERS = ?" \
1297 /usr/local/src/yocto/meta \ 1302 /usr/local/src/yocto/meta \
1298 /usr/local/src/yocto/meta-yocto \ 1303 /usr/local/src/yocto/meta-yocto \
1299 /usr/local/src/yocto/meta-yocto-bsp \ 1304 /usr/local/src/yocto/meta-yocto-bsp \
1300 /usr/local/src/yocto/meta-myarm \ 1305 /usr/local/src/yocto/meta-myarm \
1301 " 1306 "
1307
1308 BBLAYERS_NON_REMOVABLE ?= " \
1309 /usr/local/src/yocto/meta \
1310 /usr/local/src/yocto/meta-yocto \
1311 "
1302 </literallayout> 1312 </literallayout>
1303 Adding the layer to this file allows the build system to build the BSP and 1313 Adding the layer to this file allows the build system to build the BSP and
1304 the <filename>yocto-kernel</filename> tool to be able to find the layer and 1314 the <filename>yocto-kernel</filename> tool to be able to find the layer and
diff --git a/documentation/dev-manual/dev-manual-common-tasks.xml b/documentation/dev-manual/dev-manual-common-tasks.xml
index e9f55ce1db..1e2ddefda0 100644
--- a/documentation/dev-manual/dev-manual-common-tasks.xml
+++ b/documentation/dev-manual/dev-manual-common-tasks.xml
@@ -217,10 +217,15 @@
217 BBFILES ?= "" 217 BBFILES ?= ""
218 218
219 BBLAYERS ?= " \ 219 BBLAYERS ?= " \
220 /path/to/poky/meta \ 220 $HOME/poky/meta \
221 /path/to/poky/meta-yocto \ 221 $HOME/poky/meta-yocto \
222 /path/to/poky/meta-yocto-bsp \ 222 $HOME/poky/meta-yocto-bsp \
223 /path/to/poky/meta-mylayer \ 223 $HOME/poky/meta-mylayer \
224 "
225
226 BBLAYERS_NON_REMOVABLE ?= " \
227 $HOME/poky/meta \
228 $HOME/poky/meta-yocto \
224 " 229 "
225 </literallayout> 230 </literallayout>
226 </para> 231 </para>
@@ -232,14 +237,6 @@
232 During the processing of each <filename>conf/layer.conf</filename> file, BitBake adds the 237 During the processing of each <filename>conf/layer.conf</filename> file, BitBake adds the
233 recipes, classes and configurations contained within the particular layer to the source 238 recipes, classes and configurations contained within the particular layer to the source
234 directory. 239 directory.
235 <note>
236 Removing the <filename>meta-yocto</filename> layer exposes a bug for the
237 current release of the Yocto Project.
238 If for some reason you do remove this layer from the
239 <filename>bblayers.conf</filename>, you must set the
240 <filename>LCONF_VERSION</filename> variable to "5".
241 See <ulink url='https://bugzilla.yoctoproject.org/show_bug.cgi?id=3176'>[YOCTO_#3176]</ulink>
242 for more information.</note>
243 </para> 240 </para>
244 </section> 241 </section>
245 242
@@ -1816,14 +1813,18 @@
1816 <filename>meta</filename>, <filename>meta-yocto</filename>, and 1813 <filename>meta</filename>, <filename>meta-yocto</filename>, and
1817 <filename>meta-yocto-bsp</filename> in the 1814 <filename>meta-yocto-bsp</filename> in the
1818 <filename>poky</filename> Git repository. 1815 <filename>poky</filename> Git repository.
1819 Add the path to your <filename>meta-mylayer</filename> location. 1816 Add the path to your <filename>meta-mylayer</filename> location:
1820 Be sure to substitute your user information in the statement:
1821 <literallayout class='monospaced'> 1817 <literallayout class='monospaced'>
1822 BBLAYERS = " \ 1818 BBLAYERS ?= " \
1823 /home/&lt;user&gt;/poky/meta \ 1819 $HOME/poky/meta \
1824 /home/&lt;user&gt;/poky/meta-yocto \ 1820 $HOME/poky/meta-yocto \
1825 /home/&lt;user&gt;/poky/meta-yocto-bsp \ 1821 $HOME/poky/meta-yocto-bsp \
1826 /home/&lt;user&gt;/poky/meta-mylayer \ 1822 $HOME/poky/meta-mylayer \
1823 "
1824
1825 BBLAYERS_NON_REMOVABLE ?= " \
1826 $HOME/poky/meta \
1827 $HOME/poky/meta-yocto \
1827 " 1828 "
1828 </literallayout></para></listitem> 1829 </literallayout></para></listitem>
1829 </itemizedlist> 1830 </itemizedlist>
@@ -3048,11 +3049,15 @@
3048 BBFILES ?= "" 3049 BBFILES ?= ""
3049 3050
3050 BBLAYERS ?= " \ 3051 BBLAYERS ?= " \
3051 ##COREBASE##/meta \ 3052 $HOME/poky/meta \
3052 ##COREBASE##/meta-yocto \ 3053 $HOME/poky/meta-yocto \
3053 ##COREBASE##/meta-yocto-bsp \ 3054 $HOME/poky/meta-yocto-bsp \
3054 ##COREBASE##/meta-my-bsp-layer \ 3055 $HOME/poky/meta-mylayer \
3055 ##COREBASE##/meta-my-software-layer \ 3056 "
3057
3058 BBLAYERS_NON_REMOVABLE ?= " \
3059 $HOME/poky/meta \
3060 $HOME/poky/meta-yocto \
3056 " 3061 "
3057 </literallayout> 3062 </literallayout>
3058 Creating and providing an archive of the metadata layers 3063 Creating and providing an archive of the metadata layers
diff --git a/documentation/poky-ref-manual/ref-structure.xml b/documentation/poky-ref-manual/ref-structure.xml
index c2644df374..166907ceef 100644
--- a/documentation/poky-ref-manual/ref-structure.xml
+++ b/documentation/poky-ref-manual/ref-structure.xml
@@ -247,11 +247,20 @@
247 <title><filename>build/conf/bblayers.conf</filename></title> 247 <title><filename>build/conf/bblayers.conf</filename></title>
248 248
249 <para> 249 <para>
250 This file defines layers, which is a directory tree, traversed (or walked) by BitBake. 250 This file defines layers, which are directory trees, traversed (or walked) by BitBake.
251 If <filename>bblayers.conf</filename> 251 If <filename>bblayers.conf</filename>
252 is not present, it is created from <filename>bblayers.conf.sample</filename> when 252 is not present, it is created from <filename>bblayers.conf.sample</filename> when
253 you <filename>source</filename> the environment setup script. 253 you <filename>source</filename> the environment setup script.
254 </para> 254 </para>
255
256 <para>
257 The <filename>bblayers.conf</filename> file uses the
258 <link linkend='var-BBLAYERS'><filename>BBLAYERS</filename></link> variable to
259 list the layers BitBake tries to find.
260 The file uses the
261 <link linkend='var-BBLAYERS_NON_REMOVABLE'><filename>BBLAYERS_NON_REMOVABLE</filename></link>
262 variable to list layers that must not be removed.
263 </para>
255 </section> 264 </section>
256 265
257 <section id='structure-build-conf-sanity_info'> 266 <section id='structure-build-conf-sanity_info'>
diff --git a/documentation/poky-ref-manual/ref-variables.xml b/documentation/poky-ref-manual/ref-variables.xml
index 9ced42499e..0de6bfcf5c 100644
--- a/documentation/poky-ref-manual/ref-variables.xml
+++ b/documentation/poky-ref-manual/ref-variables.xml
@@ -422,6 +422,11 @@
422 /home/scottrif/poky/meta-yocto-bsp \ 422 /home/scottrif/poky/meta-yocto-bsp \
423 /home/scottrif/poky/meta-mykernel \ 423 /home/scottrif/poky/meta-mykernel \
424 " 424 "
425
426 BBLAYERS_NON_REMOVABLE ?= " \
427 /home/scottrif/poky/meta \
428 /home/scottrif/poky/meta-yocto \
429 "
425 </literallayout> 430 </literallayout>
426 This example enables four layers, one of which is a custom, user-defined layer 431 This example enables four layers, one of which is a custom, user-defined layer
427 named <filename>meta-mykernel</filename>. 432 named <filename>meta-mykernel</filename>.
@@ -429,6 +434,34 @@
429 </glossdef> 434 </glossdef>
430 </glossentry> 435 </glossentry>
431 436
437 <glossentry id='var-BBLAYERS_NON_REMOVABLE'><glossterm>BBLAYERS_NON_REMOVABLE</glossterm>
438 <glossdef>
439Core layer for images cannot be removed
440 <para>Lists core layers that cannot be removed from the
441 <filename>bblayers.conf</filename> file.
442 In order for BitBake to build your image, your
443 <filename>bblayers.conf</filename> file must include the
444 <filename>meta</filename> and <filename>meta-yocto</filename>
445 core layers.
446 Here is an example that shows these two layers listed in
447 the <filename>BBLAYERS_NON_REMOVABLE</filename> statement:
448 <literallayout class='monospaced'>
449 BBLAYERS = " \
450 /home/scottrif/poky/meta \
451 /home/scottrif/poky/meta-yocto \
452 /home/scottrif/poky/meta-yocto-bsp \
453 /home/scottrif/poky/meta-mykernel \
454 "
455
456 BBLAYERS_NON_REMOVABLE ?= " \
457 /home/scottrif/poky/meta \
458 /home/scottrif/poky/meta-yocto \
459 "
460 </literallayout>
461 </para>
462 </glossdef>
463 </glossentry>
464
432 <glossentry id='var-BP'><glossterm>BP</glossterm> 465 <glossentry id='var-BP'><glossterm>BP</glossterm>
433 <glossdef> 466 <glossdef>
434 <para>The base recipe name and version but without any special 467 <para>The base recipe name and version but without any special
diff --git a/documentation/poky-ref-manual/technical-details.xml b/documentation/poky-ref-manual/technical-details.xml
index 654d9252a9..042a96ed87 100644
--- a/documentation/poky-ref-manual/technical-details.xml
+++ b/documentation/poky-ref-manual/technical-details.xml
@@ -662,7 +662,11 @@
662 /home/nitin/prj/poky.git/meta-yocto \ 662 /home/nitin/prj/poky.git/meta-yocto \
663 /home/nitin/prj/poky.git/meta-yocto-bsp \ 663 /home/nitin/prj/poky.git/meta-yocto-bsp \
664 /home/nitin/prj/meta-x32.git \ 664 /home/nitin/prj/meta-x32.git \
665 " 665 "
666 BBLAYERS_NON_REMOVABLE ?= " \
667 /home/nitin/prj/poky.git/meta \
668 /home/nitin/prj/poky.git/meta-yocto \
669 "
666 </literallayout></para></listitem> 670 </literallayout></para></listitem>
667 <listitem><para>Enable the x32 psABI tuning file for <filename>x86_64</filename> 671 <listitem><para>Enable the x32 psABI tuning file for <filename>x86_64</filename>
668 machines by editing the <filename>conf/local.conf</filename> like this: 672 machines by editing the <filename>conf/local.conf</filename> like this: