Ticket #2361: util-linux.patch

trunk/BOOK/chapter05/util-linux-ng.xml

@@ -50 +50 @@
     <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
-make -C text-utils more</userinput></screen>
+<screen><userinput remap="make">make -C mount mount umount
+make -C text-utils more
+make -C disk-utils mkswap</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 +67 @@
 
     <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 mount/{,u}mount text-utils/more disk-utils/mkswap /tools/bin</userinput></screen>
 
   </sect2>
 

trunk/BOOK/appendices/dependencies.xml

@@ -354 +354 @@
         <segtitle>&testsuites;</segtitle>
 
         <seglistitem>
-          <seg>Diffutils</seg>
+          <seg>Diffutils, Util-linux-ng</seg>
         </seglistitem>
       </segmentedlist>