Эх сурвалжийг харах

Merge module-init-tools testsuite fixes (r7118, r7120 and r7121) to the 6.1.1 branch

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/6.1.1/BOOK@7122 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Matthew Burgess 20 жил өмнө
parent
commit
9eee06f70b

+ 4 - 0
chapter01/changelog.xml

@@ -42,6 +42,10 @@ First a summary, then a detailed log.</para>
 </itemizedlist>
 </listitem>
 
+<listitem><para>November 4, 2005 [matt]: Correct the instructions for running
+Module-Init-Tools' testsuite (fixes bug 1597).  Thanks to Greg Schafer, Tushar
+Teredesai and to Randy McMurchy for providing the patch.</para></listitem>
+
 <listitem><para>October 29, 2005 [manuel]: PDF fixes.</para></listitem>
 
 <listitem><para>October 23, 2005 [manuel]: Added Bash documentation

+ 7 - 0
chapter03/packages.xml

@@ -297,6 +297,13 @@ url="http://www.linuxfromscratch.org/lfs/download.html#ftp"/>.</para></note>
 </listitem>
 </varlistentry>
 
+<varlistentry>
+<term>Module-Init-Tools-Testsuite (&module-init-tools-version;) - 34 KB:</term>
+<listitem>
+<para><ulink url="&kernel;linux/utils/kernel/module-init-tools/"/></para>
+</listitem>
+</varlistentry>
+
 <varlistentry>
 <term>Ncurses (&ncurses-version;) - 1,556 KB:</term>
 <listitem>

+ 11 - 3
chapter06/module-init-tools.xml

@@ -36,6 +36,17 @@ installed in LFS. Run the following command to avoid this:</para>
 
 <screen><userinput>touch modprobe.conf.5</userinput></screen>
 
+<para>If you wish to run the test suite for Module-Init-Tools, you will need to
+download the separate testsuite tarball.  Issue the following commands to
+perform the tests (note that the <command>make distclean</command> command is
+required to clean up the source tree, as the source gets recompiled as part of
+the testing process):</para>
+
+<screen><userinput>tar -xvf ../module-init-tools-testsuite-&module-init-tools-version;.tar.bz2 &amp;&amp;
+./configure &amp;&amp;
+make check &amp;&amp;
+make distclean</userinput></screen>
+
 <para>Prepare Module-Init-Tools for compilation:</para>
 
 <screen><userinput>./configure --prefix="" --enable-zlib</userinput></screen>
@@ -54,9 +65,6 @@ kernel modules.</para></listitem>
 
 <screen><userinput>make</userinput></screen>
 
-<para>To test the results, issue:
-<userinput>make check</userinput>.</para>
-
 <para>Install the package:</para>
 
 <screen><userinput>make install</userinput></screen>

+ 2 - 2
general.ent

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "TESTING-20051031">
-<!ENTITY releasedate "October 31, 2005">
+<!ENTITY version "TESTING-20051104">
+<!ENTITY releasedate "November 4, 2005">
 <!ENTITY milestone "6.1.1">
 <!ENTITY generic-version "testing"> <!-- Use "svn", "testing", or "x.y[-pre{x}]" -->