Author: matthew
Date: 2012-11-13 06:21:36 -0700 (Tue, 13 Nov 2012)
New Revision: 10041
Modified:
trunk/BOOK/chapter01/changelog.xml
trunk/BOOK/chapter01/whatsnew.xml
trunk/BOOK/chapter03/patches.xml
trunk/BOOK/chapter06/kmod.xml
trunk/BOOK/packages.ent
trunk/BOOK/patches.ent
Log:
Upgrade to Kmod-11. Fixes #3223.
Modified: trunk/BOOK/chapter01/changelog.xml
===================================================================
--- trunk/BOOK/chapter01/changelog.xml 2012-11-13 13:20:37 UTC (rev 10040)
+++ trunk/BOOK/chapter01/changelog.xml 2012-11-13 13:21:36 UTC (rev 10041)
@@ -40,6 +40,10 @@
<para>2012-11-13</para>
<itemizedlist>
<listitem>
+ <para>[matthew] - Upgrade to Kmod-11. Fixes
+ <ulink url="&lfs-ticket-root;3223">#3223</ulink>.</para>
+ </listitem>
+ <listitem>
<para>[matthew] - Upgrade to Man-Pages-3.44. Fixes
<ulink url="&lfs-ticket-root;3222">#3222</ulink>.</para>
</listitem>
Modified: trunk/BOOK/chapter01/whatsnew.xml
===================================================================
--- trunk/BOOK/chapter01/whatsnew.xml 2012-11-13 13:20:37 UTC (rev 10040)
+++ trunk/BOOK/chapter01/whatsnew.xml 2012-11-13 13:21:36 UTC (rev 10041)
@@ -245,10 +245,6 @@
</listitem>
<listitem>
- <para>&kmod-test_fix-patch;</para>
- </listitem>
-
- <listitem>
<para>&make-fixes-patch;</para>
</listitem>
Modified: trunk/BOOK/chapter03/patches.xml
===================================================================
--- trunk/BOOK/chapter03/patches.xml 2012-11-13 13:20:37 UTC (rev 10040)
+++ trunk/BOOK/chapter03/patches.xml 2012-11-13 13:21:36 UTC (rev 10041)
@@ -99,14 +99,6 @@
</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>
<term>Make Upstream Fixes Patch -
<token>&make-fixes-patch-size;</token>:</term>
<listitem>
<para>Download: <ulink url="&patches-root;&make-fixes-patch;"/></para>
Modified: trunk/BOOK/chapter06/kmod.xml
===================================================================
--- trunk/BOOK/chapter06/kmod.xml 2012-11-13 13:20:37 UTC (rev 10040)
+++ trunk/BOOK/chapter06/kmod.xml 2012-11-13 13:21:36 UTC (rev 10041)
@@ -41,16 +41,13 @@
<sect2 role="installation">
<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>
<screen><userinput remap="configure">./configure --prefix=/usr \
--bindir=/bin \
--libdir=/lib \
--sysconfdir=/etc \
+ --disable-manpages \
--with-xz \
--with-zlib</userinput></screen>
@@ -64,6 +61,13 @@
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>
</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>
</variablelist>
Modified: trunk/BOOK/packages.ent
===================================================================
--- trunk/BOOK/packages.ent 2012-11-13 13:20:37 UTC (rev 10040)
+++ trunk/BOOK/packages.ent 2012-11-13 13:21:36 UTC (rev 10041)
@@ -286,10 +286,10 @@
<!ENTITY kbd-ch6-du "20 MB">
<!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-md5 "e2a883c4df15a50f78a7a61d5b64089f">
+<!ENTITY kmod-md5 "607e33b0144625c2e5221e5a7df49c7a">
<!ENTITY kmod-home " ">
<!ENTITY kmod-ch6-du "30 MB">
<!ENTITY kmod-ch6-sbu "0.1 SBU">
Modified: trunk/BOOK/patches.ent
===================================================================
--- trunk/BOOK/patches.ent 2012-11-13 13:20:37 UTC (rev 10040)
+++ trunk/BOOK/patches.ent 2012-11-13 13:21:36 UTC (rev 10041)
@@ -67,11 +67,6 @@
<!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-md5 "95027ab5b53d01699845d9b7e1dc878d">
<!ENTITY make-fixes-patch-size "10 KB">
--
http://linuxfromscratch.org/mailman/listinfo/lfs-book
FAQ: http://www.linuxfromscratch.org/lfs/faq.html
Unsubscribe: See the above information page
