diff options
| author | Matthew Burgess <matthew@linuxfromscratch.org> | 2005-11-04 22:45:17 +0000 |
|---|---|---|
| committer | Matthew Burgess <matthew@linuxfromscratch.org> | 2005-11-04 22:45:17 +0000 |
| commit | 9eee06f70b451bbcc470c5b558beda97b23e0269 (patch) | |
| tree | c2d1a9b52c5d792177d6bab21c5e0b588892a1f7 | |
| parent | f4116d459e64997723cd630bca8605344dea0f42 (diff) | |
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
| -rw-r--r-- | chapter01/changelog.xml | 4 | ||||
| -rw-r--r-- | chapter03/packages.xml | 7 | ||||
| -rw-r--r-- | chapter06/module-init-tools.xml | 14 | ||||
| -rw-r--r-- | general.ent | 4 |
4 files changed, 24 insertions, 5 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 8b32ae9f8..d3640cc56 100644 --- a/chapter01/changelog.xml +++ b/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 diff --git a/chapter03/packages.xml b/chapter03/packages.xml index 3b5789ac7..c4c99eec5 100644 --- a/chapter03/packages.xml +++ b/chapter03/packages.xml @@ -298,6 +298,13 @@ url="http://www.linuxfromscratch.org/lfs/download.html#ftp"/>.</para></note> </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> <para><ulink url="ftp://invisible-island.net/ncurses/"/></para> diff --git a/chapter06/module-init-tools.xml b/chapter06/module-init-tools.xml index dc0ee58c6..699f1a85b 100644 --- a/chapter06/module-init-tools.xml +++ b/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 && +./configure && +make check && +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> diff --git a/general.ent b/general.ent index d458e2145..6bc1508ea 100644 --- a/general.ent +++ b/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}]" --> |