瀏覽代碼

Upgrade to Kmod-11. Fixes #3223.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10041 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Matthew Burgess 12 年之前
父節點
當前提交
9eb452b7b4
共有 6 個文件被更改,包括 15 次插入24 次删除
  1. 4 0
      chapter01/changelog.xml
  2. 0 4
      chapter01/whatsnew.xml
  3. 0 8
      chapter03/patches.xml
  4. 8 4
      chapter06/kmod.xml
  5. 3 3
      packages.ent
  6. 0 5
      patches.ent

+ 4 - 0
chapter01/changelog.xml

@@ -39,6 +39,10 @@
     <listitem>
     <listitem>
       <para>2012-11-13</para>
       <para>2012-11-13</para>
       <itemizedlist>
       <itemizedlist>
+        <listitem>
+          <para>[matthew] - Upgrade to Kmod-11.  Fixes
+          <ulink url="&lfs-ticket-root;3223">#3223</ulink>.</para>
+        </listitem>
         <listitem>
         <listitem>
           <para>[matthew] - Upgrade to Man-Pages-3.44.  Fixes
           <para>[matthew] - Upgrade to Man-Pages-3.44.  Fixes
           <ulink url="&lfs-ticket-root;3222">#3222</ulink>.</para>
           <ulink url="&lfs-ticket-root;3222">#3222</ulink>.</para>

+ 0 - 4
chapter01/whatsnew.xml

@@ -244,10 +244,6 @@
       <para>&iproute2-ipset-patch;</para>
       <para>&iproute2-ipset-patch;</para>
     </listitem>
     </listitem>
 
 
-    <listitem>
-      <para>&kmod-test_fix-patch;</para>
-    </listitem>
-
     <listitem>
     <listitem>
       <para>&make-fixes-patch;</para>
       <para>&make-fixes-patch;</para>
     </listitem>
     </listitem>

+ 0 - 8
chapter03/patches.xml

@@ -98,14 +98,6 @@
       </listitem>
       </listitem>
     </varlistentry>
     </varlistentry>
 
 
-    <varlistentry>
-      <term>Kmod Testsuite Fix Patch - <token>&kmod-test_fix-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&kmod-test_fix-patch;"/></para>
-        <para>MD5 sum: <literal>&kmod-test_fix-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
     <varlistentry>
     <varlistentry>
       <term>Make Upstream Fixes Patch - <token>&make-fixes-patch-size;</token>:</term>
       <term>Make Upstream Fixes Patch - <token>&make-fixes-patch-size;</token>:</term>
       <listitem>
       <listitem>

+ 8 - 4
chapter06/kmod.xml

@@ -41,16 +41,13 @@
   <sect2 role="installation">
   <sect2 role="installation">
     <title>Installation of Kmod</title>
     <title>Installation of Kmod</title>
 
 
-    <para>Apply a patch to fix a testsuite issue on 32-bit machines:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&kmod-test_fix-patch;</userinput></screen>
-
     <para>Prepare Kmod for compilation:</para>
     <para>Prepare Kmod for compilation:</para>
 
 
 <screen><userinput remap="configure">./configure --prefix=/usr       \
 <screen><userinput remap="configure">./configure --prefix=/usr       \
             --bindir=/bin       \
             --bindir=/bin       \
             --libdir=/lib       \
             --libdir=/lib       \
             --sysconfdir=/etc   \
             --sysconfdir=/etc   \
+            --disable-manpages  \
             --with-xz           \
             --with-xz           \
             --with-zlib</userinput></screen>
             --with-zlib</userinput></screen>
 
 
@@ -64,6 +61,13 @@
           The shell variables are required in order for the xz and zlib headers
           The shell variables are required in order for the xz and zlib headers
           and libraries to be found in the absence of pkg-config.</para>
           and libraries to be found in the absence of pkg-config.</para>
         </listitem>
         </listitem>
+
+        <term><parameter>--disable-manpages</parameter></term>
+        <listitem>
+          <para>This option prevents the man pages from being built, as they
+          rely on libxslt, which isn't available in the chroot
+          environment.</para>
+        </listitem>
       </varlistentry>
       </varlistentry>
 
 
     </variablelist>
     </variablelist>

+ 3 - 3
packages.ent

@@ -286,10 +286,10 @@
 <!ENTITY kbd-ch6-du "20 MB">
 <!ENTITY kbd-ch6-du "20 MB">
 <!ENTITY kbd-ch6-sbu "0.1 SBU">
 <!ENTITY kbd-ch6-sbu "0.1 SBU">
 
 
-<!ENTITY kmod-version "10">
-<!ENTITY kmod-size "1,099 KB">
+<!ENTITY kmod-version "11">
+<!ENTITY kmod-size "1,245 KB">
 <!ENTITY kmod-url "&kernel;linux/utils/kernel/kmod/kmod-&kmod-version;.tar.xz">
 <!ENTITY kmod-url "&kernel;linux/utils/kernel/kmod/kmod-&kmod-version;.tar.xz">
-<!ENTITY kmod-md5 "e2a883c4df15a50f78a7a61d5b64089f">
+<!ENTITY kmod-md5 "607e33b0144625c2e5221e5a7df49c7a">
 <!ENTITY kmod-home " ">
 <!ENTITY kmod-home " ">
 <!ENTITY kmod-ch6-du "30 MB">
 <!ENTITY kmod-ch6-du "30 MB">
 <!ENTITY kmod-ch6-sbu "0.1 SBU">
 <!ENTITY kmod-ch6-sbu "0.1 SBU">

+ 0 - 5
patches.ent

@@ -67,11 +67,6 @@
 <!ENTITY kbd-fixes-patch-size "1.6 KB">
 <!ENTITY kbd-fixes-patch-size "1.6 KB">
 
 
 
 
-<!ENTITY kmod-test_fix-patch "kmod-&kmod-version;-testsuite-1.patch">
-<!ENTITY kmod-test_fix-patch-md5 "ac03d29f6c2fcfd455c10618c3515d05">
-<!ENTITY kmod-test_fix-patch-size "1.3 KB">
-
-
 <!ENTITY make-fixes-patch "make-&make-version;-upstream_fixes-3.patch">
 <!ENTITY make-fixes-patch "make-&make-version;-upstream_fixes-3.patch">
 <!ENTITY make-fixes-patch-md5 "95027ab5b53d01699845d9b7e1dc878d">
 <!ENTITY make-fixes-patch-md5 "95027ab5b53d01699845d9b7e1dc878d">
 <!ENTITY make-fixes-patch-size "10 KB">
 <!ENTITY make-fixes-patch-size "10 KB">