From 631a66d4f18fb38c417f1437278c86e264ff2687 Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Sun, 16 Sep 2012 13:56:18 +0000
Subject: Upgrade to Kmod-10. Fixes #3180.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9994 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml | 4 ++++
 chapter01/whatsnew.xml  | 8 ++++++--
 chapter03/patches.xml   | 8 --------
 chapter06/kmod.xml      | 5 -----
 packages.ent            | 6 +++---
 patches.ent             | 5 -----
 6 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index c28cc7b78..46f68ea9c 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,10 @@
     <listitem>
       <para>2012-09-16</para>
       <itemizedlist>
+        <listitem>
+          <para>[matthew] - Upgrade to Kmod-10.  Fixes
+          <ulink url="&lfs-ticket-root;3180">#3180</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[matthew] - Fix link to Linux User's Guide.  Fixes
           <ulink url="&lfs-ticket-root;3179">#3179</ulink>.</para>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 20cd6adf3..5eef73f8d 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -112,9 +112,9 @@
     <!--<listitem>
       <para>Kbd &kbd-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Kmod &kmod-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>Less &less-version;</para>
     </listitem>
@@ -239,6 +239,10 @@
       <para>bash-4.2-fixes-8.patch</para>
     </listitem>
 
+    <listitem>
+      <para>kmod-9-testsuite-1.patch</para>
+    </listitem>
+
   </itemizedlist>
 
 </sect1>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 5953c8100..e63252598 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -107,14 +107,6 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry>
-      <term>Kmod Testsuite Patch - <token>&kmod-testsuite-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&kmod-testsuite-patch;"/></para>
-        <para>MD5 sum: <literal>&kmod-testsuite-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
     <varlistentry>
       <term>Make Upstream Fixes Patch - <token>&make-fixes-patch-size;</token>:</term>
       <listitem>
diff --git a/chapter06/kmod.xml b/chapter06/kmod.xml
index 6264236ba..f04f89303 100644
--- a/chapter06/kmod.xml
+++ b/chapter06/kmod.xml
@@ -41,11 +41,6 @@
   <sect2 role="installation">
     <title>Installation of Kmod</title>
 
-    <para>Apply the following patch to fix a problem when running the testsuite
-    on x86 hosts:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&kmod-testsuite-patch;</userinput></screen>
-
     <para>Prepare Kmod for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr       \
diff --git a/packages.ent b/packages.ent
index 98cb7c545..0b38a5780 100644
--- a/packages.ent
+++ b/packages.ent
@@ -286,10 +286,10 @@
 <!ENTITY kbd-ch6-du "20 MB">
 <!ENTITY kbd-ch6-sbu "0.1 SBU">
 
-<!ENTITY kmod-version "9">
-<!ENTITY kmod-size "1,096 KB">
+<!ENTITY kmod-version "10">
+<!ENTITY kmod-size "1,099 KB">
 <!ENTITY kmod-url "&kernel;linux/utils/kernel/kmod/kmod-&kmod-version;.tar.xz">
-<!ENTITY kmod-md5 "c8ae2d2694fbca2b28e238b30543a0cd">
+<!ENTITY kmod-md5 "e2a883c4df15a50f78a7a61d5b64089f">
 <!ENTITY kmod-home " ">
 <!ENTITY kmod-ch6-du "30 MB">
 <!ENTITY kmod-ch6-sbu "0.1 SBU">
diff --git a/patches.ent b/patches.ent
index 43f756d9e..7d11369c8 100644
--- a/patches.ent
+++ b/patches.ent
@@ -62,11 +62,6 @@
 <!ENTITY kbd-fixes-patch-size "1.6 KB">
 
 
-<!ENTITY kmod-testsuite-patch "kmod-&kmod-version;-testsuite-1.patch">
-<!ENTITY kmod-testsuite-patch-md5 "11ab14f5b63ae3c163804517cf110fbb">
-<!ENTITY kmod-testsuite-patch-size "2.2 KB">
-
-
 <!ENTITY make-fixes-patch "make-&make-version;-upstream_fixes-2.patch">
 <!ENTITY make-fixes-patch-md5 "02c0f3989185a7345233872b1ae5f46d">
 <!ENTITY make-fixes-patch-size "9.7 KB">
-- 
cgit v1.2.3-54-g00ecf