Upgraded util-linux, udev, and hotplug to latest versions

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

4 files changed, 24 insertions, 23 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index cba779d63..461bfd472 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -44,7 +44,7 @@ first a summary, then a detailed log.</para>
 <listitem><para>sed-4.1.2</para></listitem>
 <listitem><para>tar-1.14</para></listitem>
 <listitem><para>tcl-8.4.7</para></listitem>
-<listitem><para>util-linux-2.12d</para></listitem>
+<listitem><para>util-linux-2.12e</para></listitem>
 <listitem><para>vim-6.3</para></listitem>
 </itemizedlist>
 </listitem>
@@ -55,10 +55,9 @@ first a summary, then a detailed log.</para>
 <listitem><para>coreutils-5.2.1-suppress_hostname_uptime_kill_su-1.patch</para></listitem>
 <listitem><para>flex-2.5.31-debian_fixes-2.patch</para></listitem>
 <listitem><para>gcc-3.4.2-linkonce-1.patch</para></listitem>
-<listitem><para>hotplug-2004_04_01</para></listitem>
-<listitem><para>hotplug-2004_04_01-bogus_deps-1.patch</para></listitem>
-<listitem><para>hotplug-2004_04_01-device-2.patch</para></listitem>
-<listitem><para>hotplug-2004_04_01-isapnp-2.patch</para></listitem>
+<listitem><para>hotplug-2004_09_20</para></listitem>
+<listitem><para>hotplug-2004_09_20-bogus_deps-1.patch</para></listitem>
+<listitem><para>hotplug-2004_09_20-device-2.patch</para></listitem>
 <listitem><para>inetutils-1.4.2-kernel_headers-1.patch</para></listitem>
 <listitem><para>iproute2-2.6.8-040823</para></listitem>
 <listitem><para>iproute2-2.6.8-040823-remove_db-1.patch</para></listitem>
@@ -69,7 +68,8 @@ first a summary, then a detailed log.</para>
 <listitem><para>readline-5.0-display_wrap-1.patch</para></listitem>
 <listitem><para>syslog-ng-1.6.5</para></listitem>
 <listitem><para>sysvinit-2.85-proclen-1.patch</para></listitem>
-<listitem><para>udev-030</para></listitem>
+<listitem><para>udev-032</para></listitem>
+<listitem><para>udev-032-etcdir-2.patch</para></listitem>
 <listitem><para>udev-config-1.permissions</para></listitem>
 <listitem><para>udev-config-1.rules</para></listitem>
 <listitem><para>util-linux-2.12a-kernel_headers-1.patch</para></listitem>
@@ -95,6 +95,11 @@ first a summary, then a detailed log.</para>
 </itemizedlist>
 </listitem>
 
+<listitem><para>September 21st, 2004 [jeremy]: Upgraded to Util-linux-2.12e,
+Udev-032, and Hotplug-2004_09_20.  Thanks to David Jensen and Kevin Fleming
+for their hard work in putting together the new udev instructions, including
+the new patch.</para></listitem>
+
 <listitem><para>September 20th, 2004 [jeremy]: Upgraded to iana-etc 1.02, libtool 1.5.10, automake-1.9.2.</para></listitem>
 
 <listitem><para>September 20th, 2004 [jeremy]: Upgraded to Util-Linux 2.12d,
diff --git a/chapter05/udev.xml b/chapter05/udev.xml
index c79001a59..4f6ef8dcf 100644
--- a/chapter05/udev.xml
+++ b/chapter05/udev.xml
@@ -29,25 +29,17 @@
 <sect2 role="installation">
 <title>Installation of Udev</title>
 
-<para>The <command>udevstart</command> program hardcodes the path 
-to the <command>udev</command> program in itself, which is bad since we 
-install <command>udev</command> in a non-standard location. Fix this by
-running the following:</para>
+<para>Patch Udev to allow for udev.conf to be found in $PREFIX/etc:</para>
 
-<screen><userinput>sed -i 's@/sbin/udev@/tools/sbin/udev@g' udevstart.c</userinput></screen>
-
-<para>Also assure that <command>udev</command> knows the correct location to look for its
-configuration files:</para>
-
-<screen><userinput>sed -i 's@/etc@/tools/etc@g' etc/udev/udev.conf.in</userinput></screen>
+<screen><userinput>patch -Np1 -i ../udev-&udev-version;-etcdir-2.patch</userinput></screen>
 
 <para>Now compile Udev:</para>
 
-<screen><userinput>make prefix=/tools etcdir=/tools/etc</userinput></screen>
+<screen><userinput>make prefix=/tools udevdir=/dev</userinput></screen>
 
 <para>Install it:</para>
 
-<screen><userinput>make DESTDIR=/tools udevdir=/dev install</userinput></screen>
+<screen><userinput>make prefix=/tools install</userinput></screen>
 
 <para>Udev's configuration is far from ideal by default, so we install our own
 configuration files here:</para>
diff --git a/chapter06/udev.xml b/chapter06/udev.xml
index 38ef9e3bf..d6bf3913c 100644
--- a/chapter06/udev.xml
+++ b/chapter06/udev.xml
@@ -23,7 +23,11 @@
 <sect2 role="installation">
 <title>Installation of Udev</title>
 
-<para>First compile Udev:</para>
+<para>Patch Udev to allow installation of udev.conf to $PREFIX/etc:</para>
+
+<screen><userinput>patch -Np1 -i ../udev-&udev-version;-etcdir-2.patch</userinput></screen>
+
+<para>Compile Udev:</para>
 
 <screen><userinput>make udevdir=/dev</userinput></screen>
 
@@ -37,7 +41,7 @@ create device nodes in.</para></listitem>
 
 <para>Install it:</para>
 
-<screen><userinput>make udevdir=/dev install</userinput></screen>
+<screen><userinput>make install</userinput></screen>
 
 <para>Udev's configuration is far from ideal by default, so we install our own
 configuration files here:</para>
diff --git a/general.ent b/general.ent
index 4168373f5..0a13c2435 100644
--- a/general.ent
+++ b/general.ent
@@ -38,7 +38,7 @@
 <!ENTITY groff-version "1.19.1">
 <!ENTITY grub-version "0.95">
 <!ENTITY gzip-version "1.3.5">
-<!ENTITY hotplug-version "2004_04_01">
+<!ENTITY hotplug-version "2004_09_20">
 <!ENTITY iana-etc-version "1.02">
 <!ENTITY inetutils-version "1.4.2">
 <!ENTITY iproute2-version "2.6.9-ss040831">
@@ -68,7 +68,7 @@
 <!ENTITY tar-version "1.14">
 <!ENTITY tcl-version "8.4.7">
 <!ENTITY texinfo-version "4.7">
-<!ENTITY util-linux-version "2.12d">
-<!ENTITY udev-version "030">
+<!ENTITY util-linux-version "2.12e">
+<!ENTITY udev-version "032">
 <!ENTITY vim-version "6.3">
 <!ENTITY zlib-version "1.2.1">