diff options
| -rw-r--r-- | chapter01/changelog.xml | 12 | ||||
| -rw-r--r-- | chapter04/coreutils-patch.xml | 3 | ||||
| -rw-r--r-- | chapter04/packages.xml | 1 | ||||
| -rw-r--r-- | chapter05/bzip2-inst.xml | 1 | ||||
| -rw-r--r-- | chapter06/bzip2-inst.xml | 3 | ||||
| -rw-r--r-- | chapter06/coreutils-inst.xml | 32 | ||||
| -rw-r--r-- | chapter06/gcc-inst.xml | 1 | ||||
| -rw-r--r-- | chapter06/nettools-inst.xml | 10 | ||||
| -rw-r--r-- | chapter06/zlib-inst.xml | 17 | ||||
| -rw-r--r-- | entities/coreutils.ent | 9 |
10 files changed, 62 insertions, 27 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index aed274bd4..a18f2ded9 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -39,6 +39,7 @@ <listitem><para>bash-2.05b.patch</para></listitem> <listitem><para>binutils-2.13.2-libc.patch</para></listitem> <listitem><para>coreutils-5.0</para></listitem> +<listitem><para>coreutils-5.0-uname.patch</para></listitem> <listitem><para>dejagnu-1.4.3</para></listitem> <listitem><para>expect-5.38</para></listitem> <listitem><para>expect-5.38.patch</para></listitem> @@ -67,6 +68,17 @@ </itemizedlist> </para></listitem> +<listitem><para>May 11th, 2003 [winkie]: Chapter 06 - Install Coreutils: +Fix some functionality of the uname command with a patch.</para></listitem> + +<listitem><para>May 11th, 2003 [winkie]: Chapter 06 - Installing Net-tools: +Just do regular old "make install" instead of "make update". The latter +works fine now.</para></listitem> + +<listitem><para>May 11th, 2003 [winkie]: Chapter 06 - Installing GCC: +After installation, remove /usr/include/libiberty.h. It is not used +outside of the GCC build tree.</para></listitem> + <listitem><para>May 11th, 2003 [winkie]: Upgraded to Bash 2.05b and added its patch</para></listitem> diff --git a/chapter04/coreutils-patch.xml b/chapter04/coreutils-patch.xml new file mode 100644 index 000000000..2ebd8fa61 --- /dev/null +++ b/chapter04/coreutils-patch.xml @@ -0,0 +1,3 @@ +Coreutils Patch (&coreutils-patch-version;) - &coreutils-patch-size;: +<ulink url="&ftp;/coreutils-&coreutils-patch-version;.patch"/> +<ulink url="&http;/coreutils-&coreutils-patch-version;.patch"/> diff --git a/chapter04/packages.xml b/chapter04/packages.xml index b42df1961..6be2490dc 100644 --- a/chapter04/packages.xml +++ b/chapter04/packages.xml @@ -14,6 +14,7 @@ &c4-bison; &c4-bzip2; &c4-coreutils; +&c4-coreutils-patch; &c4-dejagnu; &c4-diffutils; &c4-e2fsprogs; diff --git a/chapter05/bzip2-inst.xml b/chapter05/bzip2-inst.xml index 04ce1f3f6..7892983ca 100644 --- a/chapter05/bzip2-inst.xml +++ b/chapter05/bzip2-inst.xml @@ -9,6 +9,7 @@ program and start compiling, with a few variables changed to suit our environment:</para> <para><screen><userinput>make -f Makefile-libbz2_so +make clean make make check make PREFIX=/stage1 install diff --git a/chapter06/bzip2-inst.xml b/chapter06/bzip2-inst.xml index afbd5ee37..fdcee6fd4 100644 --- a/chapter06/bzip2-inst.xml +++ b/chapter06/bzip2-inst.xml @@ -5,7 +5,8 @@ <para>Begin compiling the package:</para> -<para><screen><userinput>make -f Makefile-libbz2_so</userinput></screen></para> +<para><screen><userinput>make -f Makefile-libbz2_so && +make clean</userinput></screen></para> <para>The <emphasis>-f</emphasis> flag will cause bzip2 to be built using a different <filename>Makefile</filename> file, in this case the diff --git a/chapter06/coreutils-inst.xml b/chapter06/coreutils-inst.xml index d57a9b490..5947d38c9 100644 --- a/chapter06/coreutils-inst.xml +++ b/chapter06/coreutils-inst.xml @@ -3,18 +3,36 @@ <sect2> <title>Installation of Coreutils</title> -<para><screen><userinput>./configure --prefix=/usr -make -make install -mv /usr/bin/{basename,cat,chgrp,chmod,chown,cp,dd,df} /bin && +<para>Normally the functionality of uname is somewhat broken, in that +the -p switch always returns "unknown". This patch fixes that behaviour:</para> + +<para><screen><userinput>patch -Np1 -i ../coreutils-&coreutils-patch-version;.patch</userinput></screen></para> + +<para>Prepare Coreutils to be compiled:</para> + +<para><screen><userinput>./configure --prefix=/usr</userinput></screen></para> + +<para>Continue with compiling the package:</para> + +<para><screen><userinput>make</userinput></screen></para> + +<para>Install the package:</para> + +<para><screen><userinput>make install</userinput></screen></para> + +<para>Move files to their proper locations:</para> + +<para><screen><userinput>mv /usr/bin/{basename,cat,chgrp,chmod,chown,cp,dd,df} /bin && mv /usr/bin/{dir,dircolors,du,date,echo,false,head} /bin && mv /usr/bin/{install,ln,ls,mkdir,mkfifo,mknod,mv,pwd} /bin && mv /usr/bin/{rm,rmdir,shred,sync,sleep,stty,su,test} /bin && mv /usr/bin/{touch,true,uname,vdir} /bin -mv /usr/bin/chroot /usr/sbin -ln -s test /bin/[ -ln -s ../../bin/install /usr/bin</userinput></screen></para> +mv /usr/bin/chroot /usr/sbin</userinput></screen></para> + +<para>Finally, create a few necessary symlinks</para> +<para><screen><userinput>ln -s test /bin/[ +ln -s ../../bin/install /usr/bin</userinput></screen></para> </sect2> diff --git a/chapter06/gcc-inst.xml b/chapter06/gcc-inst.xml index 0d35d818c..c0c228afd 100644 --- a/chapter06/gcc-inst.xml +++ b/chapter06/gcc-inst.xml @@ -75,5 +75,6 @@ symlink:</para> <para><screen><userinput>ln -s gcc /usr/bin/cc</userinput></screen></para> <para><screen><userinput>rm /usr/lib/libiberty.a</userinput></screen></para> +<para><screen><userinput>rm /usr/include/libiberty.h</userinput></screen></para> </sect2> diff --git a/chapter06/nettools-inst.xml b/chapter06/nettools-inst.xml index 88a75637c..daeff400a 100644 --- a/chapter06/nettools-inst.xml +++ b/chapter06/nettools-inst.xml @@ -25,15 +25,7 @@ the questions generated by <emphasis>make</emphasis> by running <para>Finish installing the package:</para> -<para><screen><userinput>make update</userinput></screen></para> - -<para>The <emphasis>update</emphasis> option to <userinput>make</userinput> -works similarly to the <emphasis>install</emphasis> option, with one -exception: it doesn't make backups of files it's replacing.</para> - -<para>If you decide to reinstall this package at some point in the -future, a <userinput>make update</userinput> won't backup all the files -from a previous net-tools installation.</para> +<para><screen><userinput>make install</userinput></screen></para> </sect2> diff --git a/chapter06/zlib-inst.xml b/chapter06/zlib-inst.xml index 1de4994c3..268b7c66c 100644 --- a/chapter06/zlib-inst.xml +++ b/chapter06/zlib-inst.xml @@ -14,18 +14,23 @@ so by applying this patch:</para> <para><screen><userinput>CFLAGS="$CFLAGS -fPIC" \ ./configure --prefix=/usr --shared</userinput></screen></para> + make clean + ./configure --prefix=/usr + make + make install + <para>The <emphasis>-fPIC</emphasis> flag helps to assure quality in the dynamic zlib library.</para> -<para>Some packages expect a static zlib library to be present -on the system. To satisfy those programs, compile both the -shared and static libraries:</para> - -<para><screen><userinput>make LIBS="libz.so.1.1.4 libz.a"</userinput></screen></para> +<para><screen><userinput>make</userinput></screen></para> <para>Install the libraries:</para> -<para><screen><userinput>make LIBS="libz.so.1.1.4 libz.a" install</userinput></screen></para> +<para><screen><userinput>make install && +make clean && +./configure --prefix=/usr && +make && +make install</userinput></screen></para> <para>The shared zlib library should be installed in the <filename>/lib</filename> directory. That way, in the event diff --git a/entities/coreutils.ent b/entities/coreutils.ent index a8606103e..b1a452a4d 100644 --- a/entities/coreutils.ent +++ b/entities/coreutils.ent @@ -1,4 +1,5 @@ <!ENTITY c4-coreutils SYSTEM "../chapter04/coreutils.xml"> +<!ENTITY c4-coreutils-patch SYSTEM "../chapter04/coreutils-patch.xml"> <!ENTITY c5-coreutils SYSTEM "../chapter05/coreutils.xml"> <!ENTITY c5-coreutils-inst SYSTEM "../chapter05/coreutils-inst.xml"> @@ -13,13 +14,13 @@ <!ENTITY aa-coreutils-down SYSTEM "../appendixa/coreutils-down.xml"> <!ENTITY coreutils-version "5.0"> -<!ENTITY coreutils-depversion "3.1.0"> -<!ENTITY coreutils-contversion "3.1.1"> +<!ENTITY coreutils-depversion ""> +<!ENTITY coreutils-contversion ""> <!ENTITY coreutils-size "1,831 KB"> -<!ENTITY coreutils-patch-size "1 KB"> -<!ENTITY coreutils-patch-version "3.1.1-3"> <!ENTITY coreutils-dir "coreutils-&coreutils-version;"> <!ENTITY coreutils-package "coreutils-&coreutils-version;.tar.bz2"> +<!ENTITY coreutils-patch-size "1 KB"> +<!ENTITY coreutils-patch-version "5.0-uname"> <!ENTITY coreutils-compsize-static "17 MB"> <!ENTITY coreutils-time-static "0.39 SBU"> |