From 4ce81936004b8456da550d6ab5d27e5dd76f00b6 Mon Sep 17 00:00:00 2001 From: Timothy Bauscher Date: Thu, 16 Jan 2003 00:59:20 +0000 Subject: [PATCH] Convert zlib to new layout. Conform shortdesc files. git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2345 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- appendixa/makedev-shortdesc.xml | 2 ++ appendixa/manpages-shortdesc.xml | 2 ++ appendixa/patch-shortdesc.xml | 2 +- appendixa/perl-shortdesc.xml | 2 ++ appendixa/tar-shortdesc.xml | 2 ++ appendixa/texinfo-shortdesc.xml | 2 ++ appendixa/textutils-shortdesc.xml | 2 ++ appendixa/utillinux-shortdesc.xml | 2 ++ appendixa/zlib-dep.xml | 2 ++ appendixa/zlib-desc.xml | 9 +++---- appendixa/zlib-down.xml | 2 ++ appendixa/zlib-shortdesc.xml | 15 +++++++++++ appendixa/zlib.xml | 1 + chapter06/zlib-inst.xml | 44 ++++++++++++++++++++++++++----- chapter06/zlib.xml | 4 +-- entities/zlib.ent | 1 + 16 files changed, 79 insertions(+), 15 deletions(-) create mode 100644 appendixa/zlib-shortdesc.xml diff --git a/appendixa/makedev-shortdesc.xml b/appendixa/makedev-shortdesc.xml index bf5b98428..de672d4b0 100644 --- a/appendixa/makedev-shortdesc.xml +++ b/appendixa/makedev-shortdesc.xml @@ -8,6 +8,8 @@ directory. Detailed information about device nodes may be found in the Documentation/devices.txt file under the Linux kernel source tree. +MAKDEV installs the following: + Program Files MAKEDEV diff --git a/appendixa/manpages-shortdesc.xml b/appendixa/manpages-shortdesc.xml index b89359674..3b3134b87 100644 --- a/appendixa/manpages-shortdesc.xml +++ b/appendixa/manpages-shortdesc.xml @@ -7,6 +7,8 @@ documentation details the C and C++ functions, describes a few important device files and provides documents which would otherwise be missing from other packages. +Man-pages installs the following: + Support Files Various manual pages. diff --git a/appendixa/patch-shortdesc.xml b/appendixa/patch-shortdesc.xml index 00f9d9610..6d4f597ef 100644 --- a/appendixa/patch-shortdesc.xml +++ b/appendixa/patch-shortdesc.xml @@ -6,7 +6,7 @@ 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: +Patch installs the following: Program Files patch diff --git a/appendixa/perl-shortdesc.xml b/appendixa/perl-shortdesc.xml index d09afcea1..041b1c3d4 100644 --- a/appendixa/perl-shortdesc.xml +++ b/appendixa/perl-shortdesc.xml @@ -6,6 +6,8 @@ and Report Language. Perl combines some of the best features of C, sed, awk and sh into one powerful language. +Perl installs the following: + Program files and libraries a2p, c2ph, dprofpp, find2perl, h2ph, h2xs, perl, perl5.6.1, diff --git a/appendixa/tar-shortdesc.xml b/appendixa/tar-shortdesc.xml index 70489e8e3..1c0b4a771 100644 --- a/appendixa/tar-shortdesc.xml +++ b/appendixa/tar-shortdesc.xml @@ -5,6 +5,8 @@ Tar is an archiving program designed to store and extract files from an archive file known as a tar file. +Tar installs the following: + Program Files rmt and tar diff --git a/appendixa/texinfo-shortdesc.xml b/appendixa/texinfo-shortdesc.xml index 562bd807f..ae095558f 100644 --- a/appendixa/texinfo-shortdesc.xml +++ b/appendixa/texinfo-shortdesc.xml @@ -6,6 +6,8 @@ writing and converting Info documents, which provide system documentation. +Texinfo installs the following: + Program Files info, infokey, install-info, makeinfo, texi2dvi and texindex diff --git a/appendixa/textutils-shortdesc.xml b/appendixa/textutils-shortdesc.xml index beac1bf2c..b7619f511 100644 --- a/appendixa/textutils-shortdesc.xml +++ b/appendixa/textutils-shortdesc.xml @@ -5,6 +5,8 @@ The Textutils package contains several file manipulation and text processing programs. +Textutils installs the following: + Program Files cat, cksum, comm, csplit, cut, expand, fmt, fold, head, join, md5sum, nl, od, paste, pr, ptx, sort, split, sum, diff --git a/appendixa/utillinux-shortdesc.xml b/appendixa/utillinux-shortdesc.xml index dae3704d3..956a035d8 100644 --- a/appendixa/utillinux-shortdesc.xml +++ b/appendixa/utillinux-shortdesc.xml @@ -7,6 +7,8 @@ utility programs. Some of the more prominent utilities are used to mount, unmount, format, partition and manage disk drives, open tty ports and fetch kernel messages. +Util-linux installs the following: + Program Files agetty, arch, blockdev, cal, cfdisk, chkdupexe, col, colcrt, colrm, column, ctrlaltdel, cytune, ddate, dmesg, elvtune, fdformat, fdisk, diff --git a/appendixa/zlib-dep.xml b/appendixa/zlib-dep.xml index 716d6c7bb..c39842fa9 100644 --- a/appendixa/zlib-dep.xml +++ b/appendixa/zlib-dep.xml @@ -1,3 +1,5 @@ +   + Zlib Installation Dependencies diff --git a/appendixa/zlib-desc.xml b/appendixa/zlib-desc.xml index 45f1823a1..184f4627a 100644 --- a/appendixa/zlib-desc.xml +++ b/appendixa/zlib-desc.xml @@ -1,11 +1,10 @@ -Contents of Zlib +   + +Descriptions Last checked against version &zlib-contversion;. -Library Files -libz[a,so] - -Descriptions +Program file descriptions libz This is the zlib library, which is used by many programs for its diff --git a/appendixa/zlib-down.xml b/appendixa/zlib-down.xml index 21d2b442f..09d34097e 100644 --- a/appendixa/zlib-down.xml +++ b/appendixa/zlib-down.xml @@ -1,3 +1,5 @@ +   + Official Download Location diff --git a/appendixa/zlib-shortdesc.xml b/appendixa/zlib-shortdesc.xml new file mode 100644 index 000000000..b02a68831 --- /dev/null +++ b/appendixa/zlib-shortdesc.xml @@ -0,0 +1,15 @@ +Contents of Zlib + +Last checked against version &zlib-contversion;. + +The Zlib package contains the zlib library, which +is used by many programs for its compression and uncompression +functions. + +Zlib installs the following: + +Library Files +libz[a,so] + + + diff --git a/appendixa/zlib.xml b/appendixa/zlib.xml index b1f41a223..5e2b58746 100644 --- a/appendixa/zlib.xml +++ b/appendixa/zlib.xml @@ -3,6 +3,7 @@ &aa-zlib-down; +&aa-zlib-shortdesc; &aa-zlib-desc; &aa-zlib-dep; diff --git a/chapter06/zlib-inst.xml b/chapter06/zlib-inst.xml index de778d548..94c901644 100644 --- a/chapter06/zlib-inst.xml +++ b/chapter06/zlib-inst.xml @@ -1,14 +1,44 @@ +   + Installation of Zlib -Install Zlib by running the following commands: +Prepare Zlib to be compiled: CFLAGS="$CFLAGS -fPIC" \ -./configure --prefix=/usr --shared && -make LIBS="libz.so.1.1.4 libz.a" && -make LIBS="libz.so.1.1.4 libz.a" install && -mv /usr/lib/libz.so.* /lib && -ln -sf ../../lib/libz.so.1 /usr/lib/libz.so && -cp zlib.3 /usr/share/man/man3 +    ./configure --prefix=/usr --shared + +The -fPIC flag helps to assure +quality in the dynamic zlib library. + +Some packages expect a static zlib library to be present +on the system. To satisfy those programs, compile both the +shared and static libraries: + +make LIBS="libz.so.1.1.4 libz.a" + +Install the libraries: + +make LIBS="libz.so.1.1.4 libz.a" install + +The shared zlib library should be installed in the +/lib directory. That way, in the event +that you must boot without the /usr +directory, vital system programs will still have access to +the library. Finish installing shared library: + +mv /usr/lib/libz.so.* /lib + +The /usr/lib/libz.so symlink is +linked to a file which no longer exists, because we moved +it. Create a symbolic link to the new location of the +library: + +ln -sf ../../lib/libz.so.1 /usr/lib/libz.so + +Zlib does not install its manual page. Issue the +following command to install this documentation: + +cp zlib.3 /usr/share/man/man3 diff --git a/chapter06/zlib.xml b/chapter06/zlib.xml index db8233941..0a204357d 100644 --- a/chapter06/zlib.xml +++ b/chapter06/zlib.xml @@ -5,9 +5,9 @@ Estimated build time: &zlib-time; Estimated required disk space: &zlib-compsize; -&c6-zlib-inst; -&aa-zlib-desc; +&aa-zlib-shortdesc; &aa-zlib-dep; +&c6-zlib-inst; diff --git a/entities/zlib.ent b/entities/zlib.ent index 2db600e28..74e4a9666 100644 --- a/entities/zlib.ent +++ b/entities/zlib.ent @@ -7,6 +7,7 @@ +