diff options
| author | Alex Gronenwoud <alex@linuxfromscratch.org> | 2003-09-02 22:03:51 +0000 |
|---|---|---|
| committer | Alex Gronenwoud <alex@linuxfromscratch.org> | 2003-09-02 22:03:51 +0000 |
| commit | 148bb04f8022ae1ea657d36ef04ff062bd023206 (patch) | |
| tree | 163a20e0d2845c8e3d95609cf02b4f7b05825c7b /chapter05 | |
| parent | 40add9445978e2619b7601d4536179b9ab2c065a (diff) | |
Renaming /stage1 to /tools.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2725 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Diffstat (limited to 'chapter05')
32 files changed, 83 insertions, 77 deletions
diff --git a/chapter05/adding-user.xml b/chapter05/adding-user.xml index 8e4881815..d8dd85422 100644 --- a/chapter05/adding-user.xml +++ b/chapter05/adding-user.xml @@ -14,10 +14,10 @@ issue the following commands to add the new user:</para> passwd lfs</userinput></screen></para> <para>Now grant this new user <emphasis>lfs</emphasis> full access to -<filename class="directory">$LFS/stage1</filename> by giving it ownership +<filename class="directory">$LFS/tools</filename> by giving it ownership of the directory:</para> -<para><screen><userinput>chown lfs $LFS/stage1</userinput></screen></para> +<para><screen><userinput>chown lfs $LFS/tools</userinput></screen></para> <para>Next, login as user <emphasis>lfs</emphasis>. This can be done via a virtual console, through a display manager, or with the following substitute diff --git a/chapter05/bash-inst.xml b/chapter05/bash-inst.xml index a8dc236f2..eab96f228 100644 --- a/chapter05/bash-inst.xml +++ b/chapter05/bash-inst.xml @@ -10,7 +10,7 @@ patch:</para> <para>Now prepare Bash for compilation:</para> -<para><screen><userinput>./configure --prefix=/stage1 --with-curses</userinput></screen></para> +<para><screen><userinput>./configure --prefix=/tools --with-curses</userinput></screen></para> <para>Compile the program:</para> @@ -27,7 +27,7 @@ patch:</para> <para>And make a link for the programs that use <userinput>sh</userinput> for a shell:</para> -<para><screen><userinput>ln -s bash /stage1/bin/sh</userinput></screen></para> +<para><screen><userinput>ln -s bash /tools/bin/sh</userinput></screen></para> </sect2> diff --git a/chapter05/binutils-pass1-inst.xml b/chapter05/binutils-pass1-inst.xml index 53c37be56..00a5c340d 100644 --- a/chapter05/binutils-pass1-inst.xml +++ b/chapter05/binutils-pass1-inst.xml @@ -22,14 +22,14 @@ cd ../binutils-build</userinput></screen></para> <para>Next, prepare Binutils to be compiled:</para> <para><screen><userinput>../binutils-&binutils-version;/configure \ - --prefix=/stage1 --disable-nls</userinput></screen></para> + --prefix=/tools --disable-nls</userinput></screen></para> <para>The meaning of the configure switches:</para> <itemizedlist> -<listitem><para><userinput>--prefix=/stage1</userinput>: This tells the +<listitem><para><userinput>--prefix=/tools</userinput>: This tells the configure script to prepare to install the Binutils programs in the -<filename>/stage1</filename> directory.</para></listitem> +<filename>/tools</filename> directory.</para></listitem> <listitem><para><userinput>--disable-nls</userinput>: This disables internationalization (a word often shortened to i18n). We don't need this for our static programs and <emphasis>nls</emphasis> often causes problems @@ -57,7 +57,7 @@ statically.</para></listitem> on:</para> <para><screen><userinput>make -C ld clean -make -C ld LIB_PATH=/stage1/lib</userinput></screen></para> +make -C ld LIB_PATH=/tools/lib</userinput></screen></para> <para><emphasis>Do not yet remove</emphasis> the Binutils build and source directories. You will need them again in their current state a bit further on diff --git a/chapter05/binutils-pass2-inst.xml b/chapter05/binutils-pass2-inst.xml index 759fe311b..384c8f455 100644 --- a/chapter05/binutils-pass2-inst.xml +++ b/chapter05/binutils-pass2-inst.xml @@ -10,8 +10,8 @@ cd ../binutils-build</userinput></screen></para> <para>Now prepare Binutils to be compiled:</para> -<para><screen><userinput>../binutils-&binutils-version;/configure --prefix=/stage1 \ - --enable-shared --with-lib-path=/stage1/lib</userinput></screen></para> +<para><screen><userinput>../binutils-&binutils-version;/configure --prefix=/tools \ + --enable-shared --with-lib-path=/tools/lib</userinput></screen></para> <para>Before starting to build Binutils, remember to unset any environment variables that override the default optimization flags.</para> diff --git a/chapter05/bzip2-inst.xml b/chapter05/bzip2-inst.xml index bdfb951ab..ad250d87b 100644 --- a/chapter05/bzip2-inst.xml +++ b/chapter05/bzip2-inst.xml @@ -6,7 +6,7 @@ <para>The Bzip2 package doesn't contain a <userinput>configure</userinput> script. Compile and install it with a straightforward:</para> -<para><screen><userinput>make PREFIX=/stage1 install</userinput></screen></para> +<para><screen><userinput>make PREFIX=/tools install</userinput></screen></para> </sect2> diff --git a/chapter05/chapter05.xml b/chapter05/chapter05.xml index 7d8cd2951..bcb86198d 100644 --- a/chapter05/chapter05.xml +++ b/chapter05/chapter05.xml @@ -4,7 +4,7 @@ &c5-introduction; &c5-whystatic; -&c5-creatingstage1dir; +&c5-creatingtoolsdir; &c5-addinguser; &c5-settingenviron; &c5-binutils-pass1; @@ -45,8 +45,8 @@ can throw away some unnecessary things. The executables and libraries you have built so far contain about 130 MB of unneeded debugging symbols. Remove those symbols like this:</para> -<para><screen><userinput>strip --strip-unneeded /stage1/{,s}bin/* -strip --strip-debug /stage1/lib/*</userinput></screen></para> +<para><screen><userinput>strip --strip-unneeded /tools/{,s}bin/* +strip --strip-debug /tools/lib/*</userinput></screen></para> <para>The first of the above commands will skip some twenty files, reporting that it doesn't recognize their file format. Most of them are scripts instead @@ -59,8 +59,8 @@ destroyed and you would have to build Glibc all over again.</para> <para>To save another couple of megabytes, you can throw away the documentation and some of the bigger unneeded programs:</para> -<para><screen><userinput>rm -r /stage1/share/{doc,info,man} -rm /stage1/bin/{addr2line,gprof,nm,size,strings,strip}</userinput></screen></para> +<para><screen><userinput>rm -r /tools/share/{doc,info,man} +rm /tools/bin/{addr2line,gprof,nm,size,strings,strip}</userinput></screen></para> <para>You will now need to have at least 700 MB of free space on your LFS filesystem to be able to build and install Glibc in the next phase.</para> diff --git a/chapter05/coreutils-inst.xml b/chapter05/coreutils-inst.xml index 455185064..277c045e3 100644 --- a/chapter05/coreutils-inst.xml +++ b/chapter05/coreutils-inst.xml @@ -5,7 +5,7 @@ <para>Prepare Coreutils to be compiled:</para> -<para><screen><userinput>./configure --prefix=/stage1</userinput></screen></para> +<para><screen><userinput>./configure --prefix=/tools</userinput></screen></para> <para>Compile the package:</para> diff --git a/chapter05/creatingstage1dir.xml b/chapter05/creatingstage1dir.xml index 4ff58628c..0d466c034 100644 --- a/chapter05/creatingstage1dir.xml +++ b/chapter05/creatingstage1dir.xml @@ -1,24 +1,30 @@ -<sect1 id="ch05-creatingstage1dir"> -<title>Creating the $LFS/stage1 directory</title> -<?dbhtml filename="creatingstage1dir.html" dir="chapter05"?> +<sect1 id="ch05-creatingtoolsdir"> +<title>Creating the $LFS/tools directory</title> +<?dbhtml filename="creatingtoolsdir.html" dir="chapter05"?> <para>All programs compiled in this chapter will be installed under <filename -class="directory">$LFS/stage1</filename> to keep them separate from the +class="directory">$LFS/tools</filename> to keep them separate from the programs compiled in the next chapter. The programs compiled here are only temporary tools and won't be a part of the final LFS system and by keeping them -in a separate directory, we can later easily throw them away. Create the -required directory by running the following:</para> +in a separate directory, we can later easily throw them away.</para> -<para><screen><userinput>mkdir $LFS/stage1</userinput></screen></para> +<para>If later you wish to search through the binaries of your system to see +what files they make use of or link against, then to make this searching easier +you may want to choose a unique name. Instead of the simple "tools" you could +use something like "tools-for-lfs".</para> -<para>The next step is to create a <filename>/stage1</filename> symlink on +<para>Create the required directory by running the following:</para> + +<para><screen><userinput>mkdir $LFS/tools</userinput></screen></para> + +<para>The next step is to create a <filename>/tools</filename> symlink on your host system. It will point to the directory we just created on the LFS partition:</para> -<para><screen><userinput>ln -s $LFS/stage1 /</userinput></screen></para> +<para><screen><userinput>ln -s $LFS/tools /</userinput></screen></para> <para>This symlink enables us to compile our toolchain so that it always -refers to <filename>/stage1</filename>, meaning that the compiler, assembler +refers to <filename>/tools</filename>, meaning that the compiler, assembler and linker will work both in this chapter (when we are still using some tools from the host) <emphasis>and</emphasis> in the next (when we are chrooted to the LFS partition).</para> diff --git a/chapter05/dejagnu-inst.xml b/chapter05/dejagnu-inst.xml index 0a948fdb9..c1794e6ac 100644 --- a/chapter05/dejagnu-inst.xml +++ b/chapter05/dejagnu-inst.xml @@ -5,7 +5,7 @@ <para>Prepare DejaGNU to be compiled:</para> -<para><screen><userinput>./configure --prefix=/stage1</userinput></screen></para> +<para><screen><userinput>./configure --prefix=/tools</userinput></screen></para> <para>Build and install the package:</para> diff --git a/chapter05/diffutils-inst.xml b/chapter05/diffutils-inst.xml index edaf67440..2005334d8 100644 --- a/chapter05/diffutils-inst.xml +++ b/chapter05/diffutils-inst.xml @@ -5,7 +5,7 @@ <para>Prepare Diffutils to be compiled:</para> -<para><screen><userinput>./configure --prefix=/stage1</userinput></screen></para> +<para><screen><userinput>./configure --prefix=/tools</userinput></screen></para> <para>Compile the package:</para> diff --git a/chapter05/expect-inst.xml b/chapter05/expect-inst.xml index 2daab650c..73fefd214 100644 --- a/chapter05/expect-inst.xml +++ b/chapter05/expect-inst.xml @@ -12,7 +12,7 @@ GCC test suite run.</para> <para>Now prepare Expect to be compiled:</para> -<para><screen><userinput>./configure --prefix=/stage1 --with-tcl=/stage1/lib --with-x=no</userinput></screen></para> +<para><screen><userinput>./configure --prefix=/tools --with-tcl=/tools/lib --with-x=no</userinput></screen></para> <para>Build, test, and install the package:</para> diff --git a/chapter05/findutils-inst.xml b/chapter05/findutils-inst.xml index 650a7caf8..a43cf15bf 100644 --- a/chapter05/findutils-inst.xml +++ b/chapter05/findutils-inst.xml @@ -5,7 +5,7 @@ <para>Prepare Findutils to be compiled:</para> -<para><screen><userinput>./configure --prefix=/stage1</userinput></screen></para> +<para><screen><userinput>./configure --prefix=/tools</userinput></screen></para> <para>Compile the package:</para> diff --git a/chapter05/gawk-inst.xml b/chapter05/gawk-inst.xml index b60048eb1..d77249ada 100644 --- a/chapter05/gawk-inst.xml +++ b/chapter05/gawk-inst.xml @@ -5,7 +5,7 @@ <para>Prepare Gawk to be compiled:</para> -<para><screen><userinput>./configure --prefix=/stage1</userinput></screen></para> +<para><screen><userinput>./configure --prefix=/tools</userinput></screen></para> <para>Compile the package:</para> diff --git a/chapter05/gcc-pass1-inst.xml b/chapter05/gcc-pass1-inst.xml index 37cf4836e..00be02adc 100644 --- a/chapter05/gcc-pass1-inst.xml +++ b/chapter05/gcc-pass1-inst.xml @@ -20,15 +20,15 @@ cd ../gcc-build</userinput></screen></para> <para>Prepare GCC to be compiled:</para> -<para><screen><userinput>../gcc-&gcc-version;/configure --prefix=/stage1 \ - --with-local-prefix=/stage1 \ +<para><screen><userinput>../gcc-&gcc-version;/configure --prefix=/tools \ + --with-local-prefix=/tools \ --disable-nls --enable-shared \ --enable-languages=c</userinput></screen></para> <para>The meaning of the new configure options:</para> <itemizedlist> -<listitem><para><userinput>--with-local-prefix=/stage1</userinput>: The +<listitem><para><userinput>--with-local-prefix=/tools</userinput>: The purpose of this switch is to remove <filename>/usr/local/include</filename> from <userinput>gcc</userinput>'s include search path. This is not absolutely essential, but we want to try and minimize the influence from the host system, @@ -71,14 +71,14 @@ compiled correctly.</para></listitem> <para><screen><userinput>make install</userinput></screen></para> <para>As a finishing touch we'll create the <filename -class="symlink">/stage1/bin/cc</filename> symlink. Many programs and +class="symlink">/tools/bin/cc</filename> symlink. Many programs and scripts run <userinput>cc</userinput> instead of <userinput>gcc</userinput>, a thing meant to keep programs generic and therefore usable on all kinds of Unix systems. Not everybody has the GNU C compiler installed. Simply running <userinput>cc</userinput> leaves the system administrator free to decide what C compiler to install, as long as there's a symlink pointing to it:</para> -<para><screen><userinput>ln -sf gcc /stage1/bin/cc</userinput></screen></para> +<para><screen><userinput>ln -sf gcc /tools/bin/cc</userinput></screen></para> </sect2> diff --git a/chapter05/gcc-pass2-inst.xml b/chapter05/gcc-pass2-inst.xml index f014658d7..1657d067e 100644 --- a/chapter05/gcc-pass2-inst.xml +++ b/chapter05/gcc-pass2-inst.xml @@ -24,7 +24,7 @@ fixed headers from the host system, which would most likely not match the Glibc version actually used for the LFS system.</para> <para>The last patch changes GCC's default location of the dynamic linker, -a simple substitution of "/lib/ld-linux.so.2" with "/stage1/lib/ld-linux.so.2" +a simple substitution of "/lib/ld-linux.so.2" with "/tools/lib/ld-linux.so.2" in <filename>config/i386/linux.h</filename>. Patching now rather than adjusting the specs file after installation ensures that our new dynamic linker gets used during the actual build of GCC. That is, all the final (and temporary) @@ -40,8 +40,8 @@ variables that override the default optimization flags.</para> <para>Now prepare GCC to be compiled:</para> -<para><screen><userinput>../gcc-&gcc-version;/configure --prefix=/stage1 \ - --with-local-prefix=/stage1 \ +<para><screen><userinput>../gcc-&gcc-version;/configure --prefix=/tools \ + --with-local-prefix=/tools \ --enable-clocale=gnu --enable-shared \ --enable-threads=posix --enable-__cxa_atexit \ --enable-languages=c,c++</userinput></screen></para> diff --git a/chapter05/gettext-inst.xml b/chapter05/gettext-inst.xml index 4aa9bae58..dd93ed683 100644 --- a/chapter05/gettext-inst.xml +++ b/chapter05/gettext-inst.xml @@ -5,7 +5,7 @@ <para>Prepare Gettext to be compiled:</para> -<para><screen><userinput>./configure --prefix=/stage1</userinput></screen></para> +<para><screen><userinput>./configure --prefix=/tools</userinput></screen></para> <para>Compile the programs:</para> diff --git a/chapter05/glibc-inst.xml b/chapter05/glibc-inst.xml index 6e57b51d5..7e433d3db 100644 --- a/chapter05/glibc-inst.xml +++ b/chapter05/glibc-inst.xml @@ -21,8 +21,8 @@ is putting the stability of your system at risk.</para> complain about the absence of <filename>/etc/ld.so.conf</filename>. Fix this annoying little error with:</para> -<para><screen><userinput>mkdir /stage1/etc -touch /stage1/etc/ld.so.conf</userinput></screen></para> +<para><screen><userinput>mkdir /tools/etc +touch /tools/etc/ld.so.conf</userinput></screen></para> <para>Also, Glibc has a subtle problem when compiled with GCC 3.3.1. Apply the following patch to fix this:</para> @@ -38,10 +38,10 @@ cd ../glibc-build</userinput></screen></para> <para>Next, prepare Glibc to be compiled:</para> -<para><screen><userinput>../glibc-&glibc-version;/configure --prefix=/stage1 \ +<para><screen><userinput>../glibc-&glibc-version;/configure --prefix=/tools \ --disable-profile --enable-add-ons \ - --with-headers=/stage1/include \ - --with-binutils=/stage1/bin \ + --with-headers=/tools/include \ + --with-binutils=/tools/bin \ --without-gd</userinput></screen></para> <para>The meaning of the new configure options:</para> @@ -54,8 +54,8 @@ plan to do profiling.</para></listitem> <listitem><para><userinput>--enable-add-ons</userinput>: This enables any add-ons that were installed with Glibc, in our case Linuxthreads.</para></listitem> -<listitem><para><userinput>--with-binutils=/stage1/bin</userinput> and -<userinput>--with-headers=/stage1/include</userinput>: Strictly speaking +<listitem><para><userinput>--with-binutils=/tools/bin</userinput> and +<userinput>--with-headers=/tools/include</userinput>: Strictly speaking these switches are not required. But they ensure nothing can go wrong with regard to what kernel headers and Binutils programs get used during the Glibc build.</para></listitem> diff --git a/chapter05/grep-inst.xml b/chapter05/grep-inst.xml index 2364146a7..e72404e54 100644 --- a/chapter05/grep-inst.xml +++ b/chapter05/grep-inst.xml @@ -5,7 +5,7 @@ <para>Prepare Grep to be compiled:</para> -<para><screen><userinput>./configure --prefix=/stage1 \ +<para><screen><userinput>./configure --prefix=/tools \ --disable-perl-regexp --with-included-regex</userinput></screen></para> <para>Compile the programs:</para> diff --git a/chapter05/gzip-inst.xml b/chapter05/gzip-inst.xml index bd0c4964e..92f254a6a 100644 --- a/chapter05/gzip-inst.xml +++ b/chapter05/gzip-inst.xml @@ -5,7 +5,7 @@ <para>Prepare Gzip to be compiled:</para> -<para><screen><userinput>./configure --prefix=/stage1</userinput></screen></para> +<para><screen><userinput>./configure --prefix=/tools</userinput></screen></para> <para>Compile the package:</para> diff --git a/chapter05/introduction.xml b/chapter05/introduction.xml index aecb28cfb..6f1ba6396 100644 --- a/chapter05/introduction.xml +++ b/chapter05/introduction.xml @@ -12,7 +12,7 @@ linker and libraries), and then use this to build all the other essential tools.</para> <para>The files compiled in this chapter will be installed under the -<filename class="directory">$LFS/stage1</filename> directory, +<filename class="directory">$LFS/tools</filename> directory, to keep them separate from the files installed in the next chapter. Since the packages compiled here are merely temporary, we don't want them to pollute the soon-to-be LFS system.</para> diff --git a/chapter05/kernelheaders-inst.xml b/chapter05/kernelheaders-inst.xml index 96f629dd0..15cf446ac 100644 --- a/chapter05/kernelheaders-inst.xml +++ b/chapter05/kernelheaders-inst.xml @@ -27,20 +27,20 @@ symlink:</para> <para>Install the platform-specific header files:</para> -<para><screen><userinput>mkdir /stage1/include/asm -cp include/asm/* /stage1/include/asm -cp -R include/asm-generic /stage1/include</userinput></screen></para> +<para><screen><userinput>mkdir /tools/include/asm +cp include/asm/* /tools/include/asm +cp -R include/asm-generic /tools/include</userinput></screen></para> <para>Install the cross-platform kernel header files:</para> -<para><screen><userinput>cp -R include/linux /stage1/include</userinput></screen></para> +<para><screen><userinput>cp -R include/linux /tools/include</userinput></screen></para> <para>There are a few kernel header files which make use of the <filename>autoconf.h</filename> header file. Since we do not yet configure the kernel, we need to create this file ourselves in order to avoid compilation failures. Create an empty <filename>autoconf.h</filename> file:</para> -<para><screen><userinput>touch /stage1/include/linux/autoconf.h</userinput></screen></para> +<para><screen><userinput>touch /tools/include/linux/autoconf.h</userinput></screen></para> </sect2> diff --git a/chapter05/lockingglibc.xml b/chapter05/lockingglibc.xml index 694e529b3..a8360ca51 100644 --- a/chapter05/lockingglibc.xml +++ b/chapter05/lockingglibc.xml @@ -17,23 +17,23 @@ directory:</para> pass of Binutils, and contain no mention of <filename>/lib</filename>, <filename>/usr/lib</filename> or <filename>/usr/local/lib</filename>. From this point onwards everything will link <emphasis>only</emphasis> -against the libraries in <filename>/stage1/lib</filename>.</para> +against the libraries in <filename>/tools/lib</filename>.</para> <para>You can now remove Binutils' build and source directories.</para> <para>The other thing to do is to amend our GCC specs file so that it points to the new dynamic linker. A simple sed will accomplish this:</para> -<para><screen><userinput>SPECFILE=/stage1/lib/gcc-lib/*/*/specs -sed -e 's@/lib/ld.so.1@/stage1/lib/ld.so.1@g' \ - -e 's@/lib/ld-linux.so.2@/stage1/lib/ld-linux.so.2@g' \ +<para><screen><userinput>SPECFILE=/tools/lib/gcc-lib/*/*/specs +sed -e 's@/lib/ld.so.1@/tools/lib/ld.so.1@g' \ + -e 's@/lib/ld-linux.so.2@/tools/lib/ld-linux.so.2@g' \ $SPECFILE > tempspecfile mv tempspecfile $SPECFILE unset SPECFILE</userinput></screen></para> <para>We recommend that you cut-and-paste the above rather than try and type it all in. Or you can edit the specs file by hand if you want to: just replace -"/lib/ld-linux.so.2" with "/stage1/lib/ld-linux.so.2".</para> +"/lib/ld-linux.so.2" with "/tools/lib/ld-linux.so.2".</para> <para>Lastly, there is a possibility that some include files from the host system have found their way into gcc's private include dir. This can happen @@ -41,7 +41,7 @@ because of GCC's "fixincludes" process which part of the GCC build. We'll explain more about this further on in this chapter. For now, run the following commands to eliminate this possibility.</para> -<para><screen><userinput>rm -f /stage1/lib/gcc-lib/*/*/include/{pthread.h,bits/sigthread.h}</userinput></screen></para> +<para><screen><userinput>rm -f /tools/lib/gcc-lib/*/*/include/{pthread.h,bits/sigthread.h}</userinput></screen></para> <para>This completes the installation of the self-contained toolchain, which can now be used to build the rest of the temporary tools.</para> diff --git a/chapter05/make-inst.xml b/chapter05/make-inst.xml index 61b64de51..7f5d2b18e 100644 --- a/chapter05/make-inst.xml +++ b/chapter05/make-inst.xml @@ -5,7 +5,7 @@ <para>Prepare Make to be compiled:</para> -<para><screen><userinput>./configure --prefix=/stage1</userinput></screen></para> +<para><screen><userinput>./configure --prefix=/tools</userinput></screen></para> <para>Compile the program:</para> diff --git a/chapter05/ncurses-inst.xml b/chapter05/ncurses-inst.xml index e5a926e17..74cf6237b 100644 --- a/chapter05/ncurses-inst.xml +++ b/chapter05/ncurses-inst.xml @@ -14,7 +14,7 @@ deprecated headers.</para> <para>Now prepare Ncurses to be compiled:</para> -<para><screen><userinput>./configure --prefix=/stage1 --with-shared \ +<para><screen><userinput>./configure --prefix=/tools --with-shared \ --without-debug --without-ada</userinput></screen></para> <para>Compile the programs and libraries:</para> diff --git a/chapter05/patch-inst.xml b/chapter05/patch-inst.xml index bdc9f9fb8..3b5badbb3 100644 --- a/chapter05/patch-inst.xml +++ b/chapter05/patch-inst.xml @@ -5,7 +5,7 @@ <para>Prepare Patch to be compiled:</para> -<para><screen><userinput>CPPFLAGS=-D_GNU_SOURCE ./configure --prefix=/stage1</userinput></screen></para> +<para><screen><userinput>CPPFLAGS=-D_GNU_SOURCE ./configure --prefix=/tools</userinput></screen></para> <para>The preprocessor flag <userinput>-D_GNU_SOURCE</userinput> is only needed on the PowerPC platform. On other architectures you can leave it out.</para> diff --git a/chapter05/perl-inst.xml b/chapter05/perl-inst.xml index 99292f86c..e093cb96c 100644 --- a/chapter05/perl-inst.xml +++ b/chapter05/perl-inst.xml @@ -13,7 +13,7 @@ echo 'static_ext="IO re Fcntl"' >> hints/linux.sh</userinput></screen></para> <para>Now prepare Perl for compilation:</para> -<para><screen><userinput>./configure.gnu --prefix=/stage1</userinput></screen></para> +<para><screen><userinput>./configure.gnu --prefix=/tools</userinput></screen></para> <para>Compile only the required tools:</para> @@ -21,9 +21,9 @@ echo 'static_ext="IO re Fcntl"' >> hints/linux.sh</userinput></screen></para> <para>Then copy these tools and their libraries:</para> -<para><screen><userinput>cp perl pod/pod2man /stage1/bin -mkdir -p /stage1/lib/perl5/5.8.0 -cp -R lib/* /stage1/lib/perl5/5.8.0</userinput></screen></para> +<para><screen><userinput>cp perl pod/pod2man /tools/bin +mkdir -p /tools/lib/perl5/5.8.0 +cp -R lib/* /tools/lib/perl5/5.8.0</userinput></screen></para> </sect2> diff --git a/chapter05/sed-inst.xml b/chapter05/sed-inst.xml index 79ccf256c..9a5bf4111 100644 --- a/chapter05/sed-inst.xml +++ b/chapter05/sed-inst.xml @@ -5,7 +5,7 @@ <para>Prepare Sed to be compiled:</para> -<para><screen><userinput>./configure --prefix=/stage1</userinput></screen></para> +<para><screen><userinput>./configure --prefix=/tools</userinput></screen></para> <para>Compile the program:</para> diff --git a/chapter05/setting-environment.xml b/chapter05/setting-environment.xml index 20d8f7ea1..a43e8d492 100644 --- a/chapter05/setting-environment.xml +++ b/chapter05/setting-environment.xml @@ -10,7 +10,7 @@ set +h umask 022 LFS=/mnt/lfs LC_ALL=POSIX -PATH=/stage1/bin:$PATH +PATH=/tools/bin:$PATH export LFS LC_ALL PATH EOF @@ -42,7 +42,7 @@ may cause trouble if you exit the chroot environment and wish to return later. By setting LC_ALL to "POSIX" (or "C", the two are equivalent) we ensure that everything will work as expected in the chroot environment.</para> -<para>We prepend <filename>/stage1/bin</filename> to the standard PATH so +<para>We prepend <filename>/tools/bin</filename> to the standard PATH so that, as we move along through this chapter, the tools we build will get used during the rest of the building process.</para> diff --git a/chapter05/tar-inst.xml b/chapter05/tar-inst.xml index 3a17903e7..be4c2f075 100644 --- a/chapter05/tar-inst.xml +++ b/chapter05/tar-inst.xml @@ -5,7 +5,7 @@ <para>Prepare Tar to be compiled:</para> -<para><screen><userinput>./configure --prefix=/stage1</userinput></screen></para> +<para><screen><userinput>./configure --prefix=/tools</userinput></screen></para> <para>Compile the programs:</para> diff --git a/chapter05/tcl-inst.xml b/chapter05/tcl-inst.xml index e5528c884..a0be4332d 100644 --- a/chapter05/tcl-inst.xml +++ b/chapter05/tcl-inst.xml @@ -11,7 +11,7 @@ essential, to know that our most important tools are working properly.</para> <para>Prepare Tcl to be compiled:</para> <para><screen><userinput>cd unix -./configure --prefix=/stage1</userinput></screen></para> +./configure --prefix=/tools</userinput></screen></para> <para>Build, test, and install the package:</para> @@ -24,7 +24,7 @@ This is, however, not a problem: the program will work well enough to be able to run the GCC and Binutils test suites.</para> <para>Make a link:</para> -<para><screen><userinput>ln -s tclsh8.4 /stage1/bin/tclsh</userinput></screen></para> +<para><screen><userinput>ln -s tclsh8.4 /tools/bin/tclsh</userinput></screen></para> <caution><para><emphasis>Do not remove</emphasis> the <filename>tcl&tcl-version;</filename> source directory yet, as the next package diff --git a/chapter05/texinfo-inst.xml b/chapter05/texinfo-inst.xml index 0249cd361..6cb7bbb0b 100644 --- a/chapter05/texinfo-inst.xml +++ b/chapter05/texinfo-inst.xml @@ -5,7 +5,7 @@ <para>Prepare Texinfo to be compiled:</para> -<para><screen><userinput>./configure --prefix=/stage1</userinput></screen></para> +<para><screen><userinput>./configure --prefix=/tools</userinput></screen></para> <para>Compile the programs:</para> diff --git a/chapter05/utillinux-inst.xml b/chapter05/utillinux-inst.xml index 9b3bc6d63..2f7bf29c2 100644 --- a/chapter05/utillinux-inst.xml +++ b/chapter05/utillinux-inst.xml @@ -19,7 +19,7 @@ make -C text-utils more</userinput></screen></para> <para>Now copy these programs to the temporary tools directory:</para> -<para><screen><userinput>cp mount/{,u}mount text-utils/more /stage1/bin</userinput></screen></para> +<para><screen><userinput>cp mount/{,u}mount text-utils/more /tools/bin</userinput></screen></para> </sect2> |