first set of commits for keep-chap5-chap6-seperate

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

19 files changed, 47 insertions, 59 deletions

diff --git a/chapter05/bash-inst.xml b/chapter05/bash-inst.xml
index c72100cf4..83113b2e2 100644
--- a/chapter05/bash-inst.xml
+++ b/chapter05/bash-inst.xml
@@ -21,10 +21,9 @@ following commands as user root:</para>
 commands:</para>
 
 <para><screen><userinput>./configure --enable-static-link \
-&nbsp;&nbsp;&nbsp;&nbsp;--prefix=$LFS/usr --bindir=$LFS/bin --with-curses &amp;&amp;
+&nbsp;&nbsp;&nbsp;&nbsp;--prefix=$LFS/static --with-curses &amp;&amp;
 make &amp;&amp;
-make install &amp;&amp;
-ln -sf bash $LFS/bin/sh</userinput></screen></para>
+make install</userinput></screen></para>
 
 <para>If the make install phase ends with something along the lines of</para>
 
@@ -46,9 +45,7 @@ chapter 6, so you can ignore it.</para>
 
 <para>When we tested it with the latest Debian version, the last two
 commands were executed because the install process didn't return with a
-value larger than 0. But you would do good to check if you have the
-<filename class="symlink">$LFS/bin/sh</filename> symlink on your LFS
-partition. If not, run the last two commands manually now.</para>
+value larger than 0.</para>
 
 </sect2>
 
diff --git a/chapter05/binutils-inst.xml b/chapter05/binutils-inst.xml
index 813621471..26d1fb232 100644
--- a/chapter05/binutils-inst.xml
+++ b/chapter05/binutils-inst.xml
@@ -13,9 +13,9 @@ warned.</para>
 
 <para><screen><userinput>mkdir ../binutils-build &amp;&amp;
 cd ../binutils-build &amp;&amp;
-../binutils-&binutils-version;/configure --prefix=$LFS/usr --disable-nls &amp;&amp;
-make tooldir=$LFS/usr LDFLAGS=-all-static &amp;&amp;
-make tooldir=$LFS/usr install</userinput></screen></para>
+../binutils-&binutils-version;/configure --prefix=$LFS/static --disable-nls &amp;&amp;
+make tooldir=$LFS/static LDFLAGS=-all-static &amp;&amp;
+make tooldir=$LFS/static install</userinput></screen></para>
 
 </sect2>
 
diff --git a/chapter05/bzip2-inst.xml b/chapter05/bzip2-inst.xml
index 50ee61126..8bccdeaf3 100644
--- a/chapter05/bzip2-inst.xml
+++ b/chapter05/bzip2-inst.xml
@@ -4,10 +4,7 @@
 <para>Install Bzip2 by running the following commands:</para>
 
 <para><screen><userinput>make CC="gcc -static" &amp;&amp;
-make PREFIX=$LFS/usr install &amp;&amp;
-mv $LFS/usr/bin/{bzcat,bunzip2,bzip2,bzip2recover} $LFS/bin &amp;&amp;
-cp $LFS/usr/bin/{bzless,bzmore} $LFS/bin &amp;&amp;
-rm $LFS/usr/bin/{bzless,bzmore}</userinput></screen></para>
+make PREFIX=$LFS/static install</userinput></screen></para>
 
 <para>Although it's not strictly a part of a basic LFS system it's worth
 mentioning that a patch for Tar can be downloaded which enables the tar
diff --git a/chapter05/chapter05.xml b/chapter05/chapter05.xml
index efe68d07a..0a1508b96 100644
--- a/chapter05/chapter05.xml
+++ b/chapter05/chapter05.xml
@@ -4,18 +4,18 @@
 
 &c5-introduction;
 &c5-whystatic;
+&c5-creatingstaticdir;
 &c5-installasuser;
-&c5-creatingdirs;
 &c5-bash;
 &c5-binutils;
 &c5-bzip2;
 &c5-diffutils;
 &c5-fileutils;
+&c5-findutils;
 &c5-gawk;
 &c5-gcc;
 &c5-grep;
 &c5-gzip;
-&c5-kernel;
 &c5-make;
 &c5-patch;
 &c5-sed;
@@ -23,8 +23,7 @@
 &c5-tar;
 &c5-texinfo;
 &c5-textutils;
-&c5-pwdgroup;
-&c5-proc;
+&c5-utillinux;
 
 </chapter>
 
diff --git a/chapter05/diffutils-inst.xml b/chapter05/diffutils-inst.xml
index a4af5074d..f5f59fd15 100644
--- a/chapter05/diffutils-inst.xml
+++ b/chapter05/diffutils-inst.xml
@@ -4,7 +4,7 @@
 <para>Install Diffutils by running the following commands:</para>
 
 <para><screen><userinput>CPPFLAGS=-Dre_max_failures=re_max_failures2 \
-./configure --prefix=$LFS/usr --disable-nls &amp;&amp;
+./configure --prefix=$LFS/static --disable-nls &amp;&amp;
 make LDFLAGS=-static &amp;&amp;
 make install</userinput></screen></para>
 
diff --git a/chapter05/fileutils-inst.xml b/chapter05/fileutils-inst.xml
index 29121fec8..1cfb30977 100644
--- a/chapter05/fileutils-inst.xml
+++ b/chapter05/fileutils-inst.xml
@@ -28,11 +28,9 @@ sed -e 's/\(.*\)\(fopen-safer\.c \)\\/\1\2atexit.c \\/' \
 
 <para>Install Fileutils by running the following commands:</para>
 
-<para><screen><userinput>./configure --disable-nls \
-&nbsp;&nbsp;&nbsp;&nbsp;--prefix=$LFS/usr --bindir=$LFS/bin &amp;&amp;
+<para><screen><userinput>./configure --disable-nls --prefix=$LFS/static &amp;&amp;
 make LDFLAGS=-static &amp;&amp;
-make install &amp;&amp;
-ln -sf ../../bin/install $LFS/usr/bin</userinput></screen></para>
+make install</userinput></screen></para>
 
 <para>Once you have installed Fileutils, you can test whether the
 segmentation fault problem has been avoided by running
diff --git a/chapter05/gawk-inst.xml b/chapter05/gawk-inst.xml
index 0d858adc8..7b0862fd5 100644
--- a/chapter05/gawk-inst.xml
+++ b/chapter05/gawk-inst.xml
@@ -18,8 +18,8 @@ sed -e '/^datadir/s/awk/gawk/' \
 -e '/^libexecdir/s%/awk%%' awklib/Makefile.in.backup \
 &nbsp;&nbsp;&nbsp;&nbsp;&gt; awklib/Makefile.in &amp;&amp;
 CPPFLAGS=-Dre_max_failures=re_max_failures2 \
-./configure --prefix=$LFS/usr --disable-nls \
-&nbsp;&nbsp;&nbsp;&nbsp;--libexecdir=$LFS/usr/bin &amp;&amp;
+./configure --prefix=$LFS/static --disable-nls \
+&nbsp;&nbsp;&nbsp;&nbsp;--libexecdir=$LFS/static/bin &amp;&amp;
 make LDFLAGS=-static &amp;&amp;
 make install</userinput></screen></para>
 
diff --git a/chapter05/gcc-inst.xml b/chapter05/gcc-inst.xml
index e27dd0e95..ad9f79f51 100644
--- a/chapter05/gcc-inst.xml
+++ b/chapter05/gcc-inst.xml
@@ -17,15 +17,13 @@ been warned.</para>
 <para><screen><userinput>patch -Np1 -i ../gcc-&gcc-patch-version;.patch &amp;&amp;
 mkdir ../gcc-build &amp;&amp;
 cd ../gcc-build &amp;&amp;
-../gcc-&gcc-version;/configure --prefix=/usr --enable-languages=c,c++ \
+../gcc-&gcc-version;/configure --prefix=/static --enable-languages=c,c++ \
 &nbsp;&nbsp;&nbsp;--disable-nls --disable-shared --enable-threads=posix &amp;&amp;
 make BOOT_LDFLAGS=-static bootstrap &amp;&amp;
-make prefix=$LFS/usr install &amp;&amp;
-ln -sf ../usr/bin/cpp $LFS/lib &amp;&amp;
-ln -sf ../bin/cpp $LFS/usr/lib &amp;&amp;
-ln -sf gcc $LFS/usr/bin/cc &amp;&amp;
-rmdir $LFS/usr/*-gnu/include &amp;&amp;
-rmdir $LFS/usr/*-gnu</userinput></screen></para>
+make prefix=$LFS/static install &amp;&amp;
+ln -s gcc $LFS/static/bin/cc &amp;&amp;
+rmdir $LFS/static/*-gnu/include &amp;&amp;
+rmdir $LFS/static/*-gnu</userinput></screen></para>
 
 </sect2>
 
diff --git a/chapter05/grep-inst.xml b/chapter05/grep-inst.xml
index 8e9a711cd..18fe41068 100644
--- a/chapter05/grep-inst.xml
+++ b/chapter05/grep-inst.xml
@@ -4,8 +4,8 @@
 <para>Install Grep by running the following commands:</para>
 
 <para><screen><userinput>CPPFLAGS=-Dre_max_failures=re_max_failures2 \
-./configure --prefix=$LFS/usr --bindir=$LFS/bin \
-&nbsp;&nbsp;&nbsp;&nbsp;--disable-nls --disable-perl-regexp &amp;&amp;
+./configure --prefix=$LFS/static --disable-nls \
+&nbsp;&nbsp;&nbsp;&nbsp;--disable-perl-regexp &amp;&amp;
 make LDFLAGS=-static &amp;&amp;
 make install</userinput></screen></para>
 
diff --git a/chapter05/gzip-inst.xml b/chapter05/gzip-inst.xml
index 98f35df93..38467f7ee 100644
--- a/chapter05/gzip-inst.xml
+++ b/chapter05/gzip-inst.xml
@@ -3,11 +3,9 @@
 
 <para>Install Gzip by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=$LFS/usr &amp;&amp;
+<para><screen><userinput>./configure --prefix=$LFS/static &amp;&amp;
 make LDFLAGS=-static &amp;&amp;
-make install &amp;&amp;
-cp $LFS/usr/bin/{gunzip,gzip} $LFS/bin &amp;&amp;
-rm $LFS/usr/bin/{gunzip,gzip}</userinput></screen></para>
+make install</userinput></screen></para>
 
 </sect2>
 
diff --git a/chapter05/installasuser.xml b/chapter05/installasuser.xml
index 4544e735a..85d2013e0 100644
--- a/chapter05/installasuser.xml
+++ b/chapter05/installasuser.xml
@@ -16,11 +16,11 @@ commands as root will create a new user "lfs":</para>
 <para><screen><userinput>useradd -s /bin/bash -m lfs &amp;&amp;
 passwd lfs</userinput></screen></para>
 
-<para>Now it's time to change the permissions on your LFS partitions
-so user "lfs" will have write access to it. Run the following command
-as root to change the ownership of the LFS partition to user "lfs":</para>
+<para>Now we need to give proper permissions to the <filename
+class="directory">$LFS/static</filename> directory so user "lfs" can write
+to it:</para>
 
-<para><screen><userinput>chown -R lfs $LFS</userinput></screen></para>
+<para><screen><userinput>chown -R lfs $LFS/static</userinput></screen></para>
 
 <para>Now you can login as user "lfs". You can do this two ways: either
 the normal way through the console or the display manager, or with
diff --git a/chapter05/introduction.xml b/chapter05/introduction.xml
index 62707dde6..d59d7d0d3 100644
--- a/chapter05/introduction.xml
+++ b/chapter05/introduction.xml
@@ -19,6 +19,12 @@ example of such a dependency is that you need a compiler to install a
 compiler, and you're going to need a shell to install a shell and that
 compiler.</para>
 
+<para>All the files from this chapter will be installed under the <filename
+class="directory">$LFS/static</filename> directory. By doing it this way,
+we keep the installation from this chapter seperate from the final
+installation in the next chapter. Everything done here is only temporarily
+so we don't want it to pollute the to-be LFS system.</para>
+
 <para>The key to learning what makes Linux tick is to know exactly what packages
 are used for and why a user or the system needs them. Descriptions
 of the package content are provided after the Installation subsection of each
diff --git a/chapter05/make-inst.xml b/chapter05/make-inst.xml
index 24f5b96d7..0be34b03c 100644
--- a/chapter05/make-inst.xml
+++ b/chapter05/make-inst.xml
@@ -3,16 +3,16 @@
 
 <para>Install Make by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=$LFS/usr --disable-nls &amp;&amp;
+<para><screen><userinput>./configure --prefix=$LFS/static --disable-nls &amp;&amp;
 make LDFLAGS=-static &amp;&amp;
 make install</userinput></screen></para>
 
 <para>During the make install phase you will see this warning:</para>
 
-<blockquote><screen>chgrp: changing group of `/mnt/lfs/usr/bin/make': Operation not permitted
-/mnt/lfs/usr/bin/make needs to be owned by group kmem and setgid;
+<blockquote><screen>chgrp: changing group of `/mnt/lfs/static/bin/make': Operation not permitted
+/mnt/lfs/static/bin/make needs to be owned by group kmem and setgid;
 otherwise the `-l' option will probably not work. You may need special
-privileges to complete the installation of /mnt/lfs/usr/bin/make.</screen></blockquote>
+privileges to complete the installation of /mnt/lfs/static/bin/make.</screen></blockquote>
 
 <para>You can safely ignore this warning. make doesn't need to be owned by
 group kmem and setgid for the <emphasis>-l</emphasis> option to work (which
diff --git a/chapter05/patch-inst.xml b/chapter05/patch-inst.xml
index 89512820a..4528b7f2b 100644
--- a/chapter05/patch-inst.xml
+++ b/chapter05/patch-inst.xml
@@ -4,7 +4,7 @@
 <para>Install Patch by running the following commands:</para>
 
 <para><screen><userinput>CPPFLAGS=-D_GNU_SOURCE \
-./configure --prefix=$LFS/usr &amp;&amp;
+./configure --prefix=$LFS/static &amp;&amp;
 make LDFLAGS=-static &amp;&amp;
 make install</userinput></screen></para>
 
diff --git a/chapter05/sed-inst.xml b/chapter05/sed-inst.xml
index 38ed00dc7..1f30b36e8 100644
--- a/chapter05/sed-inst.xml
+++ b/chapter05/sed-inst.xml
@@ -4,7 +4,7 @@
 <para>Install Sed by running the following commands:</para>
 
 <para><screen><userinput>CPPFLAGS=-Dre_max_failures=re_max_failures2 \
-./configure --prefix=$LFS/usr --bindir=$LFS/bin &amp;&amp;
+./configure --prefix=$LFS/static &amp;&amp;
 make LDFLAGS=-static &amp;&amp;
 make install</userinput></screen></para>
 
diff --git a/chapter05/shellutils-inst.xml b/chapter05/shellutils-inst.xml
index ec819ca95..943df5434 100644
--- a/chapter05/shellutils-inst.xml
+++ b/chapter05/shellutils-inst.xml
@@ -3,13 +3,10 @@
 
 <para>Install Sh-utils by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=$LFS/usr \
+<para><screen><userinput>./configure --prefix=$LFS/static \
 &nbsp;&nbsp;&nbsp;&nbsp;--disable-nls &amp;&amp;
 make LDFLAGS=-static &amp;&amp;
-make install &amp;&amp;
-mv $LFS/usr/bin/{basename,date,echo,false,hostname} $LFS/bin &amp;&amp;
-mv $LFS/usr/bin/{pwd,sleep,stty,test,true,uname} $LFS/bin &amp;&amp;
-mv $LFS/usr/bin/chroot $LFS/usr/sbin</userinput></screen></para>
+make install</userinput></screen></para>
 
 <para>During the make install stage you will see the following warning:</para>
 
diff --git a/chapter05/tar-inst.xml b/chapter05/tar-inst.xml
index 1b2f62b8b..b87930ac6 100644
--- a/chapter05/tar-inst.xml
+++ b/chapter05/tar-inst.xml
@@ -12,9 +12,8 @@ for gzip files).</para>
 
 <para>Install Tar by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=$LFS/usr \
-&nbsp;&nbsp;&nbsp;&nbsp;--disable-nls --libexecdir=$LFS/usr/bin \
-&nbsp;&nbsp;&nbsp;&nbsp;--bindir=$LFS/bin &amp;&amp; 
+<para><screen><userinput>./configure --prefix=$LFS/static \
+&nbsp;&nbsp;&nbsp;&nbsp;--disable-nls --libexecdir=$LFS/static/bin &amp;&amp; 
 make LDFLAGS=-static &amp;&amp;
 make install</userinput></screen></para>
 
diff --git a/chapter05/texinfo-inst.xml b/chapter05/texinfo-inst.xml
index c7482ab00..0e36b6b96 100644
--- a/chapter05/texinfo-inst.xml
+++ b/chapter05/texinfo-inst.xml
@@ -3,7 +3,7 @@
 
 <para>Install Texinfo by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=$LFS/usr \
+<para><screen><userinput>./configure --prefix=$LFS/static \
 &nbsp;&nbsp;&nbsp;&nbsp;--disable-nls &amp;&amp;
 make LDFLAGS=-static &amp;&amp;
 make install</userinput></screen></para>
diff --git a/chapter05/textutils-inst.xml b/chapter05/textutils-inst.xml
index ee81169b3..4dd4c9606 100644
--- a/chapter05/textutils-inst.xml
+++ b/chapter05/textutils-inst.xml
@@ -3,11 +3,10 @@
 
 <para>Install Textutils by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=$LFS/usr \
+<para><screen><userinput>./configure --prefix=$LFS/static \
 &nbsp;&nbsp;&nbsp;&nbsp;--disable-nls &amp;&amp;
 make LDFLAGS=-static &amp;&amp;
-make install &amp;&amp;
-mv $LFS/usr/bin/{cat,head} $LFS/bin</userinput></screen></para>
+make install</userinput></screen></para>
 
 </sect2>