cvs commit: LFS/BOOK/entities diffutils.ent fileutils.ent

gerard at linuxfromscratch.org gerard at linuxfromscratch.org
Sat Jan 11 09:06:14 PST 2003


gerard      03/01/11 12:06:14

  Modified:    BOOK/appendixa diffutils-dep.xml diffutils-desc.xml
                        diffutils.xml fileutils-dep.xml fileutils-desc.xml
                        fileutils.xml
               BOOK/chapter05 diffutils-inst.xml diffutils.xml
                        fileutils-inst.xml fileutils.xml
               BOOK/entities diffutils.ent fileutils.ent
  Added:       BOOK/appendixa bzip2-shortdesc.xml diffutils-shortdesc.xml
                        fileutils-shortdesc.xml
  Removed:     BOOK/chapter05 diffutils-exp.xml fileutils-exp.xml
  Log:
  Rewrote diffutils + fileutils installation pages, added previously not 'cvs add'ed files
  
  Revision  Changes    Path
  1.7       +2 -0      LFS/BOOK/appendixa/diffutils-dep.xml
  
  Index: diffutils-dep.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/appendixa/diffutils-dep.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- diffutils-dep.xml	12 Sep 2002 16:44:20 -0000	1.6
  +++ diffutils-dep.xml	11 Jan 2003 17:06:13 -0000	1.7
  @@ -1,3 +1,5 @@
  +<sect2><title> </title><para> </para></sect2>
  +
   <sect2>
   <title>Diffutils Installation Dependencies</title>
   
  
  
  
  1.8       +4 -5      LFS/BOOK/appendixa/diffutils-desc.xml
  
  Index: diffutils-desc.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/appendixa/diffutils-desc.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- diffutils-desc.xml	4 Jun 2002 11:30:13 -0000	1.7
  +++ diffutils-desc.xml	11 Jan 2003 17:06:13 -0000	1.8
  @@ -1,11 +1,10 @@
  -<sect2><title>Contents of Diffutils</title>
  +<sect2><title> </title><para> </para></sect2>
   
  -<para>Last checked against version &diffutils-contversion;.</para>
  +<sect2><title>Descriptions</title>
   
  -<sect3><title>Program Files</title>
  -<para>cmp, diff, diff3 and sdiff</para></sect3>
  +<para>Last checked against version &diffutils-contversion;.</para>
   
  -<sect3><title>Descriptions</title>
  +<sect3><title>Program files descriptions</title>
   
   <sect4><title>cmp and diff</title>
   <para>cmp and diff both compare two files and report their differences. Both
  
  
  
  1.5       +1 -0      LFS/BOOK/appendixa/diffutils.xml
  
  Index: diffutils.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/appendixa/diffutils.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- diffutils.xml	15 Dec 2001 14:28:34 -0000	1.4
  +++ diffutils.xml	11 Jan 2003 17:06:13 -0000	1.5
  @@ -3,6 +3,7 @@
   <?dbhtml filename="diffutils.html" dir="appendixa"?>
   
   &aa-diffutils-down;
  +&aa-diffutils-shortdesc;
   &aa-diffutils-desc;
   &aa-diffutils-dep;
   
  
  
  
  1.7       +2 -0      LFS/BOOK/appendixa/fileutils-dep.xml
  
  Index: fileutils-dep.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/appendixa/fileutils-dep.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- fileutils-dep.xml	12 Sep 2002 16:44:20 -0000	1.6
  +++ fileutils-dep.xml	11 Jan 2003 17:06:13 -0000	1.7
  @@ -1,3 +1,5 @@
  +<sect2><title> </title><para> </para></sect2>
  +
   <sect2>
   <title>Fileutils Installation Dependencies</title>
   
  
  
  
  1.11      +4 -7      LFS/BOOK/appendixa/fileutils-desc.xml
  
  Index: fileutils-desc.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/appendixa/fileutils-desc.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- fileutils-desc.xml	28 Sep 2002 21:08:27 -0000	1.10
  +++ fileutils-desc.xml	11 Jan 2003 17:06:13 -0000	1.11
  @@ -1,13 +1,10 @@
  -<sect2><title>Contents of Fileutils</title>
  +<sect2><title> </title><para> </para></sect2>
   
  -<para>Last checked against version &fileutils-contversion;.</para>
  +<sect2><title>Descriptions</title>
   
  -<sect3><title>Program Files</title>
  -<para>chgrp, chmod, chown, cp, dd, df, dir, dircolors, du, install, ln, 
  -ls, mkdir, mkfifo, mknod, mv, rm, rmdir, shred, sync, touch 
  -and vdir</para></sect3>
  +<para>Last checked against version &fileutils-contversion;.</para>
   
  -<sect3><title>Descriptions</title>
  +<sect3><title>Program files descriptions</title>
   
   <sect4><title>chgrp</title>
   <para>chgrp changes the group ownership of each given file to the named group, 
  
  
  
  1.5       +1 -0      LFS/BOOK/appendixa/fileutils.xml
  
  Index: fileutils.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/appendixa/fileutils.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- fileutils.xml	15 Dec 2001 14:28:34 -0000	1.4
  +++ fileutils.xml	11 Jan 2003 17:06:13 -0000	1.5
  @@ -3,6 +3,7 @@
   <?dbhtml filename="fileutils.html" dir="appendixa"?>
   
   &aa-fileutils-down;
  +&aa-fileutils-shortdesc;
   &aa-fileutils-desc;
   &aa-fileutils-dep;
   
  
  
  
  1.1                  LFS/BOOK/appendixa/bzip2-shortdesc.xml
  
  Index: bzip2-shortdesc.xml
  ===================================================================
  <sect2><title>Contents of Bzip2</title>
  
  <para>Last checked against version &bzip2-contversion;</para>
  
  <para>Bzip2 is a block-sorting file compressor which generally achieves a
  better compression than the traditional <userinput>gzip</userinput>
  does.</para>
  
  <para>Bzip2 installs the following files:</para>
  
  <sect3><title>Program Files</title>
  <para>bunzip2 (link to bzip2), bzcat (link to bzip2), bzcmp, bzdiff, bzegrep,
  bzfgrep, bzgrep, bzip2, bzip2recover, bzless and bzmore</para></sect3>
  
  <sect3><title>Library Files</title>
  <para>libbz2.a, libbz2.so (link to libbz2.so.1.0), libbz2.so.1.0 (link to
  libbz2.so.1.0.2) and libbz2.so.1.0.2</para></sect3>
  
  </sect2>
  
  
  
  1.1                  LFS/BOOK/appendixa/diffutils-shortdesc.xml
  
  Index: diffutils-shortdesc.xml
  ===================================================================
  <sect2><title>Contents of Diffutils</title>
  
  <para>Last checked against version &diffutils-contversion;.</para>
  
  <para>The programs from this package show you the differences between two
  files or directories. It's most common use is to create software
  patches.</para>
  
  <para>Diffutils installs the following files:</para>
  
  <sect3><title>Program Files</title>
  <para>cmp, diff, diff3 and sdiff</para></sect3>
  
  </sect2>
  
  
  
  
  1.1                  LFS/BOOK/appendixa/fileutils-shortdesc.xml
  
  Index: fileutils-shortdesc.xml
  ===================================================================
  <sect2><title>Contents of Fileutils</title>
  
  <para>Last checked against version &fileutils-contversion;.</para>
  
  <para>Fileutils is a package containing basic file manipulation programs.
  Including are programs to list directories, create directories, update
  timestamps, change permissions and so forth.</para>
  
  <para>Fileutils installs the following files:</para>
  
  <sect3><title>Program Files</title>
  <para>chgrp, chmod, chown, cp, dd, df, dir, dircolors, du, install, ln, 
  ls, mkdir, mkfifo, mknod, mv, rm, rmdir, shred, sync, touch 
  and vdir</para></sect3>
  
  </sect2>
  
  
  
  
  1.17      +29 -3     LFS/BOOK/chapter05/diffutils-inst.xml
  
  Index: diffutils-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter05/diffutils-inst.xml,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- diffutils-inst.xml	30 Dec 2002 03:12:45 -0000	1.16
  +++ diffutils-inst.xml	11 Jan 2003 17:06:14 -0000	1.17
  @@ -1,11 +1,37 @@
  +<sect2><title> </title><para> </para></sect2>
  +
   <sect2>
   <title>Installation of Diffutils</title>
   
  -<para>Install Diffutils by running the following commands:</para>
  +<para>Prepare Diffutils to be compiled:</para>
   
   <para><screen><userinput>LDFLAGS="-static" CPPFLAGS=-Dre_max_failures=re_max_failures2 \
  -    ./configure --prefix=$LFS/static --disable-nls &&
  -make &&
  +    ./configure --prefix=$LFS/static --disable-nls</userinput></screen></para>
  +
  +<para>The meaning of the configure options are:</para>
  +
  +<itemizedlist>
  +<listitem><para><userinput>LDFLAGS="-static":</userinput> This is the most
  +common way to tell a package that all programs should be statically linked.
  +This way the <emphasis>LDFLAGS</emphasis> environment variable is set but
  +only in the subshell that the <filename>configure</filename> script runs
  +in. When <userinput>configure</userinput> is done its job, the
  +<emphasis>LDFLAGS</emphasis> variable won't exist
  +anymore.</para></listitem>
  +
  +<listitem><para><userinput>CPPFLAGS=-Dre_max_failures=re_max_failures2:</userinput>
  +The <emphasis>CPPFLAGS</emphasis> variable is a variable that's read by the
  +cpp program (C PreProcessor). The value of this variable tells the
  +preprocessor to replace every instance of <emphasis>re_max_failures</emphasis>
  +it finds with <emphasis>re_max_failures2</emphasis> before handing the source
  +file to the compiler itself for compilation. This package has problems
  +linking statically on systems that run an older Glibc version and this
  +construction fixes that problem.</para></listitem>
  +</itemizedlist>
  +
  +<para>Finish off by compiling and installing the package:</para>
  +
  +<para><screen><userinput>make
   make install</userinput></screen></para>
   
   </sect2>
  
  
  
  1.9       +2 -3      LFS/BOOK/chapter05/diffutils.xml
  
  Index: diffutils.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter05/diffutils.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- diffutils.xml	14 Dec 2001 23:04:46 -0000	1.8
  +++ diffutils.xml	11 Jan 2003 17:06:14 -0000	1.9
  @@ -5,10 +5,9 @@
   <screen>Estimated build time:           &diffutils-time-static;
   Estimated required disk space:  &diffutils-compsize-static;</screen>
   
  -&c5-diffutils-inst;
  -&c5-diffutils-exp;
  -&aa-diffutils-desc;
  +&aa-diffutils-shortdesc;
   &aa-diffutils-dep;
  +&c5-diffutils-inst;
   
   </sect1>
   
  
  
  
  1.46      +7 -6      LFS/BOOK/chapter05/fileutils-inst.xml
  
  Index: fileutils-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter05/fileutils-inst.xml,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -u -r1.45 -r1.46
  --- fileutils-inst.xml	30 Dec 2002 03:12:45 -0000	1.45
  +++ fileutils-inst.xml	11 Jan 2003 17:06:14 -0000	1.46
  @@ -1,3 +1,5 @@
  +<sect2><title> </title><para> </para></sect2>
  +
   <sect2>
   <title>Installation of Fileutils</title>
   
  @@ -17,7 +19,7 @@
   unavailable at this time.</para>
   
   <para>To fix this package to compile properly on AMD/Glibc-2.2.3
  -machines, run the following command. Do <emphasis>not</emphasis>
  +machines, run the following command. Do <emphasis>NOT</emphasis>
   attempt this fix if you don't have Glibc-2.2.3 installed. It will more 
   than likely result in all kinds of compile time problems.</para>
   
  @@ -26,16 +28,15 @@
   <para>Install Fileutils by running the following commands:</para>
   
   <para><screen><userinput>LDFLAGS="-static" \
  -    ./configure --disable-nls --prefix=$LFS/static &&
  -make &&
  +    ./configure --disable-nls --prefix=$LFS/static
  +make
   make install</userinput></screen></para>
   
   <para>Once you have installed Fileutils, you can test whether the
   segmentation fault problem has been avoided by running
   <userinput>$LFS/static/bin/ls</userinput>. If this works, then you are OK. If
  -not, then you need to re-do the installation with the patch if 
  -you didn't use it, or without the patch if you did use 
  -it.</para>
  +not, then you need to re-do the installation with the patch if you didn't
  +use it, or without the patch if you did use it.</para>
   
   </sect2>
   
  
  
  
  1.9       +2 -3      LFS/BOOK/chapter05/fileutils.xml
  
  Index: fileutils.xml
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/chapter05/fileutils.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- fileutils.xml	14 Dec 2001 23:04:46 -0000	1.8
  +++ fileutils.xml	11 Jan 2003 17:06:14 -0000	1.9
  @@ -5,10 +5,9 @@
   <screen>Estimated build time:           &fileutils-time-static;
   Estimated required disk space:  &fileutils-compsize-static;</screen>
   
  -&c5-fileutils-inst;
  -&c5-fileutils-exp;
  -&aa-fileutils-desc;
  +&aa-fileutils-shortdesc;
   &aa-fileutils-dep;
  +&c5-fileutils-inst;
   
   </sect1>
   
  
  
  
  1.8       +1 -0      LFS/BOOK/entities/diffutils.ent
  
  Index: diffutils.ent
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/entities/diffutils.ent,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- diffutils.ent	30 Dec 2002 04:32:04 -0000	1.7
  +++ diffutils.ent	11 Jan 2003 17:06:14 -0000	1.8
  @@ -8,6 +8,7 @@
   <!ENTITY c6-diffutils-inst SYSTEM "../chapter06/diffutils-inst.xml">
   
   <!ENTITY aa-diffutils SYSTEM "../appendixa/diffutils.xml">
  +<!ENTITY aa-diffutils-shortdesc SYSTEM "../appendixa/diffutils-shortdesc.xml">
   <!ENTITY aa-diffutils-desc SYSTEM "../appendixa/diffutils-desc.xml">
   <!ENTITY aa-diffutils-dep SYSTEM "../appendixa/diffutils-dep.xml">
   <!ENTITY aa-diffutils-down SYSTEM "../appendixa/diffutils-down.xml">
  
  
  
  1.10      +1 -0      LFS/BOOK/entities/fileutils.ent
  
  Index: fileutils.ent
  ===================================================================
  RCS file: /home/cvsroot/LFS/BOOK/entities/fileutils.ent,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- fileutils.ent	30 Dec 2002 04:32:04 -0000	1.9
  +++ fileutils.ent	11 Jan 2003 17:06:14 -0000	1.10
  @@ -9,6 +9,7 @@
   <!ENTITY c6-fileutils-inst SYSTEM "../chapter06/fileutils-inst.xml">
   
   <!ENTITY aa-fileutils SYSTEM "../appendixa/fileutils.xml">
  +<!ENTITY aa-fileutils-shortdesc SYSTEM "../appendixa/fileutils-shortdesc.xml">
   <!ENTITY aa-fileutils-desc SYSTEM "../appendixa/fileutils-desc.xml">
   <!ENTITY aa-fileutils-dep SYSTEM "../appendixa/fileutils-dep.xml">
   <!ENTITY aa-fileutils-down SYSTEM "../appendixa/fileutils-down.xml">
  
  
  
-- 
Unsubscribe: send email to listar at linuxfromscratch.org
and put 'unsubscribe lfs-book' in the subject header of the message



More information about the lfs-book mailing list