Renaming /stage1 to /tools.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2725 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

10 files changed, 31 insertions, 31 deletions

diff --git a/chapter06/aboutdebug.xml b/chapter06/aboutdebug.xml
index d92e0abf9..141bc93d9 100644
--- a/chapter06/aboutdebug.xml
+++ b/chapter06/aboutdebug.xml
@@ -39,7 +39,7 @@ software, a lot of disk space can be regained by removing these symbols .</para>
 <para>To remove debugging symbols from a binary (which must be an a.out
 or ELF binary), run <userinput>strip --strip-debug filename</userinput>.
 Wildcards can be used to treat multiple files (use something like
-<userinput>strip --strip-debug $LFS/stage1/bin/*</userinput>).</para>
+<userinput>strip --strip-debug $LFS/tools/bin/*</userinput>).</para>
 
 <para>For your convenience, Chapter 9 includes one simple command to strip
 all debugging symbols from all programs and libraries on your system.
diff --git a/chapter06/adjustingtoolchain.xml b/chapter06/adjustingtoolchain.xml
index 3f31d81ee..eef803d7d 100644
--- a/chapter06/adjustingtoolchain.xml
+++ b/chapter06/adjustingtoolchain.xml
@@ -12,14 +12,14 @@ retained the source and build directories from the second pass over Binutils.
 Install the adjusted linker scripts by running the following from within the
 <filename class="directory">binutils-build</filename> directory:</para>
 
-<para><screen><userinput>make -C ld INSTALL=/stage1/bin/install install-data-local</userinput></screen></para>
+<para><screen><userinput>make -C ld INSTALL=/tools/bin/install install-data-local</userinput></screen></para>
 
 <para>The linker scripts now contain
-no mention of <filename class="directory">/stage1/lib</filename> anymore.
+no mention of <filename class="directory">/tools/lib</filename> anymore.
 From now on every compiled program will link <emphasis>only</emphasis>
 against the libraries in <filename>/usr/lib</filename> and
 <filename>/lib</filename>. The extra
-<userinput>INSTALL=/stage1/bin/install</userinput> is needed because the
+<userinput>INSTALL=/tools/bin/install</userinput> is needed because the
 Makefile created during the second pass still contains the reference to
 <filename>/usr/bin/install</filename>, which we obviously haven't installed
 yet.</para>
@@ -30,9 +30,9 @@ yet.</para>
 to the new dynamic linker. Just like earlier on, we use a sed to accomplish
 this:</para>
 
-<para><screen><userinput>SPECFILE=/stage1/lib/gcc-lib/*/*/specs
-sed -e 's@/stage1/lib/ld.so.1@/lib/ld.so.1@g' \
-&nbsp;&nbsp;&nbsp;&nbsp;-e 's@/stage1/lib/ld-linux.so.2@/lib/ld-linux.so.2@g' \
+<para><screen><userinput>SPECFILE=/tools/lib/gcc-lib/*/*/specs
+sed -e 's@/tools/lib/ld.so.1@/lib/ld.so.1@g' \
+&nbsp;&nbsp;&nbsp;&nbsp;-e 's@/tools/lib/ld-linux.so.2@/lib/ld-linux.so.2@g' \
 &nbsp;&nbsp;&nbsp;&nbsp;$SPECFILE > newspecfile
 mv newspecfile $SPECFILE
 unset SPECFILE</userinput></screen></para>
@@ -42,10 +42,10 @@ before, it is a good idea to check the linker scripts and the specs file to
 ensure the intended changes were actually made.</para>
 
 <para>Note that the linker scripts will still contain a reference to
-<filename class="directory">/stage1/i686-pc-linux-gnu/lib</filename>. This
+<filename class="directory">/tools/i686-pc-linux-gnu/lib</filename>. This
 is unavoidable, but luckily does not present a problem. There are no
-libraries in that location as all the temporary stage1 libraries are
-located in <filename class="directory">/stage1/lib</filename>.</para>
+libraries in that location as all the temporary tools libraries are
+located in <filename class="directory">/tools/lib</filename>.</para>
 
 </sect1>
 
diff --git a/chapter06/changingowner.xml b/chapter06/changingowner.xml
index 5bca385d0..2c61f61e7 100644
--- a/chapter06/changingowner.xml
+++ b/chapter06/changingowner.xml
@@ -2,16 +2,16 @@
 <title>Changing ownership</title>
 <?dbhtml filename="changingowner.html" dir="chapter06"?>
 
-<para>Right now the <filename class="directory">/stage1</filename> directory
+<para>Right now the <filename class="directory">/tools</filename> directory
 is owned by the user <emphasis>lfs</emphasis>, a user that exists only on your
 host system. Although you will probably want to delete the
-<filename class="directory">/stage1</filename> directory once you have
+<filename class="directory">/tools</filename> directory once you have
 finished your LFS system, you may want to keep it around, for example to
 build more LFS systems. But if you keep the
-<filename class="directory">/stage1</filename> directory as it is, you end up
+<filename class="directory">/tools</filename> directory as it is, you end up
 with files owned by a user ID without a corresponding account. This is
 dangerous because a user account created later on could get this same user ID
-and would suddenly own the <filename class="directory">/stage1</filename>
+and would suddenly own the <filename class="directory">/tools</filename>
 directory and all the files therein, thus exposing these files to possible
 malicious manipulation.</para>
 
@@ -19,10 +19,10 @@ malicious manipulation.</para>
 your new LFS system later on when creating the <filename>/etc/passwd</filename>
 file, taking care to assign it the same user and group IDs as on your host
 system. Alternatively, you can (and the book assumes you do) assign the
-contents of the <filename class="directory">/stage1</filename> directory to
+contents of the <filename class="directory">/tools</filename> directory to
 user <emphasis>root</emphasis> by running the following command:</para>
 
-<para><screen><userinput>chown -R 0:0 /stage1</userinput></screen></para>
+<para><screen><userinput>chown -R 0:0 /tools</userinput></screen></para>
 
 <para>The command uses "0:0" instead of "root:root", because chown is unable
 to resolve the name "root" until glibc has been installed.</para>
diff --git a/chapter06/chroot.xml b/chapter06/chroot.xml
index f86ce99f1..3664b6abe 100644
--- a/chapter06/chroot.xml
+++ b/chapter06/chroot.xml
@@ -10,10 +10,10 @@ can execute the <userinput>chroot</userinput> command.</para>
 <para>Become <emphasis>root</emphasis> and run the following command
 to enter the chroot environment:</para>
 
-<para><screen><userinput>chroot $LFS /stage1/bin/env -i \
+<para><screen><userinput>chroot $LFS /tools/bin/env -i \
 &nbsp;&nbsp;&nbsp;&nbsp;HOME=/root TERM=$TERM PS1='\u:\w\$ ' \
-&nbsp;&nbsp;&nbsp;&nbsp;PATH=/bin:/usr/bin:/sbin:/usr/sbin:/stage1/bin \
-&nbsp;&nbsp;&nbsp;&nbsp;/stage1/bin/bash --login</userinput></screen>
+&nbsp;&nbsp;&nbsp;&nbsp;PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin \
+&nbsp;&nbsp;&nbsp;&nbsp;/tools/bin/bash --login</userinput></screen>
 </para>
 
 <para><screen><userinput>set +h</userinput></screen></para>
diff --git a/chapter06/createfiles.xml b/chapter06/createfiles.xml
index 4a71803b5..9c447a198 100644
--- a/chapter06/createfiles.xml
+++ b/chapter06/createfiles.xml
@@ -7,10 +7,10 @@ order to satisfy these programs, we create a number of symbolic links which
 will be replaced by real files throughout the course of this chapter when
 we're installing all the software.</para>
 
-<para><screen><userinput>ln -s /stage1/bin/{bash,pwd,cat,stty,echo,sed} /bin
-ln -s /stage1/bin/{rm,mv,chmod,chgrp} /bin
-ln -s /stage1/bin/{perl,msgfmt,xgettext,msgmerge,install} /usr/bin
-ln -s /stage1/bin/{sort,gawk,cmp} /usr/bin
+<para><screen><userinput>ln -s /tools/bin/{bash,pwd,cat,stty,echo,sed} /bin
+ln -s /tools/bin/{rm,mv,chmod,chgrp} /bin
+ln -s /tools/bin/{perl,msgfmt,xgettext,msgmerge,install} /usr/bin
+ln -s /tools/bin/{sort,gawk,cmp} /usr/bin
 ln -s bash /bin/sh
 ln -s ../usr/bin/install /bin</userinput></screen></para>
 
diff --git a/chapter06/glibc-inst.xml b/chapter06/glibc-inst.xml
index da3431883..4b6d42abf 100644
--- a/chapter06/glibc-inst.xml
+++ b/chapter06/glibc-inst.xml
@@ -5,7 +5,7 @@
 
 <para>The Glibc build system is very well self-contained and will install
 perfectly, even though our compiler specs file and linker scripts are still
-pointing at <filename>/stage1</filename>. We cannot adjust the specs and
+pointing at <filename>/tools</filename>. We cannot adjust the specs and
 ldscripts before the Glibc install, because the Glibc autoconf tests would then
 give bogus results and thus defeat our goal of achieving a clean build.</para>
 
@@ -48,7 +48,7 @@ cause the <filename>pt_chown</filename> program to be installed in the
 <listitem><para><userinput>--with-headers=/usr/include</userinput>: This
 ensures that the kernel headers in <filename>/usr/include</filename> are used
 for this build. If you don't pass this switch then the headers from
-<filename>/stage1/include</filename> are used which of course is not ideal
+<filename>/tools/include</filename> are used which of course is not ideal
 (although they should be identical). Using the switch has the advantage
 that you will be informed immediately should you have forgotten to install the
 kernel headers into <filename>/usr/include</filename>.</para></listitem>
diff --git a/chapter06/introduction.xml b/chapter06/introduction.xml
index 421c6eb8d..32c192852 100644
--- a/chapter06/introduction.xml
+++ b/chapter06/introduction.xml
@@ -25,11 +25,11 @@ optimization and see if the problem goes away.</para>
 
 <para>The order in which packages are installed in this chapter has
 to be strictly followed, to ensure that no program gets a path referring
-to <filename class="directory">/stage1</filename> hard-wired into it.
+to <filename class="directory">/tools</filename> hard-wired into it.
 For the same reason, <emphasis>do not </emphasis> compile packages
 in parallel. Compiling in parallel may save you some time (especially on
 dual-CPU machines), but it could result in a program containing a
-hard-wired path to <filename class="directory">/stage1</filename>,
+hard-wired path to <filename class="directory">/tools</filename>,
 which will cause the program to stop working when the static directory
 is removed.</para>
 
diff --git a/chapter06/man-inst.xml b/chapter06/man-inst.xml
index 5862f110c..d57b1924b 100644
--- a/chapter06/man-inst.xml
+++ b/chapter06/man-inst.xml
@@ -28,7 +28,7 @@ Unfortunately, the configuration script picks the last location in PATH
 rather than the first place a program is found. By appending
 <emphasis>/usr/bin:/bin</emphasis> to PATH for the
 <userinput>./configure</userinput> command, we ensure that Man doesn't
-use the programs in the <filename class="directory">/stage1</filename>
+use the programs in the <filename class="directory">/tools</filename>
 directory.</para>
 
 <para>Now prepare Man for compilation:</para>
diff --git a/chapter06/pwdgroup.xml b/chapter06/pwdgroup.xml
index c26f90ae5..993228e86 100644
--- a/chapter06/pwdgroup.xml
+++ b/chapter06/pwdgroup.xml
@@ -46,7 +46,7 @@ the LSB (<ulink url="http://www.linuxbase.org"/>) recommends only a group
 chosen freely by the user, as well-written packages don't depend on GID
 numbers but use the group's name.</para>
 
-<para><screen><userinput>exec /stage1/bin/bash --login
+<para><screen><userinput>exec /tools/bin/bash --login
 set +h</userinput></screen></para>
 
 </sect1>
diff --git a/chapter06/revisedchroot.xml b/chapter06/revisedchroot.xml
index 61294adb3..cf215a677 100644
--- a/chapter06/revisedchroot.xml
+++ b/chapter06/revisedchroot.xml
@@ -6,13 +6,13 @@
 it, you need to run the following modified chroot command. The one at the
 beginning of this chapter might not work anymore (if your host distribution
 was based on Glibc-2.2.x or older, the programs in <filename
-class="directory">/stage1/bin</filename>, such as <filename>bash</filename>,
+class="directory">/tools/bin</filename>, such as <filename>bash</filename>,
 will not work anymore). The following chroot command will work regardless
 of your host distribution's Glibc version.</para>
 
 <para>Additionally, now that all software has been installed there is no
 need to use anything from the <filename
-class="directory">/stage1</filename> directory anymore.</para>
+class="directory">/tools</filename> directory anymore.</para>
 
 <para><screen><userinput>chroot $LFS /usr/bin/env -i \
 &nbsp;&nbsp;&nbsp;&nbsp;HOME=/root TERM=$TERM PS1='\u:\w\$ ' \