summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--handbook/development.xml6
-rw-r--r--handbook/ref-classes.xml6
-rw-r--r--handbook/ref-structure.xml6
3 files changed, 9 insertions, 9 deletions
diff --git a/handbook/development.xml b/handbook/development.xml
index d36f7f2fe..78fabac74 100644
--- a/handbook/development.xml
+++ b/handbook/development.xml
@@ -532,17 +532,17 @@ $ bitbake matchbox-desktop -c devshell
Firstly you want to install the <emphasis>foo</emphasis> package to tmp/rootfs
by doing:
</para>
- <programlisting>tmp/staging/i686-linux/usr/bin/opkg-cl -f \
+ <programlisting>tmp/sysroots/i686-linux/usr/bin/opkg-cl -f \
tmp/work/&lt;target-abi&gt;/poky-image-sato-1.0-r0/temp/opkg.conf -o \
tmp/rootfs/ update</programlisting>
<para>
then,
</para>
- <programlisting>tmp/staging/i686-linux/usr/bin/opkg-cl -f \
+ <programlisting>tmp/sysroots/i686-linux/usr/bin/opkg-cl -f \
tmp/work/&lt;target-abi&gt;/poky-image-sato-1.0-r0/temp/opkg.conf \
-o tmp/rootfs install foo
-tmp/staging/i686-linux/usr/bin/opkg-cl -f \
+tmp/sysroots/i686-linux/usr/bin/opkg-cl -f \
tmp/work/&lt;target-abi&gt;/poky-image-sato-1.0-r0/temp/opkg.conf \
-o tmp/rootfs install foo-dbg</programlisting>
<para>
diff --git a/handbook/ref-classes.xml b/handbook/ref-classes.xml
index bec0814da..dc7e38d51 100644
--- a/handbook/ref-classes.xml
+++ b/handbook/ref-classes.xml
@@ -179,8 +179,8 @@ autotools_stage_all
<para>
During staging Bitbake installs such scripts into the <filename
- class="directory">staging/</filename> directory. It also changes all
- paths to point into the <filename class="directory">staging/</filename>
+ class="directory">sysroots/</filename> directory. It also changes all
+ paths to point into the <filename class="directory">sysroots/</filename>
directory so all builds which use the script will use the correct
directories for the cross compiling layout.
</para>
@@ -206,7 +206,7 @@ autotools_stage_all
<para>
During staging Bitbake installs pkg-config data into the <filename
- class="directory">staging/</filename> directory. By making use of
+ class="directory">sysroots/</filename> directory. By making use of
sysroot functionality within pkgconfig this class no longer has to
manipulate the files.
</para>
diff --git a/handbook/ref-structure.xml b/handbook/ref-structure.xml
index 8a564e77b..a420a5921 100644
--- a/handbook/ref-structure.xml
+++ b/handbook/ref-structure.xml
@@ -216,11 +216,11 @@
</para>
</section>
- <section id='structure-build-tmp-staging'>
- <title><filename class="directory">build/tmp/staging/</filename></title>
+ <section id='structure-build-tmp-sysroots>
+ <title><filename class="directory">build/tmp/sysroots/</filename></title>
<para>
- Any package needing to share output with other packages does so within staging.
+ Any package needing to share output with other packages does so within sysroots.
This means it contains any shared header files and any shared libraries amongst
other data. It is subdivided by architecture so multiple builds can run within
the one build directory.