Changed ln -sf to ln -s where possible, cp libiberty.h after binutils install, remove groups program from Shadow, re-added the sh-utils-2.0.patch.

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

chapter01/changelog.xml

@@ -47,10 +47,20 @@
 <itemizedlist>
 <listitem><para>gzip-1.2.4a.patch</para></listitem>
 <listitem><para>reiserfsprogs-3.x.1b</para></listitem>
-<listitem><para>sh-utils-2.0.patch</para></listitem>
 </itemizedlist>
 </para></listitem>
 
+<listitem><para>August 18th, 2002 [timothy]: Chapter 05 &amp; 06:
+Changed ln -sf to ln -s wherever possible.</para></listitem>
+
+<listitem><para>August 18th, 2002 [timothy]: Chapter 06 - Binutils: cp
+libiberty.h after install, as it is needed by certain software. Shadow:
+added command to remove the groups program installed by Shadow because
+Sh-utils installs a (better) groups program.</para></listitem>
+
+<listitem><para>August 18th, 2002 [timothy]: Chapter 05 - Sh-utils: Re-added
+sh-utils-2.0.patch.</para></listitem>
+
 <listitem><para>August 16th, 2002 [markh]: Chapter 06 - Move man-pages to
 just after the kernel headers installation.</para></listitem>
 

chapter04/packages.xml

@@ -18,6 +18,7 @@
 &c3-make;
 &c3-sed;
 &c3-shellutils;
+&c3-shellutils-patch;
 &c3-tar;
 &c3-tar-patch;
 &c3-textutils;

chapter04/shellutils-patch.xml

@@ -0,0 +1,3 @@
+Sh-utils Patch (&sh-utils-patch-version;) - &sh-utils-patch-size;:
+<ulink url="&ftp;/sh-utils-&sh-utils-patch-version;.patch.bz2"/>
+<ulink url="&http;/sh-utils-&sh-utils-patch-version;.patch.bz2"/>

chapter05/shellutils-inst.xml

@@ -1,6 +1,15 @@
 <sect2>
 <title>Installation of Sh-utils</title>
 
+<para>Before Sh-utils is installed, the sh-utils patch file may need to be
+applied. This patch is needed to avoid a conflict of variable names with
+certain Glibc versions (usually glibc-2.1.x) when compiling sh-utils
+statically. It is however safe to apply the patch even if you are running
+a different glibc version, so if you aren't sure, it's best to apply
+it.</para>
+
+<para><screen><userinput>patch -Np1 -i ../sh-utils-&sh-utils-version;.patch</userinput></screen></para>
+
 <para>Install Sh-utils by running the following commands:</para>
 
 <para><screen><userinput>./configure --prefix=$LFS/static \

chapter06/binutils-exp.xml

@@ -13,5 +13,9 @@ executed on Apple PowerPC machines).</para>
 <para><userinput>make tooldir=/usr install-info:</userinput> This will
 install binutils' info pages.</para>
 
+<para><userinput>cp ../binutils-&binutils-version;/include/libiberty.h /usr/include:</userinput>
+The libiberty.h header file is needed in order for certain software to
+compile.</para>
+
 </sect2>
 

chapter06/binutils-inst.xml

@@ -14,7 +14,8 @@ cd ../binutils-build &&
 ../binutils-&binutils-version;/configure --prefix=/usr --enable-shared &&
 make tooldir=/usr &&
 make tooldir=/usr install &&
-make tooldir=/usr install-info</userinput></screen></para>
+make tooldir=/usr install-info &amp;&amp;
+cp ../binutils-&binutils-version;/include/libiberty.h /usr/include</userinput></screen></para>
 
 </sect2>
 

chapter06/bzip2-inst.xml

@@ -9,11 +9,11 @@ make PREFIX=/usr install &&
 cp bzip2-shared /bin/bzip2 &&
 ln -s libbz2.so.1.0 libbz2.so &&
 cp -a libbz2.so* /lib &&
-ln -sf ../../lib/libbz2.so /usr/lib &&
+ln -s ../../lib/libbz2.so /usr/lib &&
 rm /usr/bin/{bunzip2,bzcat,bzip2} &&
 mv /usr/bin/{bzip2recover,bzless,bzmore} /bin &&
-ln -sf bzip2 /bin/bunzip2 &&
-ln -sf bzip2 /bin/bzcat</userinput></screen></para>
+ln -s bzip2 /bin/bunzip2 &amp;&amp;
+ln -s bzip2 /bin/bzcat</userinput></screen></para>
 
 
 <para>Although it's not strictly a part of a basic LFS system it's worth

chapter06/fileutils-inst.xml

@@ -6,7 +6,7 @@
 <para><screen><userinput>./configure --prefix=/usr --bindir=/bin &amp;&amp;
 make &amp;&amp;
 make install &amp;&amp;
-ln -sf ../../bin/install /usr/bin</userinput></screen></para>
+ln -s ../../bin/install /usr/bin</userinput></screen></para>
 
 </sect2>
 

chapter06/gcc-inst.xml

@@ -25,9 +25,9 @@ cd ../gcc-build &&
     --with-slibdir=/lib &&
 make bootstrap &&
 make install &&
-ln -sf ../usr/bin/cpp /lib &&
-ln -sf ../bin/cpp /usr/lib &&
-ln -sf gcc /usr/bin/cc</userinput></screen></para>
+ln -s ../usr/bin/cpp /lib &amp;&amp;
+ln -s ../bin/cpp /usr/lib &amp;&amp;
+ln -s gcc /usr/bin/cc</userinput></screen></para>
 
 </sect2>
 

chapter06/gzip-inst.xml

@@ -10,9 +10,9 @@ make &&
 make install &&
 mv /usr/bin/gzip /bin &&
 rm /usr/bin/{gunzip,zcat} &&
-ln -sf gzip /bin/gunzip &&
-ln -sf gzip /bin/zcat &&
-ln -sf gunzip /bin/uncompress</userinput></screen></para>
+ln -s gzip /bin/gunzip &amp;&amp;
+ln -s gzip /bin/zcat &amp;&amp;
+ln -s gunzip /bin/uncompress</userinput></screen></para>
 
 </sect2>
 

chapter06/ncurses-inst.xml

@@ -13,11 +13,11 @@ make &&
 make install &&
 mv /lib/*.a /usr/lib &&
 chmod 755 /lib/*.5.2 &&
-ln -sf libncurses.a /usr/lib/libcurses.a &&
-ln -sf ../../lib/libncurses.so /usr/lib &&
-ln -sf ../../lib/libcurses.so /usr/lib &&
-ln -sf ../../lib/libform.so /usr/lib &&
-ln -sf ../../lib/libpanel.so /usr/lib &&
-ln -sf ../../lib/libmenu.so /usr/lib</userinput></screen></para>
+ln -s libncurses.a /usr/lib/libcurses.a &amp;&amp;
+ln -s ../../lib/libncurses.so /usr/lib &amp;&amp;
+ln -s ../../lib/libcurses.so /usr/lib &amp;&amp;
+ln -s ../../lib/libform.so /usr/lib &amp;&amp;
+ln -s ../../lib/libpanel.so /usr/lib &amp;&amp;
+ln -s ../../lib/libmenu.so /usr/lib</userinput></screen></para>
 </sect2>
 

chapter06/shadowpwd-exp.xml

@@ -10,7 +10,7 @@ details on the system.</para>
 /etc/login.defs</userinput>: /var/spool/mail is the old location of the
 user mailboxes. The location that is used nowadays is /var/mail.</para>
 
-<para><userinput>ln -sf vipw vigr</userinput>: According to the manpage of
+<para><userinput>ln -s vipw vigr:</userinput> According to the manpage of
 vipw, vigr should be a symlink to it. Because the shadow installation
 procedure doesn't create these symlinks, we create them manually.</para>
 

chapter06/shadowpwd-inst.xml

@@ -16,11 +16,17 @@ make install &&
 cp etc/{limits,login.access} /etc &&
 sed 's%/var/spool/mail%/var/mail%' \
     etc/login.defs.linux > /etc/login.defs &&
-ln -sf vipw /usr/sbin/vigr &&
+ln -s vipw /usr/sbin/vigr &&
 rm /bin/vipw &&
 mv /bin/sg /usr/bin &&
 mv /lib/{libmisc.*a,libshadow.*a} /usr/lib &&
 ln -s ../../lib/libshadow.so /usr/lib</userinput></screen></para>
 
-</sect2>
+<para>Sh-utils and Shadow Password Suite each install a unique
+<filename>groups</filename> program. If you wish, you may remove the
+<filename>groups</filename> program installed by the Shadow Password
+Suite by running the following command:</para>
+
+<para><screen><userinput>rm /bin/groups</userinput></screen></para>
 
+</sect2>

chapter06/shellutils-inst.xml

@@ -21,7 +21,7 @@ encountered in the form of <command>[ condition ]</command>. These brackets
 are built into the bash interpreter, but the FHS dictates that there should be a
 <filename>[</filename> binary. Create it by running:</para>
 
-<para><screen><userinput>ln -sf test /bin/[</userinput></screen></para>
+<para><screen><userinput>ln -s test /bin/[</userinput></screen></para>
 
 </sect2>
 

chapter06/vim-inst.xml

@@ -16,7 +16,7 @@ Currently, there are instructions for Emacs, nano, and joe.</para>
 ./configure --prefix=/usr &amp;&amp;
 make CPPFLAGS=-DSYS_VIMRC_FILE=\\\"/etc/vimrc\\\" &amp;&amp;
 make install &amp;&amp;
-ln -sf vim /usr/bin/vi</userinput></screen></para>
+ln -s vim /usr/bin/vi</userinput></screen></para>
 
 <para>If you plan to install the X Window system on your LFS
 system, you might want to re-compile Vim after you have installed X. Vim
@@ -38,7 +38,7 @@ instead of the one presented above:</para>
 ./configure --prefix=/usr --localstatedir=/var/lib/vim &amp;&amp;
 make CPPFLAGS=-DSYS_VIMRC_FILE=\\\"/etc/vimrc\\\" &amp;&amp;
 make install &amp;&amp;
-ln -sf vim /usr/bin/vi</userinput></screen></para>
+ln -s vim /usr/bin/vi</userinput></screen></para>
 
 </sect2>
 

entities/shellutils.ent

@@ -1,4 +1,5 @@
 <!ENTITY c3-shellutils SYSTEM "../chapter03/shellutils.xml">
+<!ENTITY c3-shellutils-patch SYSTEM "../chapter03/shellutils-patch.xml">
 
 <!ENTITY c5-shellutils SYSTEM "../chapter05/shellutils.xml">
 <!ENTITY c5-shellutils-inst SYSTEM "../chapter05/shellutils-inst.xml">
@@ -15,6 +16,8 @@
 <!ENTITY sh-utils-depversion "2.0">
 <!ENTITY sh-utils-contversion "2.0">
 <!ENTITY sh-utils-size "824 KB">
+<!ENTITY sh-utils-patch-size "1 KB">
+<!ENTITY sh-utils-patch-version "2.0">
 <!ENTITY sh-utils-package "sh-utils-&sh-utils-version;.tar.bz2">
 <!ENTITY sh-utils-dir "sh-utils-&sh-utils-version;">
 

index.xml

@@ -4,8 +4,8 @@
 
 <!ENTITY book SYSTEM "book/book.xml">
 
-<!ENTITY version "20020816">
-<!ENTITY releasedate "August 16th, 2002">
+<!ENTITY version "20020818">
+<!ENTITY releasedate "August 18th, 2002">
 
 <!ENTITY ftp-root "ftp://ftp.linuxfromscratch.org">
 <!ENTITY http-root "http://ftp.linuxfromscratch.org">