From b88080b5885e4cbef7c506801f5e9c9f0af00079 Mon Sep 17 00:00:00 2001 From: Simon Perreault Date: Wed, 9 May 2001 01:05:49 +0000 Subject: [PATCH] removed the ldso section (and all references to it in the appendixes) and replaced that by a patch to man-pages (and added references to it in all appendixes) git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@602 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- Attic/appendixc/ldso.xml | 4 ---- Attic/appendixc/manpages-patch.xml | 6 ++++++ Attic/appendixc/packages.xml | 2 +- appendixa/appendixa.xml | 1 - appendixa/ldso-desc.xml | 9 --------- appendixa/ldso.xml | 7 ------- chapter01/changelog.xml | 5 +++++ chapter04/manpages-patch.xml | 6 ++++++ chapter04/packages.xml | 2 +- chapter06/chapter06.xml | 1 - chapter06/ldso-inst.xml | 15 --------------- chapter06/ldso.xml | 7 ------- chapter06/manpages-inst.xml | 2 ++ index.xml | 9 ++------- 14 files changed, 23 insertions(+), 53 deletions(-) delete mode 100644 Attic/appendixc/ldso.xml create mode 100644 Attic/appendixc/manpages-patch.xml delete mode 100644 appendixa/ldso-desc.xml delete mode 100644 appendixa/ldso.xml create mode 100644 chapter04/manpages-patch.xml delete mode 100644 chapter06/ldso-inst.xml delete mode 100644 chapter06/ldso.xml diff --git a/Attic/appendixc/ldso.xml b/Attic/appendixc/ldso.xml deleted file mode 100644 index e482df013..000000000 --- a/Attic/appendixc/ldso.xml +++ /dev/null @@ -1,4 +0,0 @@ -Ld.so (&ld.so-version;): - -ftp://ftp.ods.com/pub/linux/ - diff --git a/Attic/appendixc/manpages-patch.xml b/Attic/appendixc/manpages-patch.xml new file mode 100644 index 000000000..3c32cd6dd --- /dev/null +++ b/Attic/appendixc/manpages-patch.xml @@ -0,0 +1,6 @@ +Man-pages Patch (&man-pages-version;): + +&ftp;/ + +&http;/ + diff --git a/Attic/appendixc/packages.xml b/Attic/appendixc/packages.xml index a1ee05fdd..f7f876821 100644 --- a/Attic/appendixc/packages.xml +++ b/Attic/appendixc/packages.xml @@ -51,7 +51,6 @@ package quicker. &ac-kbd; &ac-e2fsprogs; &ac-ed; -&ac-ldso; &ac-lilo; &ac-modutils; &ac-vim; @@ -65,6 +64,7 @@ package quicker. &ac-sysvinit-patch; &ac-utillinux; &ac-manpages; +&ac-manpages-patch; &ac-netkitbase; &ac-nettools; diff --git a/appendixa/appendixa.xml b/appendixa/appendixa.xml index e18e92084..84cb3b921 100644 --- a/appendixa/appendixa.xml +++ b/appendixa/appendixa.xml @@ -30,7 +30,6 @@ &aa-gettext; &aa-grep; &aa-gzip; -&aa-ldso; &aa-libtool; &aa-bin86; &aa-lilo; diff --git a/appendixa/ldso-desc.xml b/appendixa/ldso-desc.xml deleted file mode 100644 index cac7cbeee..000000000 --- a/appendixa/ldso-desc.xml +++ /dev/null @@ -1,9 +0,0 @@ -Contents - - -From the Ld.so package we're using the ldconfig and ldd man pages only. -The ldconfig and ldd binaries themselves come with Glibc. - - - - diff --git a/appendixa/ldso.xml b/appendixa/ldso.xml deleted file mode 100644 index 60c1fdb7d..000000000 --- a/appendixa/ldso.xml +++ /dev/null @@ -1,7 +0,0 @@ - -Ld.so - -&aa-ldso-desc; - - - diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 56bd44c01..d4a670418 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -185,6 +185,11 @@ couple of the installed files are shell scripts rather than programs, so they can't be stripped. + +Chapter 6: Removed the ld.so section since we only used the man pages and +replaced it with a patch to man-pages. + + Chapter 7: Fixed the delays in the killproc function in the functions script. Now, after kill, first check PIDs, then sleep 2 if needed. More diff --git a/chapter04/manpages-patch.xml b/chapter04/manpages-patch.xml new file mode 100644 index 000000000..d23cfbae4 --- /dev/null +++ b/chapter04/manpages-patch.xml @@ -0,0 +1,6 @@ +Man-pages Patch (&man-pages-version;) 3.2 KB: + + &ftp;/man-pages-&man-pages-version;.patch.bz2 + + &http;/man-pages-&man-pages-version;.patch.bz2 + diff --git a/chapter04/packages.xml b/chapter04/packages.xml index 1686900f4..057fa90b2 100644 --- a/chapter04/packages.xml +++ b/chapter04/packages.xml @@ -28,6 +28,7 @@ &c3-glibc; &c3-glibc-threads; &c3-manpages; +&c3-manpages-patch; &c3-ed; &c3-patch; &c3-findutils; @@ -49,7 +50,6 @@ &c3-bin86; &c3-kbd; &c3-e2fsprogs; -&c3-ldso; &c3-lilo; &c3-modutils; &c3-procinfo; diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml index cf197bd06..cd208ee5d 100644 --- a/chapter06/chapter06.xml +++ b/chapter06/chapter06.xml @@ -39,7 +39,6 @@ &c6-fileutils; &c6-grep; &c6-gzip; -&c6-ldso; &c6-lilo; &c6-make; &c6-modutils; diff --git a/chapter06/ldso-inst.xml b/chapter06/ldso-inst.xml deleted file mode 100644 index 011a87251..000000000 --- a/chapter06/ldso-inst.xml +++ /dev/null @@ -1,15 +0,0 @@ - -Installation of Ld.so - - -Install Ld.so by running the following commands: - - -
- cd man && - cp ldd.1 /usr/share/man/man1 && - cp *.8 /usr/share/man/man8 -
- - - diff --git a/chapter06/ldso.xml b/chapter06/ldso.xml deleted file mode 100644 index 670f3bc2b..000000000 --- a/chapter06/ldso.xml +++ /dev/null @@ -1,7 +0,0 @@ - -Installing Ld.so - -&c6-ldso-inst; -&aa-ldso-desc; - - diff --git a/chapter06/manpages-inst.xml b/chapter06/manpages-inst.xml index e7fade0d6..cf0fbd8bb 100644 --- a/chapter06/manpages-inst.xml +++ b/chapter06/manpages-inst.xml @@ -6,6 +6,8 @@ Install Man-pages by running the following command:
+ patch -Np1 -i ../man-pages-&man-pages-version;.patch + && make install
diff --git a/index.xml b/index.xml index dedc3d8c0..52b41e039 100644 --- a/index.xml +++ b/index.xml @@ -92,6 +92,7 @@ + @@ -113,7 +114,6 @@ - @@ -245,8 +245,6 @@ - - @@ -404,8 +402,6 @@ - - @@ -485,6 +481,7 @@ + @@ -506,7 +503,6 @@ - @@ -559,7 +555,6 @@ -