aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chapter01/changelog.xml10
-rw-r--r--chapter05/util-linux.xml10
-rw-r--r--chapter06/util-linux.xml45
-rw-r--r--general.ent4
-rw-r--r--packages.ent6
5 files changed, 43 insertions, 32 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index f47b681d4..c9c7ce888 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -36,6 +36,16 @@
</listitem>
-->
<listitem>
+ <para>2014-07-22</para>
+ <itemizedlist>
+ <listitem>
+ <para>[bdubbs] - Update to util-linux-2.25. Fixes
+ <ulink url="&lfs-ticket-root;3627">#3627</ulink>.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>2014-07-21</para>
<itemizedlist>
<listitem>
diff --git a/chapter05/util-linux.xml b/chapter05/util-linux.xml
index 1b25e50f3..007b44e7d 100644
--- a/chapter05/util-linux.xml
+++ b/chapter05/util-linux.xml
@@ -44,6 +44,7 @@
<para>Prepare Util-linux for compilation:</para>
<screen><userinput remap="configure">./configure --prefix=/tools \
+ --without-python \
--disable-makeinstall-chown \
--without-systemdsystemunitdir \
PKG_CONFIG=""</userinput></screen>
@@ -52,6 +53,15 @@
<title>The meaning of the configure option:</title>
<varlistentry>
+ <term><parameter>--without-python</parameter></term>
+ <listitem>
+ <para>This switch disables using <application>Python</application>
+ if it is installed on the host system. It avoids trying to build
+ unneeded bindings.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term><parameter>--disable-makeinstall-chown</parameter></term>
<listitem>
<para>This switch disables using the <command>chown</command> command
diff --git a/chapter06/util-linux.xml b/chapter06/util-linux.xml
index 5afa8965b..87f70f0ea 100644
--- a/chapter06/util-linux.xml
+++ b/chapter06/util-linux.xml
@@ -45,14 +45,10 @@
<para>The FHS recommends using the <filename
class="directory">/var/lib/hwclock</filename> directory instead of the
usual <filename class="directory">/etc</filename> directory as the
- location for the <filename>adjtime</filename> file. To make the
- <command>hwclock</command> program FHS-compliant, run the
- following:</para>
+ location for the <filename>adjtime</filename> file. First create a directory
+ to enable storage for the <command>hwclock</command> program:</para>
-<screen><userinput remap="pre">sed -i -e 's@etc/adjtime@var/lib/hwclock/adjtime@g' \
- $(grep -rl '/etc/adjtime' .)
-
-mkdir -pv /var/lib/hwclock</userinput></screen>
+<screen><userinput remap="pre">mkdir -pv /var/lib/hwclock</userinput></screen>
</sect2>
@@ -61,7 +57,7 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
<para>Prepare Util-linux for compilation:</para>
-<screen><userinput remap="configure">./configure</userinput></screen>
+<screen><userinput remap="configure">./configure ADJTIME_PATH=/var/lib/hwclock</userinput></screen>
<para>Compile the package:</para>
@@ -79,10 +75,6 @@ mkdir -pv /var/lib/hwclock</userinput></screen>
<screen role="nodump"><userinput>bash tests/run.sh --srcdir=$PWD --builddir=$PWD</userinput></screen>
</warning>
- <note><para>Two tests, last/ipv6 and last/last, fail in the chroot environment
- due to the DNS resolver not being active yet. If the tests are rerun after
- booting, they pass.</para></note>
-
<screen><userinput remap="test">chown -Rv nobody .
su nobody -s /bin/bash -c "PATH=$PATH make -k check"</userinput></screen>
@@ -102,12 +94,12 @@ su nobody -s /bin/bash -c "PATH=$PATH make -k check"</userinput></screen>
<seglistitem>
<seg>addpart, agetty, blkdiscard, blkid, blockdev, cal, cfdisk, chcpu,
- chrt, col, colcrt, colrm, column, ctrlaltdel, cytune, delpart, dmesg,
+ chrt, col, colcrt, colrm, column, ctrlaltdel, delpart, dmesg,
eject, fallocate, fdformat, fdisk, findfs, findmnt, flock, fsck,
fsck.cramfs, fsck.minix, fsfreeze, fstrim, getopt, hexdump, hwclock,
i386, ionice, ipcmk, ipcrm, ipcs, isosize, kill, last, lastb (link to
last), ldattach, linux32, linux64, logger, look, losetup, lsblk, lscpu,
- lslocks, mcookie, mkfs, mkfs.bfs, mkfs.cramfs, mkfs.minix, mkswap,
+ lslocks, lslogins, mcookie, mkfs, mkfs.bfs, mkfs.cramfs, mkfs.minix, mkswap,
more, mount, mountpoint, namei, partx, pg, pivot_root, prlimit, raw,
readprofile, rename, renice, resizepart, rev, rtcwake, script,
scriptreplay, setarch, setsid, setterm, sfdisk, sulogin, swaplabel,
@@ -117,8 +109,8 @@ su nobody -s /bin/bash -c "PATH=$PATH make -k check"</userinput></screen>
<seg>libblkid.{a,so}, libmount.{a,so}, libuuid.{a,so}</seg>
- <seg>/usr/include/blkid, /usr/include/libmount, /usr/include/uuid,
- /usr/share/doc/util-linux/getopt, /var/lib/hwclock</seg>
+ <seg>/etc/terminal-colors.d, /usr/include/blkid, /usr/include/libmount,
+ /usr/include/uuid, /usr/share/doc/util-linux/getopt, /var/lib/hwclock</seg>
</seglistitem>
</segmentedlist>
@@ -272,17 +264,6 @@ su nobody -s /bin/bash -c "PATH=$PATH make -k check"</userinput></screen>
</listitem>
</varlistentry>
- <varlistentry id="cytune">
- <term><command>cytune</command></term>
- <listitem>
- <para>Tunes the parameters of the serial line drivers for
- Cyclades cards</para>
- <indexterm zone="ch-system-util-linux cytune">
- <primary sortas="b-cytune">cytune</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
<varlistentry id="delpart">
<term><command>delpart</command></term>
<listitem>
@@ -646,6 +627,16 @@ su nobody -s /bin/bash -c "PATH=$PATH make -k check"</userinput></screen>
</listitem>
</varlistentry>
+ <varlistentry id="lslogins">
+ <term><command>lslogins</command></term>
+ <listitem>
+ <para>Lists information about users, groups and system accounts</para>
+ <indexterm zone="ch-system-util-linux lslogins">
+ <primary sortas="b-lslogins">lslogins</primary>
+ </indexterm>
+ </listitem>
+ </varlistentry>
+
<varlistentry id="mcookie">
<term><command>mcookie</command></term>
<listitem>
diff --git a/general.ent b/general.ent
index 67b2b0772..d8b583254 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
-<!ENTITY version "SVN-20140721">
+<!ENTITY version "SVN-20140722">
<!ENTITY short-version "svn"> <!-- Used in dbus chapter, change to x.y for release -->
-<!ENTITY releasedate "July 21, 2014">
+<!ENTITY releasedate "July 22, 2014">
<!ENTITY copyrightdate "1999-2014"><!-- jhalfs needs a literal dash, not &ndash; -->
<!ENTITY milestone "7.6">
<!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/packages.ent b/packages.ent
index 15c5cc521..b72d951c2 100644
--- a/packages.ent
+++ b/packages.ent
@@ -628,10 +628,10 @@
<!ENTITY udev-lfs-md5 "c2d6b127f89261513b23b6d458484099">
<!ENTITY udev-lfs-home " ">
-<!ENTITY util-linux-version "2.24.2">
-<!ENTITY util-linux-size "3,503 KB">
+<!ENTITY util-linux-version "2.25">
+<!ENTITY util-linux-size "3,596 KB">
<!ENTITY util-linux-url "&kernel;linux/utils/util-linux/v2.24/util-linux-&util-linux-version;.tar.xz">
-<!ENTITY util-linux-md5 "3f191727a0d28f7204b755cf1b6ea0aa">
+<!ENTITY util-linux-md5 "4c78fdef4cb882caafad61e33cafbc14">
<!ENTITY util-linux-home "http://freecode.com/projects/util-linux">
<!ENTITY util-linux-ch5-du "89 MB">
<!ENTITY util-linux-ch5-sbu "0.6 SBU">