summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--documentation/poky-ref-manual/ref-classes.xml2
-rw-r--r--documentation/poky-ref-manual/ref-structure.xml33
-rw-r--r--documentation/poky-ref-manual/ref-variables.xml14
-rw-r--r--documentation/poky-ref-manual/technical-details.xml4
-rw-r--r--documentation/poky-ref-manual/usingpoky.xml2
5 files changed, 30 insertions, 25 deletions
diff --git a/documentation/poky-ref-manual/ref-classes.xml b/documentation/poky-ref-manual/ref-classes.xml
index 5ba9811853..2caea272a4 100644
--- a/documentation/poky-ref-manual/ref-classes.xml
+++ b/documentation/poky-ref-manual/ref-classes.xml
@@ -570,7 +570,7 @@
570 By default, the <filename>B</filename> directory is set to the following, which is separate from the 570 By default, the <filename>B</filename> directory is set to the following, which is separate from the
571 Source Directory (<filename>S</filename>): 571 Source Directory (<filename>S</filename>):
572 <literallayout class='monospaced'> 572 <literallayout class='monospaced'>
573 ${WORKDIR}/${BPN}-{PV}/ 573 ${WORKDIR}/${BPN}/{PV}/
574 </literallayout> 574 </literallayout>
575 See the glossary entries for the 575 See the glossary entries for the
576 <link linkend='var-WORKDIR'><filename>WORKDIR</filename></link>, 576 <link linkend='var-WORKDIR'><filename>WORKDIR</filename></link>,
diff --git a/documentation/poky-ref-manual/ref-structure.xml b/documentation/poky-ref-manual/ref-structure.xml
index 0b8e7711c2..ea48299600 100644
--- a/documentation/poky-ref-manual/ref-structure.xml
+++ b/documentation/poky-ref-manual/ref-structure.xml
@@ -458,12 +458,15 @@
458 <title><filename>build/tmp/work/</filename></title> 458 <title><filename>build/tmp/work/</filename></title>
459 459
460 <para> 460 <para>
461 This directory contains architecture-specific work sub-directories for packages built by BitBake. 461 This directory contains architecture-specific work sub-directories
462 All tasks execute from a work directory. 462 for packages built by BitBake.
463 For example, the source for a particular package is unpacked, patched, configured and compiled all 463 All tasks execute from the appropriate work directory.
464 within its own work directory. 464 For example, the source for a particular package is unpacked,
465 Within the work directory, organization is based on the package group for which the source 465 patched, configured and compiled all within its own work directory.
466 is being compiled. 466 Within the work directory, organization is based on the package group
467 and version for which the source is being compiled
468 as defined by the
469 <link linkend='var-WORKDIR'><filename>WORKDIR</filename></link>.
467 </para> 470 </para>
468 471
469 <para> 472 <para>
@@ -472,8 +475,9 @@
472 on the machine <filename>qemux86</filename> 475 on the machine <filename>qemux86</filename>
473 built within the Yocto Project. 476 built within the Yocto Project.
474 For this package, a work directory of 477 For this package, a work directory of
475 <filename>tmp/work/qemux86-poky-linux/linux-yocto-3.0+git1+&lt;.....&gt;</filename>, 478 <filename>tmp/work/qemux86-poky-linux/linux-yocto/3.0+git1+&lt;.....&gt;</filename>,
476 referred to as <filename><link linkend='var-WORKDIR'>WORKDIR</link></filename>, is created. 479 referred to as the
480 <filename><link linkend='var-WORKDIR'>WORKDIR</link></filename>, is created.
477 Within this directory, the source is unpacked to 481 Within this directory, the source is unpacked to
478 <filename>linux-qemux86-standard-build</filename> and then patched by Quilt 482 <filename>linux-qemux86-standard-build</filename> and then patched by Quilt
479 (see the 483 (see the
@@ -486,13 +490,14 @@
486 </para> 490 </para>
487 491
488 <para> 492 <para>
489 There are other directories generated within WORKDIR. 493 There are other directories generated within <filename>WORKDIR</filename>.
490 The most important directory is WORKDIR<filename>/temp/</filename>, which has log files for each 494 The most important directory is <filename>WORKDIR/temp/</filename>,
491 task (<filename>log.do_*.pid</filename>) and contains the scripts BitBake runs for 495 which has log files for each task (<filename>log.do_*.pid</filename>)
492 each task (<filename>run.do_*.pid</filename>). 496 and contains the scripts BitBake runs for each task
493 The WORKDIR<filename>/image/</filename> directory is where "make 497 (<filename>run.do_*.pid</filename>).
498 The <filename>WORKDIR/image/</filename> directory is where "make
494 install" places its output that is then split into sub-packages 499 install" places its output that is then split into sub-packages
495 within WORKDIR<filename>/packages-split/</filename>. 500 within <filename>WORKDIR/packages-split/</filename>.
496 </para> 501 </para>
497 </section> 502 </section>
498</section> 503</section>
diff --git a/documentation/poky-ref-manual/ref-variables.xml b/documentation/poky-ref-manual/ref-variables.xml
index 2765c2f1c9..c490fc360d 100644
--- a/documentation/poky-ref-manual/ref-variables.xml
+++ b/documentation/poky-ref-manual/ref-variables.xml
@@ -99,7 +99,7 @@
99 By default, this directory is the same as the <link linkend='var-S'><filename>S</filename></link> 99 By default, this directory is the same as the <link linkend='var-S'><filename>S</filename></link>
100 directory: 100 directory:
101 <literallayout class='monospaced'> 101 <literallayout class='monospaced'>
102 B = ${WORKDIR}/${BPN}-{PV}/ 102 B = ${WORKDIR}/${BPN}/{PV}/
103 </literallayout> 103 </literallayout>
104 You can separate the (<filename>S</filename>) directory and the directory pointed to 104 You can separate the (<filename>S</filename>) directory and the directory pointed to
105 by the <filename>B</filename> variable. 105 by the <filename>B</filename> variable.
@@ -2450,7 +2450,7 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
2450 package version (<filename><link linkend='var-PV'>PV</link></filename>) as 2450 package version (<filename><link linkend='var-PV'>PV</link></filename>) as
2451 follows: 2451 follows:
2452 <literallayout class='monospaced'> 2452 <literallayout class='monospaced'>
2453 ${WORKDIR}/${PN}-${PV} 2453 ${WORKDIR}/${PN}/${PV}
2454 </literallayout> 2454 </literallayout>
2455 As an example, assume a 2455 As an example, assume a
2456 <ulink url='&YOCTO_DOCS_DEV_URL;#source-directory'>Source Directory</ulink> top-level 2456 <ulink url='&YOCTO_DOCS_DEV_URL;#source-directory'>Source Directory</ulink> top-level
@@ -2460,7 +2460,7 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
2460 In this case, the working directory the build system uses to build 2460 In this case, the working directory the build system uses to build
2461 the <filename>db</filename> package is the following: 2461 the <filename>db</filename> package is the following:
2462 <literallayout class='monospaced'> 2462 <literallayout class='monospaced'>
2463 ~/poky/build/tmp/work/qemux86-poky-linux/db-5.1.19-r3/db-5.1.19 2463 ~/poky/build/tmp/work/qemux86-poky-linux/db/5.1.19-r3/db-5.1.19
2464 </literallayout> 2464 </literallayout>
2465 </para> 2465 </para>
2466 </glossdef> 2466 </glossdef>
@@ -2967,7 +2967,7 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
2967 For packages that are not dependent on a particular machine, 2967 For packages that are not dependent on a particular machine,
2968 <filename>WORKDIR</filename> is defined as follows: 2968 <filename>WORKDIR</filename> is defined as follows:
2969 <literallayout class='monospaced'> 2969 <literallayout class='monospaced'>
2970 ${TMPDIR}/work/${PACKAGE_ARCH}-poky-${TARGET_OS}/${PN}-${PV}-${PR} 2970 ${TMPDIR}/work/${PACKAGE_ARCH}-poky-${TARGET_OS}/${PN}/${PV}-${PR}
2971 </literallayout> 2971 </literallayout>
2972 As an example, assume a 2972 As an example, assume a
2973 <ulink url='&YOCTO_DOCS_DEV_URL;#source-directory'>Source Directory</ulink> top-level 2973 <ulink url='&YOCTO_DOCS_DEV_URL;#source-directory'>Source Directory</ulink> top-level
@@ -2977,7 +2977,7 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
2977 In this case, the working directory the build system uses to build 2977 In this case, the working directory the build system uses to build
2978 the <filename>v86d</filename> package is the following: 2978 the <filename>v86d</filename> package is the following:
2979 <literallayout class='monospaced'> 2979 <literallayout class='monospaced'>
2980 ~/poky/build/tmp/work/qemux86-poky-linux/v86d-01.9-r0 2980 ~/poky/build/tmp/work/qemux86-poky-linux/v86d/01.9-r0
2981 </literallayout> 2981 </literallayout>
2982 </para> 2982 </para>
2983 2983
@@ -2985,7 +2985,7 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
2985 For packages that are dependent on a particular machine, <filename>WORKDIR</filename> 2985 For packages that are dependent on a particular machine, <filename>WORKDIR</filename>
2986 is defined slightly different: 2986 is defined slightly different:
2987 <literallayout class='monospaced'> 2987 <literallayout class='monospaced'>
2988 ${TMPDIR}/work/${MACHINE}-poky-${TARGET_OS}/${PN}-${PV}-${PR} 2988 ${TMPDIR}/work/${MACHINE}-poky-${TARGET_OS}/${PN}/${PV}-${PR}
2989 </literallayout> 2989 </literallayout>
2990 As an example, again assume a Source Directory top-level folder 2990 As an example, again assume a Source Directory top-level folder
2991 named <filename>poky</filename> and a default Build Directory 2991 named <filename>poky</filename> and a default Build Directory
@@ -2994,7 +2994,7 @@ recipes-graphics/xorg-font/font-alias_1.0.3.bb:PR = "${INC_PR}.3"
2994 the <filename>acl</filename> recipe, which is being built for a 2994 the <filename>acl</filename> recipe, which is being built for a
2995 MIPS-based device, is the following: 2995 MIPS-based device, is the following:
2996 <literallayout class='monospaced'> 2996 <literallayout class='monospaced'>
2997 ~/poky/build/tmp/work/mips-poky-linux/acl-2.2.51-r2 2997 ~/poky/build/tmp/work/mips-poky-linux/acl/2.2.51-r2
2998 </literallayout> 2998 </literallayout>
2999 </para> 2999 </para>
3000 </glossdef> 3000 </glossdef>
diff --git a/documentation/poky-ref-manual/technical-details.xml b/documentation/poky-ref-manual/technical-details.xml
index 72689a0e22..b1d7c40799 100644
--- a/documentation/poky-ref-manual/technical-details.xml
+++ b/documentation/poky-ref-manual/technical-details.xml
@@ -236,7 +236,7 @@
236 To complicate the problem, there are things that should not be included in 236 To complicate the problem, there are things that should not be included in
237 the checksum. 237 the checksum.
238 First, there is the actual specific build path of a given task - 238 First, there is the actual specific build path of a given task -
239 the <filename>WORKDIR</filename>. 239 the <link linkend='var-WORKDIR'><filename>WORKDIR</filename></link>.
240 It does not matter if the working directory changes because it should not 240 It does not matter if the working directory changes because it should not
241 affect the output for target packages. 241 affect the output for target packages.
242 Also, the build process has the objective of making native/cross packages relocatable. 242 Also, the build process has the objective of making native/cross packages relocatable.
@@ -391,7 +391,7 @@
391 391
392 <para> 392 <para>
393 There are two types of output, one is just about creating a directory 393 There are two types of output, one is just about creating a directory
394 in <filename>WORKDIR</filename>. 394 in <link linkend='var-WORKDIR'><filename>WORKDIR</filename></link>.
395 A good example is the output of either <filename>do_install</filename> or 395 A good example is the output of either <filename>do_install</filename> or
396 <filename>do_package</filename>. 396 <filename>do_package</filename>.
397 The other type of output occurs when a set of data is merged into a shared directory 397 The other type of output occurs when a set of data is merged into a shared directory
diff --git a/documentation/poky-ref-manual/usingpoky.xml b/documentation/poky-ref-manual/usingpoky.xml
index 286b5fa783..149490969a 100644
--- a/documentation/poky-ref-manual/usingpoky.xml
+++ b/documentation/poky-ref-manual/usingpoky.xml
@@ -123,7 +123,7 @@
123 <filename>${WORKDIR}/temp/log.do_taskname.pid</filename>. 123 <filename>${WORKDIR}/temp/log.do_taskname.pid</filename>.
124 For example, the <filename>compile</filename> task for the QEMU minimal image for the x86 124 For example, the <filename>compile</filename> task for the QEMU minimal image for the x86
125 machine (<filename>qemux86</filename>) might be 125 machine (<filename>qemux86</filename>) might be
126 <filename>tmp/work/qemux86-poky-linux/core-image-minimal-1.0-r0/temp/log.do_compile.20830</filename>. 126 <filename>tmp/work/qemux86-poky-linux/core-image-minimal/1.0-r0/temp/log.do_compile.20830</filename>.
127 To see what BitBake runs to generate that log, look at the corresponding 127 To see what BitBake runs to generate that log, look at the corresponding
128 <filename>run.do_taskname.pid</filename> file located in the same directory. 128 <filename>run.do_taskname.pid</filename> file located in the same directory.
129 </para> 129 </para>