summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKristi Rifenbark <kristi.rifenbark@gmail.com>2017-10-13 13:24:02 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-10-16 23:46:53 +0100
commit4e818ce29742ce6cd9f54ebb27f045a25d99044d (patch)
treef038ce958c6a1792d11342226689cb8da19cef8d
parent332e309030fb72a751ae289fbb98947b8adfabc4 (diff)
downloadpoky-4e818ce29742ce6cd9f54ebb27f045a25d99044d.tar.gz
toaster-manual: Updated the "Configuring Toaster" section
Updated with review edits. (From yocto-docs rev: 43dc539fb195e6194117dbc4de4d053fff53e9ff) Signed-off-by: Kristi Rifenbark <kristi.rifenbark@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--documentation/toaster-manual/toaster-manual-reference.xml16
1 files changed, 12 insertions, 4 deletions
diff --git a/documentation/toaster-manual/toaster-manual-reference.xml b/documentation/toaster-manual/toaster-manual-reference.xml
index 7c5b844d8a..665dc15ffb 100644
--- a/documentation/toaster-manual/toaster-manual-reference.xml
+++ b/documentation/toaster-manual/toaster-manual-reference.xml
@@ -316,6 +316,9 @@
316 For example, you can add one or more additional selections that 316 For example, you can add one or more additional selections that
317 present custom layer sets or distros, and any other local or proprietary 317 present custom layer sets or distros, and any other local or proprietary
318 content. 318 content.
319 </para>
320
321 <para>
319 Additionally, you can completely disable the content from the 322 Additionally, you can completely disable the content from the
320 <filename>oe-core.xml</filename> and <filename>poky.xml</filename> 323 <filename>oe-core.xml</filename> and <filename>poky.xml</filename>
321 files by defining the section shown below in the 324 files by defining the section shown below in the
@@ -331,7 +334,6 @@
331 <literallayout class='monospaced'> 334 <literallayout class='monospaced'>
332 &lt;object model="orm.toastersetting" pk="99"&gt; 335 &lt;object model="orm.toastersetting" pk="99"&gt;
333 &lt;field type="CharField" name="name"&gt;CUSTOM_XML_ONLY&lt;/field&gt; 336 &lt;field type="CharField" name="name"&gt;CUSTOM_XML_ONLY&lt;/field&gt;
334
335 &lt;field type="CharField" name="value"&gt;True&lt;/field&gt; 337 &lt;field type="CharField" name="value"&gt;True&lt;/field&gt;
336 &lt;/object&gt; 338 &lt;/object&gt;
337 </literallayout> 339 </literallayout>
@@ -342,15 +344,15 @@
342 <title>Understanding Fixture File Format</title> 344 <title>Understanding Fixture File Format</title>
343 345
344 <para> 346 <para>
345 The following is an overview of the file format used by the 347 The following is an overview of the file format used by the
346 <filename>oe-core.xml</filename>, <filename>poky.xml</filename>, 348 <filename>oe-core.xml</filename>, <filename>poky.xml</filename>,
347 and <filename>custom.xml</filename> files. 349 and <filename>custom.xml</filename> files.
348 </para> 350 </para>
349 351
350 <para> 352 <para>
351 The following subsections describe each of the sections in the 353 The following subsections describe each of the sections in the
352 fixture files, and outline an example section of the XML code. 354 fixture files, and outline an example section of the XML code.
353 you can use to help understand this information and create a local 355 you can use to help understand this information and create a local
354 <filename>custom.xml</filename> file. 356 <filename>custom.xml</filename> file.
355 </para> 357 </para>
356 358
@@ -447,6 +449,12 @@
447 Layer definitions are the most complex. 449 Layer definitions are the most complex.
448 The following defines each of the layers, and then defines the exact layer 450 The following defines each of the layers, and then defines the exact layer
449 version of the layer used for each respective release. 451 version of the layer used for each respective release.
452 You must have one <filename>orm.layer</filename>
453 entry for each layer.
454 Then, with each entry you need a set of
455 <filename>orm.layer_version</filename> entries that connects
456 the layer with each release that includes the layer.
457 In general all releases include the layer.
450 <literallayout class='monospaced'> 458 <literallayout class='monospaced'>
451 &lt;object model="orm.layer" pk="1"&gt; 459 &lt;object model="orm.layer" pk="1"&gt;
452 &lt;field type="CharField" name="name"&gt;openembedded-core&lt;/field&gt; 460 &lt;field type="CharField" name="name"&gt;openembedded-core&lt;/field&gt;