Upgrade to Udev-108. Fixes #1976.

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

4 files changed, 22 insertions, 24 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index ff7385009..85cab8e4b 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,10 @@
       <para>2007-04-16</para>
       <itemizedlist>
         <listitem>
+          <para>[matthew] - Upgrade to Udev-108. Fixes
+          <ulink url="&lfs-ticket-root;1976">#1976</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[matthew] - Upgrade to Man-pages-2.44. Fixes
           <ulink url="&lfs-ticket-root;1987">#1987</ulink>.</para>
         </listitem>
diff --git a/chapter06/udev.xml b/chapter06/udev.xml
index 70da75ca7..616e8720e 100644
--- a/chapter06/udev.xml
+++ b/chapter06/udev.xml
@@ -53,10 +53,7 @@ ln -sv /proc/kcore /lib/udev/devices/core</userinput></screen>
 
     <para>Compile the package:</para>
 
-<screen><userinput>make EXTRAS="extras/ata_id extras/cdrom_id extras/edd_id \
-    extras/firmware extras/floppy extras/path_id \
-    extras/rule_generator extras/scsi_id extras/usb_id \
-    extras/volume_id"</userinput></screen>
+<screen><userinput>make EXTRAS="`echo extras/*/`"</userinput></screen>
 
     <variablelist>
       <title>The meaning of the make option:</title>
@@ -64,7 +61,7 @@ ln -sv /proc/kcore /lib/udev/devices/core</userinput></screen>
       <varlistentry>
         <term><parameter>EXTRAS=...</parameter></term>
         <listitem>
-          <para>This builds several helper binaries that can aid in writing custom
+          <para>This builds the helper binaries that can aid in writing custom
           Udev rules.</para>
         </listitem>
       </varlistentry>
@@ -79,11 +76,7 @@ ln -sv /proc/kcore /lib/udev/devices/core</userinput></screen>
 
     <para>Install the package:</para>
 
-<screen><userinput>make DESTDIR=/ \
-    EXTRAS="extras/ata_id extras/cdrom_id extras/edd_id \
-            extras/firmware extras/floppy extras/path_id \
-            extras/rule_generator extras/scsi_id \
-            extras/usb_id extras/volume_id" install</userinput></screen>
+<screen><userinput>make DESTDIR=/ EXTRAS="`echo extras/*/`" install</userinput></screen>
 
     <variablelist>
       <title>The meaning of the make parameter:</title>
diff --git a/chapter07/symlinks.xml b/chapter07/symlinks.xml
index c842427d1..05a3a053f 100644
--- a/chapter07/symlinks.xml
+++ b/chapter07/symlinks.xml
@@ -23,12 +23,13 @@
     for you, depending on the capabilities of each device, but you need to
     decide which of two modes of operation you wish to have the script use.</para>
 
-    <para>First, the script can operate in <quote>by-path</quote> mode, where
-    the rules it creates depend on the physical path to the CD or DVD device.
-    Second, it can operate in <quote>by-id</quote> mode, where the rules it
-    creates depend on identification strings stored in the CD or DVD device
-    itself. The path is determined by Udev's <command>path_id</command> script,
-    and the identification strings are read from the hardware by its
+    <para>First, the script can operate in <quote>by-path</quote> mode (used by
+    default for USB and FireWire devices), where the rules it creates depend on
+    the physical path to the CD or DVD device. Second, it can operate in
+    <quote>by-id</quote> mode (default for IDE and SCSI devices), where the
+    rules it creates depend on identification strings stored in the CD or DVD
+    device itself. The path is determined by Udev's <command>path_id</command>
+    script, and the identification strings are read from the hardware by its
     <command>ata_id</command> or <command>scsi_id</command> programs, depending
     on which type of device you have.</para>
 
@@ -69,13 +70,13 @@
     is not empty, otherwise it will use a combination of ID_MODEL and
     ID_REVISION. The <quote>by-path</quote> mode will use the ID_PATH value.</para>
 
-    <para>If you choose the <quote>by-path</quote> mode, then the rules files
-    installed by default with Udev will work. If you choose the <quote>by-id</quote>
-    mode, then you will have to modify the
+    <para>If the default mode is not suitable for your situation, then the
+    following modification can be made to the
     <filename>/etc/udev/rules.d/75-cd-aliases-generator.rules</filename> file,
-    as follows:</para>
+    as follows (where <replaceable>mode</replaceable> is one of
+    <quote>by-id</quote> or <quote>by-path</quote>):</para>
 
-<screen><userinput>sed -i -e 's/write_cd_aliases/&amp; by-id/' \
+<screen><userinput>sed -i -e 's/write_cd_aliases/&amp; <replaceable>mode</replaceable>/' \
     /etc/udev/rules.d/75-cd-aliases-generator.rules</userinput></screen>
 
     <para>Note that it is not necessary to create the rules files or symlinks
diff --git a/packages.ent b/packages.ent
index 211824704..b3c84ca59 100644
--- a/packages.ent
+++ b/packages.ent
@@ -482,10 +482,10 @@
 <!ENTITY texinfo-ch6-du "16.6 MB">
 <!ENTITY texinfo-ch6-sbu "0.2 SBU">
 
-<!ENTITY udev-version "106">
-<!ENTITY udev-size "184 KB">
+<!ENTITY udev-version "108">
+<!ENTITY udev-size "183 KB">
 <!ENTITY udev-url "&kernel;linux/utils/kernel/hotplug/udev-&udev-version;.tar.bz2">
-<!ENTITY udev-md5 "320ccd2d0f4540d10e021bafa14f8985">
+<!ENTITY udev-md5 "67935abde67b23e7c6e86e0be77c5e4b">
 <!ENTITY udev-home "&kernel;linux/utils/kernel/hotplug/udev.html">
 <!ENTITY udev-ch6-du "5.8 MB">
 <!ENTITY udev-ch6-sbu "0.1 SBU">