Changeset 75a2135 for BOOK/final-system

Timestamp:

Aug 8, 2010, 7:04:50 AM (14 years ago)

Author:

Joe Ciccone <jciccone@…>

Branches:

clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

9cad7c2

Parents:

06bf59e

Message:

Updated Module-Init-Tools to 3.12.

Location:

BOOK/final-system

Files:

• common/module-init-tools.xml (modified) (2 diffs)
• multilib/module-init-tools.xml (modified) (2 diffs)

BOOK/final-system/common/module-init-tools.xml

@@ -28 +28 @@
     <para os="c">Issue the following commands to perform the tests</para>
 
-    <note os="cc">
-      <para>The <command>make clean</command> command is 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>
-    </note>
-
-<screen os="d"><userinput>./configure &amp;&amp;
-make check &amp;&amp;
-./tests/runtests &amp;&amp;
-make clean</userinput></screen>
+<screen os="d"><userinput>sed -i "s/\(make\)\( all\)/\1 DOCBOOKTOMAN=true\2/" tests/runtests &amp;&amp;
+./tests/runtests</userinput></screen>
 
     <para os="e">Prepare Module-Init-Tools for compilation:</para>
@@ -61 +52 @@
     <para os="h">Compile the package:</para>
 
-<screen os="i"><userinput>make DOCBOOKTOMAN=""</userinput></screen>
+<screen os="i"><userinput>make DOCBOOKTOMAN=true</userinput></screen>
 
     <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 install parameter:</title>
-      <varlistentry>
-        <term><parameter>INSTALL=install</parameter></term>
-        <listitem>
-          <para>Normally, <command>make install</command> will not install the binaries if they
-          already exist. This option overrides that behavior by calling
-          <command>install</command> instead of using the default wrapper
-          script.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
+<screen os="k"><userinput>make install</userinput></screen>
 
   </sect2>

BOOK/final-system/multilib/module-init-tools.xml

@@ -28 +28 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='cc'])"/>
-
-<screen os="d"><userinput>CC="gcc ${BUILD64}" ./configure &amp;&amp;
-make check &amp;&amp;
-./tests/runtests &amp;&amp;
-make clean</userinput></screen>
+    xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -63 +58 @@
     xpointer="xpointer(//*[@os='k'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
   </sect2>