From 63eb55cb8f49a9a9bb15ed2312a64a52100c448d Mon Sep 17 00:00:00 2001 From: Gerard Beekmans Date: Wed, 15 Jan 2003 01:45:00 +0000 Subject: [PATCH] converted gzip, make and patch git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2319 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- appendixa/gzip-dep.xml | 2 ++ appendixa/gzip-desc.xml | 11 ++++------- appendixa/gzip-shortdesc.xml | 15 +++++++++++++++ appendixa/make-dep.xml | 2 ++ appendixa/make-desc.xml | 13 ++++++------- appendixa/make-shortdesc.xml | 14 ++++++++++++++ appendixa/patch-dep.xml | 2 ++ appendixa/patch-desc.xml | 9 ++++----- appendixa/patch-shortdesc.xml | 15 +++++++++++++++ chapter05/gzip-inst.xml | 16 ++++++++++++---- chapter05/gzip.xml | 4 ++-- chapter05/make-inst.xml | 24 ++++++++++++++++-------- chapter05/make.xml | 4 ++-- chapter05/patch-exp.xml | 10 ---------- chapter05/patch-inst.xml | 25 +++++++++++++++++++++---- chapter05/patch.xml | 5 ++--- entities/gzip.ent | 1 + entities/make.ent | 1 + entities/patch.ent | 2 +- 19 files changed, 122 insertions(+), 53 deletions(-) create mode 100644 appendixa/gzip-shortdesc.xml create mode 100644 appendixa/make-shortdesc.xml create mode 100644 appendixa/patch-shortdesc.xml delete mode 100644 chapter05/patch-exp.xml diff --git a/appendixa/gzip-dep.xml b/appendixa/gzip-dep.xml index 0b7c7258e..02c4b481b 100644 --- a/appendixa/gzip-dep.xml +++ b/appendixa/gzip-dep.xml @@ -1,3 +1,5 @@ +   + Gzip Installation Dependencies diff --git a/appendixa/gzip-desc.xml b/appendixa/gzip-desc.xml index 3faab5899..d3070849d 100644 --- a/appendixa/gzip-desc.xml +++ b/appendixa/gzip-desc.xml @@ -1,13 +1,10 @@ -Contents of Gzip +   + +Descriptions Last checked against version &gzip-contversion;. -Program Files -gunzip (link to gzip), gzexe, gzip, -uncompress (link to gunzip), zcat (link to gzip), zcmp, zdiff, zforce, -zgrep, zmore and znew - -Description +Program file descriptions gunzip, uncompress gunzip and uncompress decompress files which are compressed with diff --git a/appendixa/gzip-shortdesc.xml b/appendixa/gzip-shortdesc.xml new file mode 100644 index 000000000..109144cb9 --- /dev/null +++ b/appendixa/gzip-shortdesc.xml @@ -0,0 +1,15 @@ +Contents of Gzip + +Last checked against version &gzip-contversion;. + +The gzip package contains program to compress and decompress files +using the Lempel-Ziv coding (LZ77). + +Gzip installs the following: + +Program Files +gunzip (link to gzip), gzexe, gzip, +uncompress (link to gunzip), zcat (link to gzip), zcmp, zdiff, zforce, +zgrep, zmore and znew + + diff --git a/appendixa/make-dep.xml b/appendixa/make-dep.xml index 052efc816..3bab6f4ed 100644 --- a/appendixa/make-dep.xml +++ b/appendixa/make-dep.xml @@ -1,3 +1,5 @@ +   + Make Installation Dependencies diff --git a/appendixa/make-desc.xml b/appendixa/make-desc.xml index 12798845e..4df8ae26d 100644 --- a/appendixa/make-desc.xml +++ b/appendixa/make-desc.xml @@ -1,15 +1,14 @@ -Contents of Make +   + +Descriptions Last checked against version &make-contversion;. -Program files -make - -Descriptions +Program file descriptions make -make determines, automatically, which pieces of a large program need to be -recompiled and issues the commands to recompile them. +make determines, automatically, which pieces of a large program need +to be recompiled and issues the commands to recompile them. diff --git a/appendixa/make-shortdesc.xml b/appendixa/make-shortdesc.xml new file mode 100644 index 000000000..6983ca038 --- /dev/null +++ b/appendixa/make-shortdesc.xml @@ -0,0 +1,14 @@ +Contents of Make + +Last checked against version &make-contversion;. + +Make determines, automatically, which pieces of a large program need +to be recompiled and issues the commands to recompile them. + +Make installs the following: + +Program files +make + + + diff --git a/appendixa/patch-dep.xml b/appendixa/patch-dep.xml index 8d46164e4..7bb660007 100644 --- a/appendixa/patch-dep.xml +++ b/appendixa/patch-dep.xml @@ -1,3 +1,5 @@ +   + Patch Installation Dependencies diff --git a/appendixa/patch-desc.xml b/appendixa/patch-desc.xml index 303ebb9f7..703f22044 100644 --- a/appendixa/patch-desc.xml +++ b/appendixa/patch-desc.xml @@ -1,11 +1,10 @@ -Contents of Patch +   + +Descriptions Last checked against version &patch-contversion;. -Program Files -patch - -Descriptions +Program files descriptions patch The patch program modifies a file according to a patch file. A patch diff --git a/appendixa/patch-shortdesc.xml b/appendixa/patch-shortdesc.xml new file mode 100644 index 000000000..00f9d9610 --- /dev/null +++ b/appendixa/patch-shortdesc.xml @@ -0,0 +1,15 @@ +Contents of Patch + +Last checked against version &patch-contversion;. + +The patch program modifies a file according to a patch file. A patch +file usually is a list, created by the diff program, that contains +instructions on how an original file needs to be modified. + +Make installs the following: + +Program Files +patch + + + diff --git a/chapter05/gzip-inst.xml b/chapter05/gzip-inst.xml index e7828b436..77737e234 100644 --- a/chapter05/gzip-inst.xml +++ b/chapter05/gzip-inst.xml @@ -1,11 +1,19 @@ +   + Installation of Gzip -Install Gzip by running the following commands: +Prepare Gzip to be compiled: -./configure --prefix=$LFS/static && -make LDFLAGS="-static" && -make install +./configure --prefix=$LFS/static + +Continue with compiling the package: + +make LDFLAGS="-static" + +And finish off installing the package: + +make install diff --git a/chapter05/gzip.xml b/chapter05/gzip.xml index 9ae7efa96..6d608ceb1 100644 --- a/chapter05/gzip.xml +++ b/chapter05/gzip.xml @@ -5,9 +5,9 @@ Estimated build time: &gzip-time-static; Estimated required disk space: &gzip-compsize-static; -&c5-gzip-inst; -&aa-gzip-desc; +&aa-gzip-shortdesc; &aa-gzip-dep; +&c5-gzip-inst; diff --git a/chapter05/make-inst.xml b/chapter05/make-inst.xml index 8f91baa6a..5efe572a3 100644 --- a/chapter05/make-inst.xml +++ b/chapter05/make-inst.xml @@ -1,11 +1,19 @@ +   + Installation of Make -Install Make by running the following commands: +Prepare Make to be compiled: -LDFLAGS="-static" ./configure --prefix=$LFS/static --disable-nls && -make && -make install +LDFLAGS="-static" ./configure --prefix=$LFS/static --disable-nls + +Continue with compiling the package: + +make + +And finish off installing the package: + +make install During the make install phase you will see this warning: @@ -14,10 +22,10 @@ make install otherwise the `-l' option will probably not work. You may need special privileges to complete the installation of /mnt/lfs/static/bin/make. -You can safely ignore this warning. The make program doesn't actually need to be owned by -group kmem and setgid for the -l option to work. (This option -tells make not to start any new jobs when a certain load on -the system has been reached.) +You can safely ignore this warning. The make program doesn't actually +need to be owned by group kmem and setgid for the -l +option to work. (This option tells make not to start any new jobs when a +certain load on the system has been reached.) diff --git a/chapter05/make.xml b/chapter05/make.xml index 4e4f2ca34..ebb9331bb 100644 --- a/chapter05/make.xml +++ b/chapter05/make.xml @@ -5,9 +5,9 @@ Estimated build time: &make-time-static; Estimated required disk space: &make-compsize-static; -&c5-make-inst; -&aa-make-desc; +&aa-make-shortdesc; &aa-make-dep; +&c5-make-inst; diff --git a/chapter05/patch-exp.xml b/chapter05/patch-exp.xml deleted file mode 100644 index ed90304af..000000000 --- a/chapter05/patch-exp.xml +++ /dev/null @@ -1,10 +0,0 @@ - -Command explanations - -CPPFLAGS=-D_GNU_SOURCE: -This flag fixes installation problems of this package on PPC and m68k -platforms (that we know of). It doesn't hurt compilation on other -platforms, such as x86, so we do it by default. - - - diff --git a/chapter05/patch-inst.xml b/chapter05/patch-inst.xml index 9142a23bf..9f9467b2b 100644 --- a/chapter05/patch-inst.xml +++ b/chapter05/patch-inst.xml @@ -1,12 +1,29 @@ +   + Installation of Patch -Install Patch by running the following commands: +Prepare Patch to be compiled: CPPFLAGS=-D_GNU_SOURCE \ -    LDFLAGS="-static" ./configure --prefix=$LFS/static && -make && -make install +    LDFLAGS="-static" ./configure --prefix=$LFS/static + +The meaning of the configure option is: + + +CPPFLAGS=-D_GNU_SOURCE: This flag +fixes installation problems of this package on PPC and m68k platforms (that +we know of). It doesn't hurt compilation on other platforms, such as x86, +so we do it by default. + + +Continue with compiling the package: + +make + +And finish off installing the package: + +make install diff --git a/chapter05/patch.xml b/chapter05/patch.xml index f0a5007fe..c8d6b8d65 100644 --- a/chapter05/patch.xml +++ b/chapter05/patch.xml @@ -5,10 +5,9 @@ Estimated build time: &patch-time-static; Estimated required disk space: &patch-compsize-static; -&c5-patch-inst; -&c5-patch-exp; -&aa-patch-desc; +&aa-patch-shortdesc; &aa-patch-dep; +&c5-patch-inst; diff --git a/entities/gzip.ent b/entities/gzip.ent index 5d964958f..44e5e4b2d 100644 --- a/entities/gzip.ent +++ b/entities/gzip.ent @@ -9,6 +9,7 @@ + diff --git a/entities/make.ent b/entities/make.ent index 778d5c0c7..f8aebcde8 100644 --- a/entities/make.ent +++ b/entities/make.ent @@ -8,6 +8,7 @@ + diff --git a/entities/patch.ent b/entities/patch.ent index 587e69960..14c3ce1f3 100644 --- a/entities/patch.ent +++ b/entities/patch.ent @@ -2,12 +2,12 @@ - +