Mainline merge as of 2005-08-23

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/gcc4/BOOK@6747 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

6 files changed, 68 insertions, 35 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index c2a5ba428..778ecd89e 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -119,6 +119,20 @@ First a summary, then a detailed log.</para>
 </itemizedlist>
 </listitem>
 
+<listitem><para>August 23rd, 2005 [matt]: Install Udev's documentation relating
+to configuring rules (fixes bug 1622)</para></listitem>
+
+<listitem><para>August 23rd, 2005 [matt]: Upgrade to Man-1.6a</para></listitem>
+
+<listitem><para>August 20th, 2005 [matt]: Stop moving some of coreutils binaries
+to /bin as they aren't required to be there (fixes bug 1620).</para></listitem>
+
+<listitem><para>August 19th, 2005 [matt]: Upgrade to Udev-068</para></listitem>
+
+<listitem><para>August 19th, 2005 [matt]: Upgrade to IANA-etc-2.00</para></listitem>
+
+<listitem><para>August 19th, 2005 [matt]: Upgrade to file-4.15</para></listitem>
+
 <listitem><para>August 18th, 2005 [matt]: Simplify the method for finding where
 GCC's default specs file and private include directory live.  Additionally,
 don't assume the host's sed supports the -i switch.</para></listitem>
diff --git a/chapter03/packages.xml b/chapter03/packages.xml
index f49abc188..ab47938c1 100644
--- a/chapter03/packages.xml
+++ b/chapter03/packages.xml
@@ -96,7 +96,7 @@
 </varlistentry>
 
 <varlistentry>
-<term>File (&file-version;) - 400 KB:</term>
+<term>File (&file-version;) - 397 KB:</term>
 <listitem>
 <para><ulink url="ftp://ftp.gw.com/mirrors/pub/unix/file/"/></para>
 <note><para>File (&file-version;) may no longer be available at the
@@ -193,7 +193,7 @@ url="ftp://ftp.linuxfromscratch.org/pub/lfs/"/>.</para></note>
 </varlistentry>
 
 <varlistentry>
-<term>Iana-Etc (&iana-etc-version;) - 168 KB:</term>
+<term>Iana-Etc (&iana-etc-version;) - 174 KB:</term>
 <listitem>
 <para><ulink url="http://www.sethwklein.net/projects/iana-etc/downloads/"/></para>
 </listitem>
@@ -270,7 +270,7 @@ url="ftp://ftp.linuxfromscratch.org/pub/lfs/"/>.</para></note>
 </varlistentry>
 
 <varlistentry>
-<term>Man (&man-version;) - 208 KB:</term>
+<term>Man (&man-version;) - 202 KB:</term>
 <listitem>
 <para><ulink url="http://primates.ximian.com/~flucifredi/man/"/></para>
 </listitem>
diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml
index 65ff3f23b..704388d9d 100644
--- a/chapter06/coreutils.xml
+++ b/chapter06/coreutils.xml
@@ -82,17 +82,19 @@ groups:</para>
 
 <screen><userinput>make install</userinput></screen>
 
-<para>Move programs to the proper locations:</para>
+<para>Move programs to the locations specified by the FHS:</para>
 
-<screen><userinput>mv /usr/bin/{[,basename,cat,chgrp,chmod,chown,cp,dd,df} /bin
-mv /usr/bin/{date,echo,false,head,hostname,install,ln} /bin
-mv /usr/bin/{ls,mkdir,mknod,mv,pwd,rm,rmdir,sync} /bin
-mv /usr/bin/{sleep,stty,test,touch,true,uname} /bin
+<screen><userinput>mv /usr/bin/{cat,chgrp,chmod,chown,cp,date,dd,df,echo} /bin
+mv /usr/bin/{false,hostname,ln,ls,mkdir,mknod,mv,pwd,rm} /bin
+mv /usr/bin/{rmdir,stty,sync,true,uname} /bin
 mv /usr/bin/chroot /usr/sbin</userinput></screen>
 
-<para>Finally, create a symlink to be FHS-compliant:</para>
+<para>Some of the scripts in the LFS-Bootscripts package depend on
+<command>head</command> and <command>sleep</command>.  As
+<filename class="directory">/usr</filename> may not be available during the
+early stages of booting, those binaries need to be on the root partition:</para>
 
-<screen><userinput>ln -s ../../bin/install /usr/bin</userinput></screen>
+<screen><userinput>mv /usr/bin/{head,sleep} /bin</userinput></screen>
 
 </sect2>
 
diff --git a/chapter06/iana-etc.xml b/chapter06/iana-etc.xml
index 556c9c55a..ad5c268f7 100644
--- a/chapter06/iana-etc.xml
+++ b/chapter06/iana-etc.xml
@@ -17,7 +17,7 @@
 <segmentedlist>
 <segtitle>&buildtime;</segtitle>
 <segtitle>&diskspace;</segtitle>
-<seglistitem><seg>0.1 SBU</seg><seg>1.9 MB</seg></seglistitem>
+<seglistitem><seg>0.1 SBU</seg><seg>2.0 MB</seg></seglistitem>
 </segmentedlist>
 
 <segmentedlist>
diff --git a/chapter06/udev.xml b/chapter06/udev.xml
index 099171c3f..bdd6c9aee 100644
--- a/chapter06/udev.xml
+++ b/chapter06/udev.xml
@@ -17,7 +17,7 @@
 <segmentedlist>
 <segtitle>&buildtime;</segtitle>
 <segtitle>&diskspace;</segtitle>
-<seglistitem><seg>0.1 SBU</seg><seg>2.7 MB</seg></seglistitem>
+<seglistitem><seg>0.1 SBU</seg><seg>3.8 MB</seg></seglistitem>
 </segmentedlist>
 
 <segmentedlist>
@@ -30,11 +30,6 @@
 <sect2 role="installation">
 <title>Installation of Udev</title>
 
-<para>Fix an incorrect assumption in the Udev testsuite regarding the location
-of the <command>test</command> binary:</para>
-
-<screen><userinput>sed -i -e 's@/usr/bin/test@/bin/test@' test/udev-test.pl</userinput></screen>
-
 <para>Compile the package:</para>
 
 <screen><userinput>make udevdir=/dev</userinput></screen>
@@ -59,6 +54,10 @@ the configuration files here:</para>
 
 <screen><userinput>cp ../udev-config-3.rules /etc/udev/rules.d/25-lfs.rules</userinput></screen>
 
+<para>Install the documentation that explains how to create Udev rules:</para>
+
+<screen><userinput>install -m644 -D docs/writing_udev_rules/index.html /usr/share/doc/udev-&udev-version;/index.html</userinput></screen>
+
 <!-- Edit Me -->
 <para>Run the <command>udevstart</command> program to create our full
 complement of device nodes.</para>
@@ -72,7 +71,7 @@ complement of device nodes.</para>
 <segmentedlist>
 <segtitle>Installed programs</segtitle>
 <segtitle>Installed directory</segtitle>
-<seglistitem><seg>udev, udevd, udevsend, udevstart, udevinfo, and udevtest</seg>
+<seglistitem><seg>udev, udevcontrol, udevd, udevinfo, udevmonitor, udevsend, udevstart and udevtest</seg>
 <seg>/etc/udev</seg></seglistitem>
 </segmentedlist>
 
@@ -89,6 +88,15 @@ in LFS) in response to hotplug events</para>
 <indexterm zone="ch-system-udev udev"><primary sortas="b-udev">udev</primary></indexterm>
 </listitem></varlistentry>
 
+<varlistentry id="udevcontrol">
+<term><command>udevcontrol</command></term>
+<listitem>
+<para>Configures a number of options for the running <command>udevd</command>
+daemon, such as the log level.</para>
+<indexterm zone="ch-system-udev udevcontrol"><primary sortas="b-udevcontrol">udevcontrol</primary>
+</indexterm>
+</listitem></varlistentry>
+
 <varlistentry id="udevd">
 <term><command>udevd</command></term>
 <listitem>
@@ -98,6 +106,26 @@ thus avoiding various race conditions</para>
 <indexterm zone="ch-system-udev udevd"><primary sortas="b-udevd">udevd</primary></indexterm>
 </listitem></varlistentry>
 
+<varlistentry id="udevinfo">
+<term><command>udevinfo</command></term>
+<listitem>
+<para>Allows users to query the <command>udev</command> database for
+information on any device currently present on the system; it also
+provides a way to query any device in the <systemitem
+class="filesystem">sysfs</systemitem> tree to help create udev
+rules</para>
+<indexterm zone="ch-system-udev udevinfo"><primary sortas="b-udevinfo">udevinfo</primary></indexterm>
+</listitem></varlistentry>
+
+<varlistentry id="udevmonitor">
+<term><command>udevmonitor</command></term>
+<listitem>
+<para>Prints the event received from the kernel and the event which
+<command>udev</command> sends out after rule processing</para>
+<indexterm zone="ch-system-udev udevmonitor"><primary sortas="b-udevmonitor">udevmonitor</primary>
+</indexterm>
+</listitem></varlistentry>
+
 <varlistentry id="udevsend">
 <term><command>udevsend</command></term>
 <listitem>
@@ -118,17 +146,6 @@ to <command>udev</command></para>
 </listitem>
 </varlistentry>
 
-<varlistentry id="udevinfo">
-<term><command>udevinfo</command></term>
-<listitem>
-<para>Allows users to query the <command>udev</command> database for
-information on any device currently present on the system; it also
-provides a way to query any device in the <systemitem
-class="filesystem">sysfs</systemitem> tree to help create udev
-rules</para>
-<indexterm zone="ch-system-udev udevinfo"><primary sortas="b-udevinfo">udevinfo</primary></indexterm>
-</listitem></varlistentry>
-
 <varlistentry id="udevtest">
 <term><command>udevtest</command></term>
 <listitem>
diff --git a/general.ent b/general.ent
index ec60a0995..9f2dd152b 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "GCC4-20050818">
-<!ENTITY releasedate "August 18, 2005">
+<!ENTITY version "GCC4-20050823">
+<!ENTITY releasedate "August 23, 2005">
 <!ENTITY milestone "6.2">
 <!ENTITY generic-version "gcc4"> <!-- Use "svn", "testing", or "x.y[-pre{x}]" -->
 
@@ -36,7 +36,7 @@
 <!ENTITY e2fsprogs-version "1.38">
 <!ENTITY expect-version "5.43.0">
 <!ENTITY expect-lib-version "5.43">
-<!ENTITY file-version "4.14">
+<!ENTITY file-version "4.15">
 <!ENTITY findutils-version "4.2.23">
 <!ENTITY flex-version "2.5.31">
 <!ENTITY gawk-version "3.1.4">
@@ -48,7 +48,7 @@
 <!ENTITY grub-version "0.97">
 <!ENTITY gzip-version "1.3.5">
 <!ENTITY hotplug-version "2004_09_23">
-<!ENTITY iana-etc-version "1.10">
+<!ENTITY iana-etc-version "2.00">
 <!ENTITY inetutils-version "1.4.2">
 <!ENTITY iproute2-version "2.6.11-050330">
 <!ENTITY kbd-version "1.12">
@@ -60,7 +60,7 @@
 <!ENTITY linux-libc-headers-version "2.6.12.0">
 <!ENTITY m4-version "1.4.3">
 <!ENTITY make-version "3.80">
-<!ENTITY man-version "1.6">
+<!ENTITY man-version "1.6a">
 <!ENTITY man-pages-version "2.07">
 <!ENTITY mktemp-version "1.5">
 <!ENTITY module-init-tools-version "3.1">
@@ -77,7 +77,7 @@
 <!ENTITY tar-version "1.15.1">
 <!ENTITY tcl-version "8.4.11">
 <!ENTITY texinfo-version "4.8">
-<!ENTITY udev-version "067">
+<!ENTITY udev-version "068">
 <!ENTITY util-linux-version "2.12q">
 <!ENTITY vim-version "6.3">
 <!ENTITY zlib-version "1.2.3">