Changeset d1b03c8

Timestamp:

03/12/2009 09:01:24 PM (16 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, 12.2, 12.2-rc1, 6.5, 6.6, 6.7, 6.8, 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/loongarch-12.2, xry111/mips64el, xry111/multilib, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

c92413c

Parents:

a429714

Message:

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

Files:

• chapter01/changelog.xml (modified) (1 diff)
• chapter05/util-linux-ng.xml (modified) (2 diffs)
• general.ent (modified) (1 diff)

chapter01/changelog.xml

@@ -39 +39 @@
 
     <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

@@ -51 +51 @@
     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
@@ -82 +68 @@
     <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 +1 @@
 <?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">