summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--handbook/extendpoky.xml40
-rw-r--r--handbook/ref-classes.xml2
-rw-r--r--handbook/ref-structure.xml16
-rw-r--r--handbook/ref-variables.xml2
4 files changed, 30 insertions, 30 deletions
diff --git a/handbook/extendpoky.xml b/handbook/extendpoky.xml
index 61620053a6..662096844d 100644
--- a/handbook/extendpoky.xml
+++ b/handbook/extendpoky.xml
@@ -74,8 +74,8 @@ do_install() {
74 74
75 <para> 75 <para>
76 As a result of the build process "helloworld", "helloworld-dbg" and "hellworld-dev" 76 As a result of the build process "helloworld", "helloworld-dbg" and "hellworld-dev"
77 packages will be built by default. You can <link linkend='usingpoky-extend-addpkg-files'> 77 packages will be built by default. It is possible to<link linkend='usingpoky-extend-addpkg-files'>
78 control package process</link> yourself. 78 customise the packaging process</link>.
79 </para> 79 </para>
80 </section> 80 </section>
81 81
@@ -243,8 +243,8 @@ FILES_sxpm = "${bindir}/sxpm"
243 </para> 243 </para>
244 <programlisting> 244 <programlisting>
245pkg_postinst_PACKAGENAME () { 245pkg_postinst_PACKAGENAME () {
246 #!/bin/sh -e 246#!/bin/sh -e
247 # Commands to carry out 247# Commands to carry out
248} 248}
249 </programlisting> 249 </programlisting>
250 <para> 250 <para>
@@ -265,12 +265,12 @@ pkg_postinst_PACKAGENAME () {
265 265
266 <programlisting> 266 <programlisting>
267pkg_postinst_PACKAGENAME () { 267pkg_postinst_PACKAGENAME () {
268 #!/bin/sh -e 268#!/bin/sh -e
269 if [ x"$D" = "x" ]; then 269if [ x"$D" = "x" ]; then
270 # Actions to carry out on the device go here 270 # Actions to carry out on the device go here
271 else 271else
272 exit 1 272 exit 1
273 fi 273fi
274} 274}
275 </programlisting> 275 </programlisting>
276 276
@@ -398,7 +398,7 @@ RRECOMMENDS_task-custom-tools = "\
398 variable. To create these, the best reference is <filename>meta/classes/poky-image.bbclass</filename> 398 variable. To create these, the best reference is <filename>meta/classes/poky-image.bbclass</filename>
399 which illustrates how poky achieves this. In summary, the file looks at the contents of the 399 which illustrates how poky achieves this. In summary, the file looks at the contents of the
400 <glossterm><link linkend='var-IMAGE_FEATURES'>IMAGE_FEATURES</link></glossterm> 400 <glossterm><link linkend='var-IMAGE_FEATURES'>IMAGE_FEATURES</link></glossterm>
401 variable and then map into a set of tasks or packages. Based on this then the 401 variable and then maps this into a set of tasks or packages. Based on this then the
402 <glossterm><link linkend='var-IMAGE_INSTALL'> IMAGE_INSTALL</link></glossterm> 402 <glossterm><link linkend='var-IMAGE_INSTALL'> IMAGE_INSTALL</link></glossterm>
403 variable is generated automatically. Extra features can be added by 403 variable is generated automatically. Extra features can be added by
404 extending the class or creating a custom class for use with specialised image .bb files. 404 extending the class or creating a custom class for use with specialised image .bb files.
@@ -586,12 +586,11 @@ DISPLAY_SUBPIXEL_ORDER=vrgb
586 586
587 <para> 587 <para>
588 The Poky tree includes several additional layers which demonstrate 588 The Poky tree includes several additional layers which demonstrate
589 this functionality, such as meta-moblin, meta-emenlow, meta-extras. 589 this functionality, such as meta-emenlow and meta-extras.
590 Default layers enabled are meta-moblin and meta-emenlow, which may 590 The meta-emenlow layer is an example layer enabled by default. The meta-extras
591 suffer from future changes. The meta-extras repostory is not enabled 591 repostory is not enabled by default but enabling any layer is as easy as adding
592 by default but enabling any layer is as easy as adding the layers path 592 the layers path to the BBLAYERS variable in your bblayers.conf. this is how
593 to the BBLAYERS variable in your bblayers.conf. this is how meta-extras 593 meta-extras are enabled in Poky builds:
594 are enabled in Poky builds:
595 </para> 594 </para>
596 <para> 595 <para>
597 <literallayout class='monospaced'>LCONF_VERSION = "1" 596 <literallayout class='monospaced'>LCONF_VERSION = "1"
@@ -650,7 +649,8 @@ BBFILE_PRIORITY_emenlow = "6"
650 </para> 649 </para>
651 650
652 <para> 651 <para>
653 Emenlow bbclasses and configuration are added to the BBPATH 652 Additional bbclass and configuration files can be locationed by
653 bitbake through the addition to the BBPATH
654 environment variable. In this case, the first file with the 654 environment variable. In this case, the first file with the
655 matching name found in BBPATH is the one that is used, just 655 matching name found in BBPATH is the one that is used, just
656 like the PATH variable for binaries. It is therefore recommended 656 like the PATH variable for binaries. It is therefore recommended
@@ -773,7 +773,7 @@ BBFILE_PRIORITY_emenlow = "6"
773 They usually happen at preset times such as at night when the machine 773 They usually happen at preset times such as at night when the machine
774 load isn't high from the incremental builds. 774 load isn't high from the incremental builds.
775 <ulink url='http://autobuilder.pokylinux.org:8010'>poky autobuilder</ulink> 775 <ulink url='http://autobuilder.pokylinux.org:8010'>poky autobuilder</ulink>
776 is an example implementation with buildrot. 776 is an example implementation with buildbot.
777 </para> 777 </para>
778 778
779 <para> 779 <para>
@@ -856,7 +856,7 @@ bitbake -c compile -f NAME_OF_PACKAGE
856 "-f" or "--force" is used to force re-execution of the specified task. 856 "-f" or "--force" is used to force re-execution of the specified task.
857 Other tasks may also be called this way. But note that all the modifications 857 Other tasks may also be called this way. But note that all the modifications
858 in <glossterm><link linkend='var-WORKDIR'>WORKDIR</link></glossterm> 858 in <glossterm><link linkend='var-WORKDIR'>WORKDIR</link></glossterm>
859 are gone once you executes "-c clean" for a pacakge. 859 are gone once you executes "-c clean" for a package.
860 </para> 860 </para>
861 861
862 <section id='usingpoky-modifying-packages-quilt'> 862 <section id='usingpoky-modifying-packages-quilt'>
diff --git a/handbook/ref-classes.xml b/handbook/ref-classes.xml
index 770c062e71..036044dd28 100644
--- a/handbook/ref-classes.xml
+++ b/handbook/ref-classes.xml
@@ -60,7 +60,7 @@
60 <itemizedlist> 60 <itemizedlist>
61 <listitem> 61 <listitem>
62 <para> 62 <para>
63 'do_configure' regenearates the configure script and (using autoreconf) 63 'do_configure' regenearates the configure script (using autoreconf) and
64 then launches it with a standard set of arguments used during 64 then launches it with a standard set of arguments used during
65 cross-compilation. Additional parameters can be passed to 65 cross-compilation. Additional parameters can be passed to
66 <command>configure</command> through the <glossterm><link 66 <command>configure</command> through the <glossterm><link
diff --git a/handbook/ref-structure.xml b/handbook/ref-structure.xml
index 3d7c3c9db7..ca589de428 100644
--- a/handbook/ref-structure.xml
+++ b/handbook/ref-structure.xml
@@ -40,10 +40,10 @@
40 40
41 <para> 41 <para>
42 This directory contains user configuration files and the output 42 This directory contains user configuration files and the output
43 from Poky. It's now deprecated to be a sub-directory in Poky source tree, 43 generated by Poky in its standard configuration where the source tree is
44 though it's still supported. The desired way is to use <link 44 combined with the output. It is also possible to place output and configuration
45 linkend='structure-core-script'>seperate output directory</link> for build 45 files in a directory separate from the Poky source, see the section <link
46 outside of Poky source tree. 46 linkend='structure-core-script'>seperate output directory</link>.
47 </para> 47 </para>
48 </section> 48 </section>
49 49
@@ -136,7 +136,7 @@
136 a shell makes changes to PATH and sets other core BitBake variables based on the 136 a shell makes changes to PATH and sets other core BitBake variables based on the
137 current working directory. You need to use this before running Poky commands. 137 current working directory. You need to use this before running Poky commands.
138 Internally it uses scripts within the <filename class="directory">scripts/ 138 Internally it uses scripts within the <filename class="directory">scripts/
139 </filename> directory to do the bulk of the work. Now this script supports 139 </filename> directory to do the bulk of the work. This script supports
140 specifying any directory as the build output: 140 specifying any directory as the build output:
141 </para> 141 </para>
142 142
@@ -145,9 +145,9 @@ source POKY_SRC/poky-init-build-env [BUILDDIR]
145 </programlisting> 145 </programlisting>
146 146
147 <para> 147 <para>
148 Above command can be typed from any directory, as long as POKY_SRC points to 148 The above command can be typed from any directory, as long as POKY_SRC points to
149 the desired Poky source tree. The optional BUILDDIR could be any directory you'd 149 the desired Poky source tree. The optional BUILDDIR could be any directory you'd
150 like to contain output contents. 150 like Poky to generate the build output into.
151 </para> 151 </para>
152 </section> 152 </section>
153</section> 153</section>
@@ -182,7 +182,7 @@ source POKY_SRC/poky-init-build-env [BUILDDIR]
182 <para> 182 <para>
183 This file defines layers walked by bitbake. If there's no <filename> 183 This file defines layers walked by bitbake. If there's no <filename>
184 bblayers.conf</filename> present, it is created from <filename>bblayers.conf.sample 184 bblayers.conf</filename> present, it is created from <filename>bblayers.conf.sample
185 </filename>. 185 </filename> when the environment setup script is sourced.
186 </para> 186 </para>
187 </section> 187 </section>
188 188
diff --git a/handbook/ref-variables.xml b/handbook/ref-variables.xml
index de51dff1aa..ef1e85cfba 100644
--- a/handbook/ref-variables.xml
+++ b/handbook/ref-variables.xml
@@ -109,7 +109,7 @@
109 <para>A regular expression which evalutates to match the machines the recipe 109 <para>A regular expression which evalutates to match the machines the recipe
110 works with. It stops recipes being run on machines they're incompatible with, 110 works with. It stops recipes being run on machines they're incompatible with,
111 which is partciuarly useful with kernels. It also helps to increase parsing 111 which is partciuarly useful with kernels. It also helps to increase parsing
112 speed that, further parsing of the recipe is skipped as if it found the current 112 speed as further parsing of the recipe is skipped as if it found the current
113 machine is not compatible.</para> 113 machine is not compatible.</para>
114 </glossdef> 114 </glossdef>
115 </glossentry> 115 </glossentry>