diff options
author | Joshua Lock <josh@linux.intel.com> | 2010-02-26 12:31:31 +0000 |
---|---|---|
committer | Joshua Lock <josh@linux.intel.com> | 2010-02-26 12:31:31 +0000 |
commit | fce742aac60051d72d21e7ffa53e5661245793d5 (patch) | |
tree | 2ccc9f7bb69c358e808cb5bdd09b6deb6504d15a /handbook | |
parent | 3e39dac1cc0f293dba97331e7e6d7f0111030c50 (diff) | |
download | poky-fce742aac60051d72d21e7ffa53e5661245793d5.tar.gz |
handbook: tmp/staging was renamed to tmp/sysroots - update references
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Diffstat (limited to 'handbook')
-rw-r--r-- | handbook/development.xml | 6 | ||||
-rw-r--r-- | handbook/ref-classes.xml | 6 | ||||
-rw-r--r-- | handbook/ref-structure.xml | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/handbook/development.xml b/handbook/development.xml index d36f7f2fe0..78fabac743 100644 --- a/handbook/development.xml +++ b/handbook/development.xml | |||
@@ -532,17 +532,17 @@ $ bitbake matchbox-desktop -c devshell | |||
532 | Firstly you want to install the <emphasis>foo</emphasis> package to tmp/rootfs | 532 | Firstly you want to install the <emphasis>foo</emphasis> package to tmp/rootfs |
533 | by doing: | 533 | by doing: |
534 | </para> | 534 | </para> |
535 | <programlisting>tmp/staging/i686-linux/usr/bin/opkg-cl -f \ | 535 | <programlisting>tmp/sysroots/i686-linux/usr/bin/opkg-cl -f \ |
536 | tmp/work/<target-abi>/poky-image-sato-1.0-r0/temp/opkg.conf -o \ | 536 | tmp/work/<target-abi>/poky-image-sato-1.0-r0/temp/opkg.conf -o \ |
537 | tmp/rootfs/ update</programlisting> | 537 | tmp/rootfs/ update</programlisting> |
538 | <para> | 538 | <para> |
539 | then, | 539 | then, |
540 | </para> | 540 | </para> |
541 | <programlisting>tmp/staging/i686-linux/usr/bin/opkg-cl -f \ | 541 | <programlisting>tmp/sysroots/i686-linux/usr/bin/opkg-cl -f \ |
542 | tmp/work/<target-abi>/poky-image-sato-1.0-r0/temp/opkg.conf \ | 542 | tmp/work/<target-abi>/poky-image-sato-1.0-r0/temp/opkg.conf \ |
543 | -o tmp/rootfs install foo | 543 | -o tmp/rootfs install foo |
544 | 544 | ||
545 | tmp/staging/i686-linux/usr/bin/opkg-cl -f \ | 545 | tmp/sysroots/i686-linux/usr/bin/opkg-cl -f \ |
546 | tmp/work/<target-abi>/poky-image-sato-1.0-r0/temp/opkg.conf \ | 546 | tmp/work/<target-abi>/poky-image-sato-1.0-r0/temp/opkg.conf \ |
547 | -o tmp/rootfs install foo-dbg</programlisting> | 547 | -o tmp/rootfs install foo-dbg</programlisting> |
548 | <para> | 548 | <para> |
diff --git a/handbook/ref-classes.xml b/handbook/ref-classes.xml index bec0814daf..dc7e38d51e 100644 --- a/handbook/ref-classes.xml +++ b/handbook/ref-classes.xml | |||
@@ -179,8 +179,8 @@ autotools_stage_all | |||
179 | 179 | ||
180 | <para> | 180 | <para> |
181 | During staging Bitbake installs such scripts into the <filename | 181 | During staging Bitbake installs such scripts into the <filename |
182 | class="directory">staging/</filename> directory. It also changes all | 182 | class="directory">sysroots/</filename> directory. It also changes all |
183 | paths to point into the <filename class="directory">staging/</filename> | 183 | paths to point into the <filename class="directory">sysroots/</filename> |
184 | directory so all builds which use the script will use the correct | 184 | directory so all builds which use the script will use the correct |
185 | directories for the cross compiling layout. | 185 | directories for the cross compiling layout. |
186 | </para> | 186 | </para> |
@@ -206,7 +206,7 @@ autotools_stage_all | |||
206 | 206 | ||
207 | <para> | 207 | <para> |
208 | During staging Bitbake installs pkg-config data into the <filename | 208 | During staging Bitbake installs pkg-config data into the <filename |
209 | class="directory">staging/</filename> directory. By making use of | 209 | class="directory">sysroots/</filename> directory. By making use of |
210 | sysroot functionality within pkgconfig this class no longer has to | 210 | sysroot functionality within pkgconfig this class no longer has to |
211 | manipulate the files. | 211 | manipulate the files. |
212 | </para> | 212 | </para> |
diff --git a/handbook/ref-structure.xml b/handbook/ref-structure.xml index 8a564e77b3..a420a59218 100644 --- a/handbook/ref-structure.xml +++ b/handbook/ref-structure.xml | |||
@@ -216,11 +216,11 @@ | |||
216 | </para> | 216 | </para> |
217 | </section> | 217 | </section> |
218 | 218 | ||
219 | <section id='structure-build-tmp-staging'> | 219 | <section id='structure-build-tmp-sysroots> |
220 | <title><filename class="directory">build/tmp/staging/</filename></title> | 220 | <title><filename class="directory">build/tmp/sysroots/</filename></title> |
221 | 221 | ||
222 | <para> | 222 | <para> |
223 | Any package needing to share output with other packages does so within staging. | 223 | Any package needing to share output with other packages does so within sysroots. |
224 | This means it contains any shared header files and any shared libraries amongst | 224 | This means it contains any shared header files and any shared libraries amongst |
225 | other data. It is subdivided by architecture so multiple builds can run within | 225 | other data. It is subdivided by architecture so multiple builds can run within |
226 | the one build directory. | 226 | the one build directory. |