aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerard Beekmans <gerard@linuxfromscratch.org>2003-05-12 23:19:36 +0000
committerGerard Beekmans <gerard@linuxfromscratch.org>2003-05-12 23:19:36 +0000
commit185b258b9acbe4492cd927c71dd6c233cca1ef4b (patch)
treec8f764e0c4d54c8d9fa1e8ac6936e2bc34dc3499
parentf26c68d122cd3f29124f782e711adb8e21957603 (diff)
Removed chapter 5 LFS-Utils installation - unnecessary. Patch by Zack.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2589 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--appendixa/lfs-utils-shortdesc.xml2
-rw-r--r--chapter01/changelog.xml4
-rw-r--r--chapter05/chapter05.xml1
-rw-r--r--chapter05/lfs-utils-inst.xml15
-rw-r--r--chapter05/lfs-utils.xml10
-rw-r--r--chapter06/createfiles.xml3
-rw-r--r--entities/lfs-utils.ent3
7 files changed, 6 insertions, 32 deletions
diff --git a/appendixa/lfs-utils-shortdesc.xml b/appendixa/lfs-utils-shortdesc.xml
index 6b8533b69..3edb11266 100644
--- a/appendixa/lfs-utils-shortdesc.xml
+++ b/appendixa/lfs-utils-shortdesc.xml
@@ -9,6 +9,6 @@ individual package.</para>
<para>Lfs-Utils installs the following:</para>
<sect3><title>Program Files</title>
-<para>mktemp, tempfile</para></sect3>
+<para>mktemp, tempfile, http-get, iana-net</para></sect3>
</sect2>
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 9e8a72fee..f9bae0868 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -74,6 +74,10 @@
<listitem><para>May 12th, 2003 [gerard]: Chapter 06 - Basic Network: Added
$(hostname) to /etc/hosts, without it perl's test doesn't pass.</para></listitem>
+<listitem><para>May 12th, 2003 [winkie]: Chapter 05 - Installing
+Lfs-Utils: Removed. The only package that checks for mktemp before it is
+installed is GCC, and that's only for gccbug.</para></listitem>
+
<listitem><para>May 11th, 2003 [gerard]: Chapter 06 - GCC-2.95.3: Added
--enable-threads=posix as well to complete the C++
addition.</para></listitem>
diff --git a/chapter05/chapter05.xml b/chapter05/chapter05.xml
index 87c5acb2a..a8369c913 100644
--- a/chapter05/chapter05.xml
+++ b/chapter05/chapter05.xml
@@ -19,7 +19,6 @@
&c5-binutils-pass2;
&c5-gawk;
&c5-coreutils;
-&c5-lfs-utils;
&c5-bzip2;
&c5-gzip;
&c5-diffutils;
diff --git a/chapter05/lfs-utils-inst.xml b/chapter05/lfs-utils-inst.xml
deleted file mode 100644
index 5c080af8d..000000000
--- a/chapter05/lfs-utils-inst.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installation of Lfs-Utils</title>
-
-<para>Compile the package:</para>
-
-<para><screen><userinput>make</userinput></screen></para>
-
-<para>And install the package:</para>
-
-<para><screen><userinput>make PREFIX=/stage1 install</userinput></screen></para>
-
-</sect2>
-
diff --git a/chapter05/lfs-utils.xml b/chapter05/lfs-utils.xml
deleted file mode 100644
index b24a766c4..000000000
--- a/chapter05/lfs-utils.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<sect1 id="ch05-lfs-utils">
-<title>Installing Lfs-Utils-&lfs-utils-version;</title>
-<?dbhtml filename="lfs-utils.html" dir="chapter05"?>
-
-&aa-lfs-utils-shortdesc;
-&aa-lfs-utils-dep;
-&c5-lfs-utils-inst;
-
-</sect1>
-
diff --git a/chapter06/createfiles.xml b/chapter06/createfiles.xml
index f6df24e0d..1be2246a8 100644
--- a/chapter06/createfiles.xml
+++ b/chapter06/createfiles.xml
@@ -26,8 +26,7 @@ ln -sf /stage1/bin/mv /bin
ln -sf /stage1/bin/chmod /bin
ln -sf /stage1/bin/chgrp /bin
ln -sf /stage1/bin/sort /usr/bin
-ln -sf /stage1/bin/cmp /usr/bin
-ln -sf /stage1/bin/mktemp /usr/bin</userinput></screen></para>
+ln -sf /stage1/bin/cmp /usr/bin</userinput></screen></para>
</sect1>
diff --git a/entities/lfs-utils.ent b/entities/lfs-utils.ent
index 6b381c4bb..47db58367 100644
--- a/entities/lfs-utils.ent
+++ b/entities/lfs-utils.ent
@@ -1,8 +1,5 @@
<!ENTITY c4-lfs-utils SYSTEM "../chapter04/lfs-utils.xml">
-<!ENTITY c5-lfs-utils SYSTEM "../chapter05/lfs-utils.xml">
-<!ENTITY c5-lfs-utils-inst SYSTEM "../chapter05/lfs-utils-inst.xml">
-
<!ENTITY c6-lfs-utils SYSTEM "../chapter06/lfs-utils.xml">
<!ENTITY c6-lfs-utils-inst SYSTEM "../chapter06/lfs-utils-inst.xml">