Changeset 18fd33b

Timestamp:

10/12/2011 09:34:45 PM (13 years ago)

Author:

Matthew Burgess <matthew@…>

Branches:

10.0, 10.0-rc1, 10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, 7.0, 7.1, 7.2, 7.3, 7.4, 7.5, 7.5-systemd, 7.6, 7.6-systemd, 7.7, 7.7-systemd, 7.8, 7.8-systemd, 7.9, 7.9-systemd, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

d2f700b

Parents:

9fbc54d

Message:

Upgrade to Module-Init-Tools-3.16. Fixes #2882.

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9629 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Files:

• chapter01/changelog.xml (modified) (1 diff)
• chapter01/whatsnew.xml (modified) (2 diffs)
• chapter03/patches.xml (modified) (1 diff)
• chapter06/module-init-tools.xml (modified) (3 diffs)
• packages.ent (modified) (1 diff)
• patches.ent (modified) (1 diff)

chapter01/changelog.xml

@@ -40 +40 @@
       <para>2011-10-12</para>
       <itemizedlist>
+        <listitem>
+          <para>[matthew] - Upgrade to Module-Init-Tools-3.16. Fixes
+          <ulink url="&lfs-ticket-root;2882">#2882</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[matthew] - Upgrade to Glibc-2.14.1. Fixes

chapter01/whatsnew.xml

@@ -149 +149 @@
       <para>Mktemp &mktemp-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Module-Init-Tools &module-init-tools-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>MPC &mpc-version;</para>
@@ -256 +256 @@
     </listitem>
     <listitem>
+      <para>&module-init-tools-man-patch;</para>
+    </listitem>
+    <listitem>
       <para>&mpfr-fixes-patch;</para>
     </listitem>

chapter03/patches.xml

@@ -133 +133 @@
 
     <varlistentry>
+      <term>Module Init Tools - <token>&module-init-tools-man-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&module-init-tools-man-patch;"/></para>
+        <para>MD5 sum: <literal>&module-init-tools-man-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term>MPFR Fixes Patch - <token>&mpfr-fixes-patch-size;</token>:</term>
       <listitem>

chapter06/module-init-tools.xml

@@ -42 +42 @@
     <title>Installation of Module-Init-Tools</title>
 
-    <para>To avoid a problem with regenerating the man pages when not needed, 
-    first rewrite a file that just points to another man page:</para>
+    <para>Apply a patch that contains the generated man pages that were missing
+    from the released source tarball:</para>
 
-<screen><userinput remap="pre">echo '.so man5/modprobe.conf.5' > modprobe.d.5</userinput></screen>
+<screen><userinput remap="pre">patch -Np1 -i ../&module-init-tools-man-patch;</userinput></screen>
 
     <para>The test suite of this package is geared towards the needs of its
@@ -54 +54 @@
     tree before recompiling for normal use):</para>
 
-<screen><userinput remap="test">./configure
+<screen><userinput remap="test">DOCBOOKTOMAN=/bin/true ./configure
 make check
+sed -i -e 's@../../configure@DOCBOOKTOMAN=/bin/true &amp;@' tests/runtests
 ./tests/runtests
 make clean</userinput></screen>
@@ -61 +62 @@
     <para>Prepare Module-Init-Tools for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/ --enable-zlib-dynamic --mandir=/usr/share/man</userinput></screen>
+<screen><userinput remap="configure">DOCBOOKTOMAN=/bin/true ./configure --prefix=/ --enable-zlib-dynamic --mandir=/usr/share/man</userinput></screen>
 
     <para>Compile the package:</para>

packages.ent

@@ -376 +376 @@
 <!ENTITY man-pages-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY module-init-tools-version "3.12">
-<!ENTITY module-init-tools-size "917 KB">
+<!ENTITY module-init-tools-version "3.16">
+<!ENTITY module-init-tools-size "224 KB">
 <!ENTITY module-init-tools-url "http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-&module-init-tools-version;.tar.bz2">
-<!ENTITY module-init-tools-md5 "8b2257ce9abef74c4a44d825d23140f3">
+<!ENTITY module-init-tools-md5 "bc44832c6e41707b8447e2847d2019f5">
 <!ENTITY module-init-tools-home "https://modules.wiki.kernel.org/index.php/Module_init_tools_3_12">
 <!ENTITY module-init-tools-ch6-du "8.6 MB">

patches.ent

@@ -71 +71 @@
 
 
+<!ENTITY module-init-tools-man-patch "module-init-tools-&module-init-tools-version;-man_pages-1.patch">
+<!ENTITY module-init-tools-man-patch-md5 "e90aa105293df7b8691fd8ac697cefc9">
+<!ENTITY module-init-tools-man-patch-size "44 KB">
+
+
 <!ENTITY mpfr-fixes-patch "mpfr-&mpfr-version;-fixes-1.patch">
 <!ENTITY mpfr-fixes-patch-md5 "66305450989c2633b9346900e9a5d9a3">