diff options
| -rw-r--r-- | chapter01/changelog.xml | 5 | ||||
| -rw-r--r-- | chapter03/patches.xml | 4 | ||||
| -rw-r--r-- | chapter06/coreutils.xml | 24 |
3 files changed, 12 insertions, 21 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 37e7a71d4..09707a853 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -53,6 +53,7 @@ first a summary, then a detailed log.</para> <listitem><para>Added:</para> <itemizedlist> +<listitem><para>coreutils-5.2.1-dupes-1.patch</para></listitem> <listitem><para>flex-2.5.31-debian-fixes-2.patch</para></listitem> <listitem><para>iana-etc-1.00</para></listitem> <listitem><para>inetutils-1.4.2-kernel-headers-1.patch</para></listitem> @@ -75,6 +76,7 @@ first a summary, then a detailed log.</para> <listitem><para>Removed:</para> <itemizedlist> <listitem><para>bison-1.875-attribute.patch</para></listitem> +<listitem><para>coreutils-5.2.1-hostname-1.patch</para></listitem> <listitem><para>ed-0.2</para></listitem> <listitem><para>gcc-2.95.3</para></listitem> <listitem><para>gcc-3.3.1-suppress-libiberty.patch</para></listitem> @@ -94,6 +96,9 @@ first a summary, then a detailed log.</para> </itemizedlist> </listitem> +<listitem><para>May 12th, 2004 [winkie]: Apply patch to assure Coreutils doesn't +install any binaries that we don't need/want.</para></listitem> + <listitem><para>May 12th, 2004 [winkie]: Don't pass <quote>-default</quote> to Man's configure, since it's not needed anymore.</para></listitem> diff --git a/chapter03/patches.xml b/chapter03/patches.xml index 9ec9157e8..90bcaa7a7 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -22,9 +22,9 @@ following:</para> </varlistentry> <varlistentry> -<term>Coreutils Hostname Patch - 1 KB:</term> +<term>Coreutils Dupes Patch - 16 KB:</term> <listitem> -<para><ulink url="&patches-root;coreutils-&coreutils-version;-hostname-1.patch"/></para> +<para><ulink url="&patches-root;coreutils-&coreutils-version;-dupes-1.patch"/></para> </listitem> </varlistentry> diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml index 0a98f0ff2..c65ca6a34 100644 --- a/chapter06/coreutils.xml +++ b/chapter06/coreutils.xml @@ -30,11 +30,10 @@ architectures:</para> <screen><userinput>patch -Np1 -i ../coreutils-&coreutils-version;-uname-2.patch</userinput></screen> -<para>We do not want Coreutils to install its version of the -<command>hostname</command> program, because it is inferior to the version -provided by Net-tools. Prevent its installation by applying a patch:</para> +<para>Prevent Coreutils from installing binaries that will be later be installed +by other programs:</para> -<screen><userinput>patch -Np1 -i ../coreutils-&coreutils-version;-hostname-1.patch</userinput></screen> +<screen><userinput>patch -Np1 -i ../coreutils-&coreutils-version;-dupes-1.patch</userinput></screen> <para>Now prepare Coreutils for compilation:</para> @@ -50,13 +49,6 @@ therefore have to set up a few things before being able to run the tests. If you choose not to run these tests, skip down to <quote>Install the package</quote>.</para> -<para>To be able to run the full test suite, the <command>su</command> program -needs to be installed. We didn't bother to install this little program in -<xref linkend="chapter-temporary-tools"/> because it requires root privileges, -so do it now:</para> - -<screen><userinput>make install-root</userinput></screen> - <para>Create two dummy groups and a dummy user name:</para> <screen><userinput>echo "dummy1:x:1000" >> /etc/group @@ -71,7 +63,7 @@ are meant to be run as <emphasis>root</emphasis>:</para> <para>Then run the remainder of the tests as the <emphasis>dummy</emphasis> user:</para> -<screen><userinput>su dummy -c "make RUN_EXPENSIVE_TESTS=yes check"</userinput></screen> +<screen><userinput>src/su dummy -c "make RUN_EXPENSIVE_TESTS=yes check"</userinput></screen> <para>When you're done testing, remove the dummy user and groups:</para> @@ -86,15 +78,9 @@ user:</para> <screen><userinput>mv /usr/bin/{[,basename,cat,chgrp,chmod,chown,cp,dd,df} /bin mv /usr/bin/{date,echo,false,head,install,ln,ls} /bin mv /usr/bin/{mkdir,mknod,mv,pwd,rm,rmdir,sync} /bin -mv /usr/bin/{sleep,stty,su,test,touch,true,uname} /bin +mv /usr/bin/{sleep,stty,test,touch,true,uname} /bin mv /usr/bin/chroot /usr/sbin</userinput></screen> -<para>We'll be using the <filename>kill</filename> program from the Procps -package (installed as <filename>/bin/kill</filename> later in the chapter). -Remove the one installed by Coreutils:</para> - -<screen><userinput>rm /usr/bin/kill</userinput></screen> - <para>Finally, create a symlink to be FHS-compliant:</para> <screen><userinput>ln -s ../../bin/install /usr/bin</userinput></screen> |