aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chapter01/changelog.xml10
-rw-r--r--chapter01/whatsnew.xml4
-rw-r--r--chapter06/util-linux.xml33
-rw-r--r--general.ent4
-rw-r--r--packages.ent10
5 files changed, 50 insertions, 11 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 19ffad1e9..14462985e 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -38,6 +38,16 @@
-->
<listitem>
+ <para>2012-09-04</para>
+ <itemizedlist>
+ <listitem>
+ <para>[bdubbs] - Update to util-linux-2.22. Fixes
+ <ulink url="&lfs-ticket-root;3145">#3145</ulink>.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>2012-09-02</para>
<itemizedlist>
<listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 7834a3244..ce70a3bf9 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -193,9 +193,9 @@
<!--<listitem>
<para>&udev-config;</para>
</listitem>-->
- <!--<listitem>
+ <listitem>
<para>Util-Linux &util-linux-version;</para>
- </listitem>-->
+ </listitem>
<!--<listitem>
<para>Vim &vim-version;</para>
</listitem>-->
diff --git a/chapter06/util-linux.xml b/chapter06/util-linux.xml
index 237b2c701..5dc606352 100644
--- a/chapter06/util-linux.xml
+++ b/chapter06/util-linux.xml
@@ -50,7 +50,8 @@
following:</para>
<screen><userinput remap="pre">sed -i -e 's@etc/adjtime@var/lib/hwclock/adjtime@g' \
- $(grep -rl '/etc/adjtime' .)
+ $(grep -rl '/etc/adjtime' .)
+
mkdir -pv /var/lib/hwclock</userinput></screen>
</sect2>
@@ -58,7 +59,22 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
<sect2 role="installation">
<title>Installation of Util-linux</title>
-<screen><userinput remap="configure">./configure</userinput></screen>
+<screen><userinput remap="configure">./configure --disable-su --disable-sulogin --disable-login</userinput></screen>
+
+ <variablelist>
+ <title>The meaning of the configure option:</title>
+
+ <varlistentry>
+ <term><parameter>--disable-*</parameter></term>
+ <listitem>
+ <para>These switches disable building su, sulogin, and login. They
+ duplicate the same programs provided by <xref
+ linkend='ch-system-shadow'/>. They also require <ulink
+ url="&blfs-root;/view/svn/postlfs/linux-pam.html">Linux-PAM</ulink>
+ which is not available in LFS.</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
<para>Compile the package:</para>
@@ -92,7 +108,9 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
setarch, setsid, setterm, sfdisk, swaplabel, swapoff (link to swapon),
swapon, switch_root, tailf, taskset, tunelp, ul, umount, unshare,
uuidd, uuidgen, wall, whereis, wipefs, and x86_64</seg>
+
<seg>libblkid.{a,so}, libmount.{a,so}, libuuid.{a,so}</seg>
+
<seg>/usr/include/blkid, /usr/include/libmount, /usr/include/uuid,
/usr/share/getopt, /var/lib/hwclock</seg>
</seglistitem>
@@ -1018,6 +1036,17 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
</listitem>
</varlistentry>
+ <varlistentry id="libmount">
+ <term><filename class="libraryfile">libmount</filename></term>
+ <listitem>
+ <para>Contains routines for block device mounting and
+ unmounting</para>
+ <indexterm zone="ch-system-util-linux libmount">
+ <primary sortas="c-libmount">libmount</primary>
+ </indexterm>
+ </listitem>
+ </varlistentry>
+
<varlistentry id="libuuid">
<term><filename class="libraryfile">libuuid</filename></term>
<listitem>
diff --git a/general.ent b/general.ent
index 48d39d79f..e3ea44138 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20120902">
-<!ENTITY releasedate "September 2, 2012">
+<!ENTITY version "SVN-20120904">
+<!ENTITY releasedate "September 4, 2012">
<!ENTITY copyrightdate "1999-2012"><!-- jhalfs needs a literal dash, not &ndash; -->
<!ENTITY milestone "7.3">
<!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/packages.ent b/packages.ent
index 826650338..968d0c36b 100644
--- a/packages.ent
+++ b/packages.ent
@@ -546,12 +546,12 @@
<!ENTITY udev-lfs-md5 "2840cd8c5fa91617efd36123486a7ac5">
<!ENTITY udev-lfs-home " ">
-<!ENTITY util-linux-version "2.21.2">
-<!ENTITY util-linux-size "2,916 KB">
-<!ENTITY util-linux-url "&kernel;linux/utils/util-linux/v2.21/util-linux-&util-linux-version;.tar.xz">
-<!ENTITY util-linux-md5 "54ba880f1d66782c2287ee2c898520e9">
+<!ENTITY util-linux-version "2.22">
+<!ENTITY util-linux-size "3,116 KB">
+<!ENTITY util-linux-url "&kernel;linux/utils/util-linux/v2.22/util-linux-&util-linux-version;.tar.xz">
+<!ENTITY util-linux-md5 "ba2d8cc12a937231c80a04f7f7149303">
<!ENTITY util-linux-home "http://userweb.kernel.org/~kzak/util-linux/">
-<!ENTITY util-linux-ch6-du "81 MB">
+<!ENTITY util-linux-ch6-du "83 MB">
<!ENTITY util-linux-ch6-sbu "0.7 SBU">
<!ENTITY vim-version "7.3">