Build mkswap for e2fsprogs' testsuite, and remove unnecessary BLKID_LIBS variable. Fixes #2361.

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

chapter01/changelog.xml

@@ -37,6 +37,19 @@
 
 -->
 
+    <listitem>
+      <para>2009-03-12</para>
+      <itemizedlist>
+        <listitem>
+          <para>[matthew] - Build mkswap in chapter 5's Util-Linux-NG as it is
+          required by the e2fsprogs test suite.  Also, remove the now
+          unnecessary BLKID_LIBS variable.  Fixes
+          <ulink url="&lfs-ticket-root;2361">#2361</ulink>. Thanks to Chris
+          Staub for the reports.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2009-03-11</para>
       <itemizedlist>

chapter05/util-linux-ng.xml

@@ -50,24 +50,10 @@
     <para>Only a few of the utilities contained in this package need to be
     built:</para>
 
-<screen><userinput remap="make">make BLKID_LIBS="-lblkid -luuid" -C mount mount umount
+<screen><userinput remap="make">make -C disk-utils mkswap
+make -C mount mount umount
 make -C text-utils more</userinput></screen>
 
-    <variablelist>
-      <title>The meaning of the make parameter:</title>
-
-      <varlistentry>
-        <term><parameter>BLKID_LIBS="-lblkid -luuid"</parameter></term>
-        <listitem>
-          <para>When building only a subset of the package, the
-          <filename class="libraryfile">libuuid.a</filename> library is not
-          pulled into the build as it is supposed to. This command overrides
-          the default from the <filename>Makefile</filename>.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
     <!-- Not sure why this is in there. There is no test suite. Though
          running 'make check' may build these programs, there is no
          testing done.
@@ -81,7 +67,7 @@ make -C text-utils more</userinput></screen>
 
     <para>Copy these programs to the temporary tools directory:</para>
 
-<screen><userinput remap="install">cp -v mount/{,u}mount text-utils/more /tools/bin</userinput></screen>
+<screen><userinput remap="install">cp -v disk-utils/mkswap mount/{,u}mount text-utils/more /tools/bin</userinput></screen>
 
   </sect2>
 

general.ent

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-20090311">
-<!ENTITY releasedate "March 11, 2009">
+<!ENTITY version "SVN-20090312">
+<!ENTITY releasedate "March 12, 2009">
 <!ENTITY copyrightdate "1999-2009"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone "7.0">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->