Upgrade to Udev-178 and add its dependency of Kmod-4. Fixes #2998 and #3001.

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

11 files changed, 113 insertions, 63 deletions

diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml
index b00f9f263..dd5430af4 100644
--- a/appendices/dependencies.xml
+++ b/appendices/dependencies.xml
@@ -1045,6 +1045,42 @@
         </seglistitem>
       </segmentedlist>
 
+<!-- Begin Kmod dependency info -->
+  <bridgehead renderas="sect2" id="kmod-dep">Kmod</bridgehead>
+
+      <segmentedlist>
+        <segtitle>&dependencies;</segtitle>
+
+        <seglistitem>
+         <seg>Bash, Binutils, Bison, Coreutils, Flex, GCC, Gettext, Glibc,
+         Gzip, Make, Sed, Xz-Utils, Zlib</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&testsuites;</segtitle>
+
+        <seglistitem>
+          <seg>No test suite available</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&before;</segtitle>
+
+        <seglistitem>
+          <seg>Udev</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist>
+        <segtitle>&external;</segtitle>
+
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
 <!-- Begin Less dependency info -->
   <bridgehead renderas="sect2" id="less-dep">Less</bridgehead>
 
@@ -1913,7 +1949,7 @@
 
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep,
-         Make, and Sed</seg>
+         Kmod, Make, and Sed</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1937,7 +1973,7 @@
         <segtitle>&external;</segtitle>
 
         <seglistitem>
-          <seg>None</seg>
+          <seg>Glib, Pci-Utils, Python, Systemd, USB-Utils</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -2036,7 +2072,7 @@
         <segtitle>&before;</segtitle>
 
         <seglistitem>
-          <seg>Man-DB</seg>
+          <seg>Kmod, Man-DB, Udev</seg>
         </seglistitem>
       </segmentedlist>
 
diff --git a/bootscripts/ChangeLog b/bootscripts/ChangeLog
index 8217e2712..c7113a1cd 100644
--- a/bootscripts/ChangeLog
+++ b/bootscripts/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-22  Matt Burgess <matthew@linuxfromscratch.org>
+
+   * lfs/init.d/udev: Change udevd path following upstream changes to its
+                      location
+
 2011-12-23  Matt Burgess <matthew@linuxfromscratch.org>
 
    * lfs/init.d/mountvirtfs: Correct permissions on /run/shm
diff --git a/bootscripts/lfs/init.d/udev b/bootscripts/lfs/init.d/udev
index 643ed80dc..49a1e4e9a 100644
--- a/bootscripts/lfs/init.d/udev
+++ b/bootscripts/lfs/init.d/udev
@@ -49,7 +49,7 @@ case "${1}" in
 
       # Start the udev daemon to continually watch for, and act on,
       # uevents
-      /sbin/udevd --daemon
+      /lib/udev/udevd --daemon
 
       # Now traverse /sys in order to "coldplug" devices that have
       # already been discovered
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 77d22fe16..39a2fd410 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -38,6 +38,18 @@
 -->
 
     <listitem>
+      <para>2012-01-22</para>
+      <itemizedlist>
+        <listitem>
+          <para>[matthew] - Upgrade to Udev-178, including adding its new
+          depdendency, Kmod-4. Fixes
+          <ulink url="&lfs-ticket-root;2998">#2998</ulink> and
+          <ulink url="&lfs-ticket-root;3001">#3001</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2012-01-16</para>
       <itemizedlist>
         <listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index c42717977..c19a20eb5 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -113,6 +113,9 @@
       <para>Kbd &kbd-version;</para>
     </listitem>-->
     <!--<listitem>
+      <para>Kmod &kmod-version;</para>
+    </listitem>-->
+    <!--<listitem>
       <para>Less &less-version;</para>
     </listitem>-->
     <!--<listitem>
@@ -190,9 +193,9 @@
     <!--<listitem>
       <para>Texinfo &texinfo-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Udev &udev-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>&udev-config;</para>
     </listitem>-->
@@ -223,6 +226,10 @@
     <title>Added:</title>
 
     <listitem>
+      <para>Kmod-&kmod-version;</para>
+    </listitem>
+
+    <listitem>
       <para>&mpfr-fixes-patch;</para>
     </listitem>
 
diff --git a/chapter03/packages.xml b/chapter03/packages.xml
index 85282509b..2a578a9ef 100644
--- a/chapter03/packages.xml
+++ b/chapter03/packages.xml
@@ -285,6 +285,15 @@
     </varlistentry>
 
     <varlistentry>
+      <term>Kmod (&kmod-version;) - <token>&kmod-size;</token>:</term>
+      <listitem>
+        <para>Home page: <ulink url="&kmod-home;"/></para>
+        <para>Download: <ulink url="&kmod-url;"/></para>
+        <para>MD5 sum: <literal>&kmod-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term>Less (&less-version;) - <token>&less-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&less-home;"/></para>
@@ -568,14 +577,6 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Udev Test Tarball  (&udev-version;) - <token>&udev-testfiles-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&udev-testfiles-url;"/></para>
-        <para>MD5 sum: <literal>&udev-testfiles-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
       <term>Udev Configuration Tarball - <token>&udev-config-size;</token>:</term>
       <listitem>
         <para>Download: <ulink url="&udev-config-url;"/></para>
diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index b17c3695a..b1a71197a 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -58,12 +58,13 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gzip.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="iproute2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kbd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xz.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="less.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libpipeline.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="make.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="man-db.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="module-init-tools.xml"/>
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="module-init-tools.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="shadow.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sysklogd.xml"/>
diff --git a/chapter06/udev.xml b/chapter06/udev.xml
index 06417c6c1..d17e0ef73 100644
--- a/chapter06/udev.xml
+++ b/chapter06/udev.xml
@@ -32,32 +32,19 @@
 
       <seglistitem>
         <seg>&udev-ch6-sbu;</seg>
-        <seg>&udev-ch6-du; plus &udev-testfiles-du; for testfiles</seg>
+        <seg>&udev-ch6-du;</seg>
       </seglistitem>
     </segmentedlist>
-
   </sect2>
 
   <sect2 role="installation">
     <title>Installation of Udev</title>
 
-    <para>Optionally remove an unneeded warning message that shows up in this
-    version of udev at boot time.</para>
-
-<screen><userinput remap="pre">sed -i -e '/deprecated/d' udev/udevadm-trigger.c</userinput></screen>
-
-
     <para>The udev-config tarball contains LFS-specific files used to configure
     Udev. Unpack it into the Udev source directory:</para>
 
 <screen><userinput remap="pre">tar -xvf ../&udev-config;.tar.bz2</userinput></screen>
 
-    <para>The udev-testfiles tarball contains files needed to test udev. The 
-    file expands to an apparent size of about 37MB but the actual disk usage
-    is less than 7MB.</para>
-
-<screen><userinput remap="pre">tar -xvf ../udev-&udev-version;-testfiles.tar.bz2 --strip-components=1</userinput></screen>
-
     <para>Create some devices and directories that Udev cannot handle due to
     them being required very early in the boot process, or by Udev itself:</para>
 
@@ -67,41 +54,39 @@ mknod -m0666 /lib/udev/devices/null c 1 3</userinput></screen>
     <para>Prepare the package for compilation:</para>
 
 <!-- Note that "libdir=/usr/lib64" would be required for multilib. -->
-<screen><userinput remap="configure">./configure --prefix=/usr \
-    --sysconfdir=/etc --sbindir=/sbin \
-    --with-rootlibdir=/lib --libexecdir=/lib/udev \
-    --disable-hwdb --disable-introspection \
-    --disable-keymap --disable-gudev</userinput></screen>
+<screen><userinput remap="configure">BLKID_CFLAGS="-I/usr/include/blkid" BLKID_LIBS="-L/lib -lblkid" \
+  KMOD_CFLAGS="-I/usr/include" KMOD_LIBS="-L/lib -lkmod" ./configure \
+  --prefix=/usr --bindir=/sbin --sysconfdir=/etc --libexecdir=/lib \
+  --enable-rule_generator --disable-introspection --disable-keymap \
+  --disable-gudev --with-usb-ids-path=no --with-pci-ids-path=no \
+  --with-systemdsystemunitdir=no</userinput></screen>
 
     <variablelist>
       <title>The meaning of the new configure options</title>
 
+      <!-- Note that libexecdir *MUST* stay /lib, even on a 64-bit
+           / multilib system where udev is compiled for 64-bit.  The udev
+           configure system automatically adds "udev" onto this path, and other
+           packages require /lib/udev; the udev maintainers have
+           said this is part of the udev API. -->
       <varlistentry>
-        <term><parameter>--with-rootlibdir=/lib</parameter></term>
+        <term><parameter>--libexecdir=/lib</parameter></term>
         <listitem>
-          <para>This controls where the <filename
-          class="libraryfile">libudev</filename> library is installed.  The
-          library needs to be in <filename class="directory">/lib</filename>
-          because it's used by Udev at boot time, before <filename
-          class="directory">/usr</filename> might be available, and the default
-          --rootlibdir is <filename class="directory">/usr/lib</filename>.</para>
+          <para>This controls where Udev-internal rules and helper programs
+          are installed.</para>
         </listitem>
       </varlistentry>
 
-      <!-- Note that libexecdir *MUST* stay /lib/udev, even on a 64-bit
-           / multilib system where udev is compiled for 64-bit.  Other
-           packages require this exact path; the udev maintainers have
-           said this is part of the udev API. -->
       <varlistentry>
-        <term><parameter>--libexecdir=/lib/udev</parameter></term>
+        <term><parameter>--enable-rule_generator</parameter></term>
         <listitem>
-          <para>This controls where Udev-internal rules and helper programs
-          are installed.</para>
+          <para>This allows persistent rules to be generated for network and
+          optical media devices</para>
         </listitem>
       </varlistentry>
 
       <varlistentry>
-        <term><parameter>--disable-*</parameter></term>
+        <term><parameter>--disable-* and --with-*</parameter></term>
         <listitem>
           <para>These options prevent Udev from installing helper programs and
           other extras which require more external libraries.  These libraries
diff --git a/chapter06/xz.xml b/chapter06/xz.xml
index cc4db7581..48baad9e3 100644
--- a/chapter06/xz.xml
+++ b/chapter06/xz.xml
@@ -46,7 +46,7 @@
 
     <para>Prepare Xz for compilation with:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr --docdir=/usr/share/doc/xz-&xz-version;</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr --libdir=/lib --docdir=/usr/share/doc/xz-&xz-version;</userinput></screen>
 
     <para>Compile the package:</para>
 
diff --git a/general.ent b/general.ent
index 293ca4929..04da1d74c 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20120116">
-<!ENTITY releasedate "Jan 16, 2012">
+<!ENTITY version "SVN-20120122">
+<!ENTITY releasedate "Jan 22, 2012">
 <!ENTITY copyrightdate "1999-2012"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone "7.1">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/packages.ent b/packages.ent
index 47e56722a..cf5b7f0de 100644
--- a/packages.ent
+++ b/packages.ent
@@ -289,6 +289,14 @@
 <!ENTITY kbd-ch6-du "16.0 MB">
 <!ENTITY kbd-ch6-sbu "less than 0.1 SBU">
 
+<!ENTITY kmod-version "4">
+<!ENTITY kmod-size "318 KB">
+<!ENTITY kmod-url "http://packages.profusion.mobi/kmod/kmod-&kmod-version;.tar.xz">
+<!ENTITY kmod-md5 "e14450a066a48accd0af1995b3c0232d">
+<!ENTITY kmod-home " ">
+<!ENTITY kmod-ch6-du "16.0 MB">
+<!ENTITY kmod-ch6-sbu "less than 0.1 SBU">
+
 <!ENTITY less-version "444">
 <!ENTITY less-size "301 KB">
 <!ENTITY less-url "http://www.greenwoodsoftware.com/less/less-&less-version;.tar.gz">
@@ -297,7 +305,7 @@
 <!ENTITY less-ch6-du "3.5 MB">
 <!ENTITY less-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY lfs-bootscripts-version "20120116">                 <!-- Scripts depend on this format -->
+<!ENTITY lfs-bootscripts-version "20120122">                 <!-- Scripts depend on this format -->
 <!ENTITY lfs-bootscripts-size "BOOTSCRIPTS-SIZE KB">         <!-- Updated in Makefile -->
 <!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.bz2">
 <!ENTITY lfs-bootscripts-md5 "BOOTSCRIPTS-MD5SUM">           <!-- Updated in Makefile -->
@@ -519,19 +527,14 @@
 <!ENTITY texinfo-ch6-du "21 MB">
 <!ENTITY texinfo-ch6-sbu "0.3 SBU">
 
-<!ENTITY udev-version "173">
-<!ENTITY udev-size "594 KB">
-<!ENTITY udev-url "&anduin-sources;udev/udev-&udev-version;.tar.bz2">
-<!ENTITY udev-md5 "91a88a359b60bbd074b024883cc0dbde">
+<!ENTITY udev-version "178">
+<!ENTITY udev-size "676 KB">
+<!ENTITY udev-url "&kernel;linux/utils/kernel/udev-&udev-version;.tar.xz">
+<!ENTITY udev-md5 "173cc6061e3a82dd6e9a1a5cf767a858">
 <!ENTITY udev-home "&kernel;linux/utils/kernel/hotplug/udev.html">
 <!ENTITY udev-ch6-du "9.3 MB">
 <!ENTITY udev-ch6-sbu "0.2 SBU">
 
-<!ENTITY udev-testfiles-url "http://anduin.linuxfromscratch.org/sources/other/udev-&udev-version;-testfiles.tar.bz2">
-<!ENTITY udev-testfiles-size "152 KB">
-<!ENTITY udev-testfiles-md5 "d97f80f6a70cd97f0519b14f15e3e195">
-<!ENTITY udev-testfiles-du "37 MB">
-
 <!ENTITY udev-config "udev-config-20100128"> <!-- Scripts depend on this format -->
 <!ENTITY udev-config-size "UDEV-SIZE KB">    <!-- Updated in Makefile -->
 <!ENTITY udev-config-url "&downloads-root;&udev-config;.tar.bz2">