[Clfs-commits] commit: r3841 - in /trunk/BOOK: final-system/common/module-init-tools.xml final-system/multilib/module-init-tools.xml introduction/common/changelog.xml

svn at cross-lfs.org svn at cross-lfs.org
Sat Dec 29 12:54:18 PST 2007


Author: ken
Date: Sat Dec 29 20:54:17 2007
New Revision: 3841

Log:
Fix how we run. and clean up after, the testsuite for module-init-tools.

Modified:
    trunk/BOOK/final-system/common/module-init-tools.xml
    trunk/BOOK/final-system/multilib/module-init-tools.xml
    trunk/BOOK/introduction/common/changelog.xml

Modified: trunk/BOOK/final-system/common/module-init-tools.xml
==============================================================================
--- trunk/BOOK/final-system/common/module-init-tools.xml (original)
+++ trunk/BOOK/final-system/common/module-init-tools.xml Sat Dec 29 20:54:17 2007
@@ -26,13 +26,16 @@
     <title>Installation of Module-Init-Tools</title>
 
     <para os="c">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>
+    (note that the <command>make clean</command> and <command>rm</command>
+    commands are required to clean up the source tree, otherwise the code
+    built for testing will be installed, and the test version of
+    <command>modprobe</command> does not function outside the test
+    environment).</para>
 
 <screen os="d"><userinput>./configure &&
-make check &&
-make distclean</userinput></screen>
+make DOCBOOKTOMAN=true check &&
+make clean &&
+rm *.5 *.8</userinput></screen>
 
     <para os="e">Prepare Module-Init-Tools for compilation:</para>
 
@@ -55,12 +58,25 @@
 
 <screen os="i"><userinput>make DOCBOOKTOMAN=true</userinput></screen>
 
+    <variablelist os="i2">
+      <title>The meaning of the make parameter:</title>
+      <varlistentry>
+        <term><parameter>DOCBOOKTOMAN=true</parameter></term>
+        <listitem>
+          <para>The <literal>DOCBOOKTOMAN</literal> variable specifies the
+	  program which is executed to convert the sgml source to man pages.
+	  We do not have either of the alternatives, so we create empty pages
+	  instead.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+
     <para os="j">Install the package:</para>
 
 <screen os="k"><userinput>make INSTALL=install install</userinput></screen>
 
     <variablelist os="l">
-      <title>The meaning of the make parameter:</title>
+      <title>The meaning of the make install parameter:</title>
       <varlistentry>
         <term><parameter>INSTALL=install</parameter></term>
         <listitem>

Modified: trunk/BOOK/final-system/multilib/module-init-tools.xml
==============================================================================
--- trunk/BOOK/final-system/multilib/module-init-tools.xml (original)
+++ trunk/BOOK/final-system/multilib/module-init-tools.xml Sat Dec 29 20:54:17 2007
@@ -27,7 +27,8 @@
 
 <screen os="d"><userinput>CC="gcc ${BUILD64}" ./configure &&
 make check &&
-make distclean</userinput></screen>
+make clean &&
+rm *.5 *.8</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/module-init-tools.xml"
@@ -50,6 +51,10 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/module-init-tools.xml"
+    xpointer="xpointer(//*[@os='i2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/module-init-tools.xml"
     xpointer="xpointer(//*[@os='j'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/introduction/common/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/common/changelog.xml (original)
+++ trunk/BOOK/introduction/common/changelog.xml Sat Dec 29 20:54:17 2007
@@ -35,6 +35,17 @@
       </itemizedlist>
     </listitem>
 -->
+
+    <listitem>
+      <para>December 29, 2007</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] Make the current Module-Init-Tools testsuite run,
+	  update the instructions because distclean is no longer useful,
+	  and comment on the DOCBOOKTOMAN parameter.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>
       <para>December 23, 2007</para>




More information about the Clfs-commits mailing list