Browse Source

Update module-init-tools, fixes #2127.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@8489 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Ken Moffat 17 years ago
parent
commit
d6e34158b2
6 changed files with 35 additions and 21 deletions
  1. 1 0
      chapter01/changelog.xml
  2. 10 2
      chapter01/whatsnew.xml
  3. 3 3
      chapter03/patches.xml
  4. 12 7
      chapter06/module-init-tools.xml
  5. 6 6
      packages.ent
  6. 3 3
      patches.ent

+ 1 - 0
chapter01/changelog.xml

@@ -43,6 +43,7 @@
           <para>[ken] - Updated Grep to 2.5.3, thanks to Matthew for the fix
 	  for automated builds.</para>
 	  <para>[ken] - Updated Flex to 2.5.34.</para>
+	  <para>[ken] - Updated Module-Init-Tools to 3.4.</para>
         </listitem>
       </itemizedlist>
     </listitem>

+ 10 - 2
chapter01/whatsnew.xml

@@ -137,9 +137,9 @@
     <!--<listitem>
       <para>Mktemp &mktemp-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Module-Init-Tools &module-init-tools-version;</para>
-    </listitem-->
+    </listitem>
     <!--<listitem>
       <para>Ncurses &ncurses-version;</para>
     </listitem>-->
@@ -220,6 +220,10 @@
       <para>&grep-fixes-patch;</para>
     </listitem>
 
+    <listitem>
+      <para>&module-init-manpages-patch;</para>
+    </listitem>
+
     <listitem>
       <para>&readline-fixes-patch;</para>
     </listitem>
@@ -261,6 +265,10 @@
       <para>man-db-2.4.4-fixes-1.patch</para>
     </listitem>
 
+    <listitem>
+      <para>module-init-tools-3.2.2-modprobe-1.patch</para>
+    </listitem>
+
     <listitem>
       <para>readline-5.4-fixes-4.patch</para>
     </listitem>

+ 3 - 3
chapter03/patches.xml

@@ -147,10 +147,10 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Module-init-tools Patch - <token>&module-init-modprobe-patch-size;</token>:</term>
+      <term>Module-init-tools Man-Pages Patch - <token>&module-init-manpages-patch-size;</token>:</term>
       <listitem>
-        <para>Download: <ulink url="&patches-root;&module-init-modprobe-patch;"/></para>
-        <para>MD5 sum: <literal>&module-init-modprobe-patch-md5;</literal></para>
+        <para>Download: <ulink url="&patches-root;&module-init-manpages-patch;"/></para>
+        <para>MD5 sum: <literal>&module-init-manpages-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
 

+ 12 - 7
chapter06/module-init-tools.xml

@@ -41,18 +41,23 @@
   <sect2 role="installation">
     <title>Installation of Module-Init-Tools</title>
 
-    <para>First correct a potential problem when modules are specified
-    using regular expressions:</para>
+    <para>The tarball only contains sgml source for the manpages. The following
+    patch contains the result of processing this through <command>docbook2man</command>
+    (see <ulink url="&blfs-root;view/svn/pst/docbook-utils.html"/>)
+    which we do not build as part of a basic LFS installation:</para>
 
-<screen><userinput remap="pre">patch -Np1 -i ../&module-init-modprobe-patch;</userinput></screen>
+<screen><userinput remap="pre">patch -Np1 -i ../&module-init-manpages-patch;</userinput></screen>
 
-    <para>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>
+    <para>The testsuite of this package is geared towards the needs of its
+    Maintainer. The command <command>make check</command> builds a specially
+    wrapped version of modprobe which is useless for normal operation. To run
+    this, issue the following commands (note that the <command>make clean</command>
+    command is required to clean up the source tree before recompiling for
+    normal use):</para>
 
 <screen><userinput remap="test">./configure
 make check
-make distclean</userinput></screen>
+make clean</userinput></screen>
 
     <para>Prepare Module-Init-Tools for compilation:</para>
 

+ 6 - 6
packages.ent

@@ -360,12 +360,12 @@
 <!ENTITY mktemp-ch6-du "0.4 MB">
 <!ENTITY mktemp-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY module-init-tools-version "3.2.2">
-<!ENTITY module-init-tools-size "166 KB">
-<!ENTITY module-init-tools-url "http://www.kerneltools.org/pub/downloads/module-init-tools/module-init-tools-&module-init-tools-version;.tar.bz2">
-<!ENTITY module-init-tools-md5 "a1ad0a09d3231673f70d631f3f5040e9">
-<!ENTITY module-init-tools-home "http://www.kerneltools.org/">
-<!ENTITY module-init-tools-ch6-du "7 MB">
+<!ENTITY module-init-tools-version "3.4">
+<!ENTITY module-init-tools-size "186 KB">
+<!ENTITY module-init-tools-url "http://www.kernel.org/pub/linux/kernel/people/jcm/module-init-tools/module-init-tools-&module-init-tools-version;.tar.bz2">
+<!ENTITY module-init-tools-md5 "db6ac059e80e8dd4389dbe81ee61f3c6">
+<!ENTITY module-init-tools-home "http://www.kerneltools.org/KernelTools.org">
+<!ENTITY module-init-tools-ch6-du "8 MB">
 <!ENTITY module-init-tools-ch6-sbu "less than 0.1 SBU">
 
 <!ENTITY ncurses-version "5.6">

+ 3 - 3
patches.ent

@@ -76,9 +76,9 @@
 <!ENTITY mktemp-tempfile-patch-md5 "65d73faabe3f637ad79853b460d30a19">
 <!ENTITY mktemp-tempfile-patch-size "3.5 KB">
 
-<!ENTITY module-init-modprobe-patch "module-init-tools-&module-init-tools-version;-modprobe-1.patch">
-<!ENTITY module-init-modprobe-patch-md5 "f1e452fdf3b8d7ef60148125e390c3e8">
-<!ENTITY module-init-modprobe-patch-size "1.2 KB">
+<!ENTITY module-init-manpages-patch "module-init-tools-&module-init-tools-version;-manpages-1.patch">
+<!ENTITY module-init-manpages-patch-md5 "2271047586981ae23adf01cc13d97791">
+<!ENTITY module-init-manpages-patch-size "35 KB">
 
 
 <!ENTITY ncurses-coverity-patch "ncurses-&ncurses-version;-coverity_fixes-1.patch">