diff options
| -rw-r--r-- | chapter01/changelog.xml | 12 | ||||
| -rw-r--r-- | chapter04/packages.xml | 1 | ||||
| -rw-r--r-- | chapter04/shellutils-patch.xml | 3 | ||||
| -rw-r--r-- | chapter05/shellutils-inst.xml | 9 | ||||
| -rw-r--r-- | chapter06/binutils-exp.xml | 4 | ||||
| -rw-r--r-- | chapter06/binutils-inst.xml | 3 | ||||
| -rw-r--r-- | chapter06/bzip2-inst.xml | 6 | ||||
| -rw-r--r-- | chapter06/fileutils-inst.xml | 2 | ||||
| -rw-r--r-- | chapter06/gcc-inst.xml | 6 | ||||
| -rw-r--r-- | chapter06/gzip-inst.xml | 6 | ||||
| -rw-r--r-- | chapter06/ncurses-inst.xml | 12 | ||||
| -rw-r--r-- | chapter06/shadowpwd-exp.xml | 2 | ||||
| -rw-r--r-- | chapter06/shadowpwd-inst.xml | 10 | ||||
| -rw-r--r-- | chapter06/shellutils-inst.xml | 2 | ||||
| -rw-r--r-- | chapter06/vim-inst.xml | 4 | ||||
| -rw-r--r-- | entities/shellutils.ent | 3 | ||||
| -rw-r--r-- | index.xml | 4 |
17 files changed, 63 insertions, 26 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index d4dc3d422..e33c64e3f 100644 --- a/chapter01/changelog.xml +++ b/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 & 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> diff --git a/chapter04/packages.xml b/chapter04/packages.xml index 9a9d3a257..f271dbc94 100644 --- a/chapter04/packages.xml +++ b/chapter04/packages.xml @@ -18,6 +18,7 @@ &c3-make; &c3-sed; &c3-shellutils; +&c3-shellutils-patch; &c3-tar; &c3-tar-patch; &c3-textutils; diff --git a/chapter04/shellutils-patch.xml b/chapter04/shellutils-patch.xml new file mode 100644 index 000000000..56a9368ce --- /dev/null +++ b/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"/> diff --git a/chapter05/shellutils-inst.xml b/chapter05/shellutils-inst.xml index 760f80781..50cdd698a 100644 --- a/chapter05/shellutils-inst.xml +++ b/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 \ diff --git a/chapter06/binutils-exp.xml b/chapter06/binutils-exp.xml index 7581ca2d2..7e8711e2c 100644 --- a/chapter06/binutils-exp.xml +++ b/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> diff --git a/chapter06/binutils-inst.xml b/chapter06/binutils-inst.xml index 48a2778d0..970d734cf 100644 --- a/chapter06/binutils-inst.xml +++ b/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 && +cp ../binutils-&binutils-version;/include/libiberty.h /usr/include</userinput></screen></para> </sect2> diff --git a/chapter06/bzip2-inst.xml b/chapter06/bzip2-inst.xml index 33d6b1dcd..97297157d 100644 --- a/chapter06/bzip2-inst.xml +++ b/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 && +ln -s bzip2 /bin/bzcat</userinput></screen></para> <para>Although it's not strictly a part of a basic LFS system it's worth diff --git a/chapter06/fileutils-inst.xml b/chapter06/fileutils-inst.xml index b3f70ee81..79ca45d1d 100644 --- a/chapter06/fileutils-inst.xml +++ b/chapter06/fileutils-inst.xml @@ -6,7 +6,7 @@ <para><screen><userinput>./configure --prefix=/usr --bindir=/bin && make && make install && -ln -sf ../../bin/install /usr/bin</userinput></screen></para> +ln -s ../../bin/install /usr/bin</userinput></screen></para> </sect2> diff --git a/chapter06/gcc-inst.xml b/chapter06/gcc-inst.xml index 47c075180..ae56e55c7 100644 --- a/chapter06/gcc-inst.xml +++ b/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 && +ln -s ../bin/cpp /usr/lib && +ln -s gcc /usr/bin/cc</userinput></screen></para> </sect2> diff --git a/chapter06/gzip-inst.xml b/chapter06/gzip-inst.xml index 7782d1f05..30581ad63 100644 --- a/chapter06/gzip-inst.xml +++ b/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 && +ln -s gzip /bin/zcat && +ln -s gunzip /bin/uncompress</userinput></screen></para> </sect2> diff --git a/chapter06/ncurses-inst.xml b/chapter06/ncurses-inst.xml index a6adcb92d..97890fbe1 100644 --- a/chapter06/ncurses-inst.xml +++ b/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 && +ln -s ../../lib/libncurses.so /usr/lib && +ln -s ../../lib/libcurses.so /usr/lib && +ln -s ../../lib/libform.so /usr/lib && +ln -s ../../lib/libpanel.so /usr/lib && +ln -s ../../lib/libmenu.so /usr/lib</userinput></screen></para> </sect2> diff --git a/chapter06/shadowpwd-exp.xml b/chapter06/shadowpwd-exp.xml index 2ab8ca54d..5c76e3592 100644 --- a/chapter06/shadowpwd-exp.xml +++ b/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> diff --git a/chapter06/shadowpwd-inst.xml b/chapter06/shadowpwd-inst.xml index 0f02f23cc..17a3f365d 100644 --- a/chapter06/shadowpwd-inst.xml +++ b/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> diff --git a/chapter06/shellutils-inst.xml b/chapter06/shellutils-inst.xml index 24cf497d7..9c7cee0b9 100644 --- a/chapter06/shellutils-inst.xml +++ b/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> diff --git a/chapter06/vim-inst.xml b/chapter06/vim-inst.xml index c5476647e..31fc04fad 100644 --- a/chapter06/vim-inst.xml +++ b/chapter06/vim-inst.xml @@ -16,7 +16,7 @@ Currently, there are instructions for Emacs, nano, and joe.</para> ./configure --prefix=/usr && make CPPFLAGS=-DSYS_VIMRC_FILE=\\\"/etc/vimrc\\\" && make install && -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 && make CPPFLAGS=-DSYS_VIMRC_FILE=\\\"/etc/vimrc\\\" && make install && -ln -sf vim /usr/bin/vi</userinput></screen></para> +ln -s vim /usr/bin/vi</userinput></screen></para> </sect2> diff --git a/entities/shellutils.ent b/entities/shellutils.ent index 77876dfab..acd86f740 100644 --- a/entities/shellutils.ent +++ b/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;"> @@ -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"> |