aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--appendices/dependencies.xml4
-rw-r--r--chapter01/changelog.xml128
-rw-r--r--chapter05/chapter05.xml2
-rw-r--r--chapter05/ncurses.xml22
-rw-r--r--chapter05/util-linux-ng.xml78
-rw-r--r--chapter05/util-linux.xml91
-rw-r--r--chapter06/acl.xml8
-rw-r--r--chapter06/chapter06.xml2
-rw-r--r--chapter06/createfiles.xml3
-rw-r--r--chapter06/creatingdirs.xml2
-rw-r--r--chapter06/e2fsprogs.xml23
-rw-r--r--chapter06/kernfs.xml16
-rw-r--r--chapter06/revisedchroot.xml2
-rw-r--r--chapter06/systemd.xml31
-rw-r--r--chapter09/reboot.xml10
-rw-r--r--general.ent4
-rw-r--r--packages.ent60
17 files changed, 334 insertions, 152 deletions
diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml
index f2287f2f9..260ed14d3 100644
--- a/appendices/dependencies.xml
+++ b/appendices/dependencies.xml
@@ -2093,7 +2093,7 @@
<seglistitem>
<seg>Bash, Binutils, Coreutils, Diffutils, Findutils, Gawk, GCC,
- Gettext, Glibc, Grep, Make, Ncurses, Sed, and Zlib</seg>
+ Gettext, Glibc, Grep, Make, Ncurses, Sed, Udev, and Zlib</seg>
</seglistitem>
</segmentedlist>
@@ -2101,7 +2101,7 @@
<segtitle>&testsuites;</segtitle>
<seglistitem>
- <seg>No test suite available</seg>
+ <seg>None</seg>
</seglistitem>
</segmentedlist>
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 883358cff..e0cdd32d3 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -36,6 +36,117 @@
</listitem>
-->
<listitem>
+ <para>2014-02-04</para>
+ <itemizedlist>
+ <listitem>
+ <para>[krejzi] - Merge LFS SVN-20140202 book.</para>
+ </listitem>
+ <listitem>
+ <para>[krejzi] - Update to D-Bus 1.8.0.</para>
+ </listitem>
+ <listitem>
+ <para>[krejzi] - Fix Systemd to build with recent LFS changes.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
+ <para>2014-02-02</para>
+ <itemizedlist>
+ <listitem>
+ <para>[bdubbs] - Update to linux-3.13.1. Fixes
+ <ulink url="&lfs-ticket-root;3483">#3483</ulink>.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
+ <para>2014-01-27</para>
+ <itemizedlist>
+ <listitem>
+ <para>[bdubbs] - Add an environment variable to util-linux
+ in Chapter 5 to prevent an installation error for
+ hosts that have unneeded capabilities availible.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
+ <para>2014-01-26</para>
+ <itemizedlist>
+ <listitem>
+ <para>[bdubbs] - Update to man-pages-3.57. Fixes
+ <ulink url="&lfs-ticket-root;3480">#3480</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[bdubbs] - Update to man-db-2.6.6. Fixes
+ <ulink url="&lfs-ticket-root;3479">#3479</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[bdubbs] - Update to linux-3.13. Fixes
+ <ulink url="&lfs-ticket-root;3478">#3478</ulink>.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
+ <para>2014-01-25</para>
+ <itemizedlist>
+ <listitem>
+ <para>[bdubbs] - Add a configure switch to util-linux
+ in Chapter 5 to prevent an installation error for
+ hosts that have systemd installed.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
+ <para>2014-01-22</para>
+ <itemizedlist>
+ <listitem>
+ <para>[bdubbs] - Update to check-0.9.12. Fixes
+ <ulink url="&lfs-ticket-root;3477">#3477</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[bdubbs] - Update to util-linux-2.24.1. Fixes
+ <ulink url="&lfs-ticket-root;3476">#3476</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[bdubbs] - Update to mpc-1.0.2. Fixes
+ <ulink url="&lfs-ticket-root;3474">#3474</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[bdubbs] - Update to man-pages-3.56. Fixes
+ <ulink url="&lfs-ticket-root;3470">#3470</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[bdubbs] - Update to linux-3.12.7. Fixes
+ <ulink url="&lfs-ticket-root;3469">#3469</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[bdubbs] - Update to perl-5.18.2. Fixes
+ <ulink url="&lfs-ticket-root;3465">#3465</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[bdubbs] - Update to gettext-0.18.3.2. Fixes
+ <ulink url="&lfs-ticket-root;3464">#3464</ulink>.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
+ <para>2014-01-21</para>
+ <itemizedlist>
+ <listitem>
+ <para>[bdubbs] - Moved util-linux final build to be after
+ udev. Fixed up e2fsprogs and udev to use the Chapter 5
+ build of util-linux. Fixes
+ <ulink url="&lfs-ticket-root;3467">#3467</ulink>.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>2014-01-17</para>
<itemizedlist>
<listitem>
@@ -45,6 +156,21 @@
</listitem>
<listitem>
+ <para>2014-01-15</para>
+ <itemizedlist>
+ <listitem>
+ <para>[bdubbs] - Added a Chapter 5 build of util-linux in
+ preparation for moving the Chapter 6 build to after udev.
+ This is not the complete fix as this build has not yet
+ been incorporated into Chapter 6.</para>
+ </listitem>
+ <listitem>
+ <para>[bdubbs] - Mount /run as a tmpfs for Chapter 6.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>2014-01-14</para>
<itemizedlist>
<listitem>
@@ -55,7 +181,7 @@
</listitem>
<listitem>
<para>[bdubbs] - Fix hardcoded reference to /tools in
- Chapter 6 glibc. Fixes
+ Chapter 6 gcc. Fixes
<ulink url="&lfs-ticket-root;3466">#3466</ulink>.</para>
</listitem>
<listitem>
diff --git a/chapter05/chapter05.xml b/chapter05/chapter05.xml
index d858c9a98..e5bb196dc 100644
--- a/chapter05/chapter05.xml
+++ b/chapter05/chapter05.xml
@@ -43,8 +43,8 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sed.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tar.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="texinfo.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="util-linux.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xz.xml"/>
-<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="util-linux-ng.xml"/>-->
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="stripping.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="changingowner.xml"/>
diff --git a/chapter05/ncurses.xml b/chapter05/ncurses.xml
index 18da06aec..a18a9c819 100644
--- a/chapter05/ncurses.xml
+++ b/chapter05/ncurses.xml
@@ -45,8 +45,12 @@
<para>Prepare Ncurses for compilation:</para>
-<screen><userinput remap="configure">./configure --prefix=/tools --with-shared \
- --without-debug --without-ada --enable-overwrite</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/tools \
+ --with-shared \
+ --without-debug \
+ --without-ada \
+ --enable-widec \
+ --enable-overwrite</userinput></screen>
<variablelist>
<title>The meaning of the configure options:</title>
@@ -71,6 +75,20 @@
</listitem>
</varlistentry>
+ <varlistentry>
+ <term><parameter>--enable-widec</parameter></term>
+ <listitem>
+ <para>This switch causes wide-character libraries (e.g., <filename
+ class="libraryfile">libncursesw.so.&ncurses-version;</filename>)
+ to be built instead of normal ones (e.g., <filename
+ class="libraryfile">libncurses.so.&ncurses-version;</filename>).
+ These wide-character libraries are usable in both multibyte and
+ traditional 8-bit locales, while normal libraries work properly
+ only in 8-bit locales. Wide-character and normal libraries are
+ source-compatible, but not binary-compatible.</para>
+ </listitem>
+ </varlistentry>
+
</variablelist>
<para>Compile the package:</para>
diff --git a/chapter05/util-linux-ng.xml b/chapter05/util-linux-ng.xml
deleted file mode 100644
index d06249f4f..000000000
--- a/chapter05/util-linux-ng.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
- "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
- <!ENTITY % general-entities SYSTEM "../general.ent">
- %general-entities;
-]>
-
-<sect1 id="ch-tools-util-linux-ng" role="wrap">
- <?dbhtml filename="util-linux-ng.html"?>
-
- <sect1info condition="script">
- <productname>util-linux-ng</productname>
- <productnumber>&util-linux-ng-version;</productnumber>
- <address>&util-linux-ng-url;</address>
- </sect1info>
-
- <title>Util-linux-ng-&util-linux-ng-version;</title>
-
- <indexterm zone="ch-tools-util-linux-ng">
- <primary sortas="a-Util-linux-ng">Util-linux-ng</primary>
- <secondary>tools</secondary>
- </indexterm>
-
- <sect2 role="package">
- <title/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../chapter06/util-linux-ng.xml"
- xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
-
- <segmentedlist>
- <segtitle>&buildtime;</segtitle>
- <segtitle>&diskspace;</segtitle>
-
- <seglistitem>
- <seg>&util-linux-ng-ch5-sbu;</seg>
- <seg>&util-linux-ng-ch5-du;</seg>
- </seglistitem>
- </segmentedlist>
-
- </sect2>
-
- <sect2 role="installation">
- <title>Installation of Util-linux-ng</title>
-
- <para>Prepare Util-linux-ng for compilation:</para>
-
-<screen><userinput remap="configure">./configure --prefix=/tools</userinput></screen>
-
- <para>Only a few of the utilities contained in this package need to be
- built:</para>
-
-<screen><userinput remap="make">make -C disk-utils mkswap
-make -C mount mount umount
-make -C text-utils more</userinput></screen>
-
- <para>This package does not come with a test suite.</para>
-
- <para>Install the shared libraries required by E2fsprogs:</para>
-
-<screen><userinput remap="install">make -C shlibs/uuid install
-make -C shlibs/blkid install</userinput></screen>
-
- <para>Copy these programs to the temporary tools directory:</para>
-
-<screen><userinput remap="install">cp -v disk-utils/mkswap mount/{,u}mount text-utils/more /tools/bin</userinput></screen>
-
- </sect2>
-
- <sect2 role="content">
- <title/>
-
- <para>Details on this package are located in
- <xref linkend="contents-utillinux" role="."/></para>
-
- </sect2>
-
-</sect1>
diff --git a/chapter05/util-linux.xml b/chapter05/util-linux.xml
new file mode 100644
index 000000000..7156895c2
--- /dev/null
+++ b/chapter05/util-linux.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+ <!ENTITY % general-entities SYSTEM "../general.ent">
+ %general-entities;
+]>
+
+<sect1 id="ch-tools-util-linux" role="wrap">
+ <?dbhtml filename="util-linux.html"?>
+
+ <sect1info condition="script">
+ <productname>util-linux</productname>
+ <productnumber>&util-linux-version;</productnumber>
+ <address>&util-linux-url;</address>
+ </sect1info>
+
+ <title>Util-linux-&util-linux-version;</title>
+
+ <indexterm zone="ch-tools-util-linux">
+ <primary sortas="a-Util-linux">Util-linux</primary>
+ </indexterm>
+
+ <sect2 role="package">
+ <title/>
+
+ <para>The Util-linux package contains miscellaneous utility programs.</para>
+
+ <segmentedlist>
+ <segtitle>&buildtime;</segtitle>
+ <segtitle>&diskspace;</segtitle>
+
+ <seglistitem>
+ <seg>&util-linux-ch5-sbu;</seg>
+ <seg>&util-linux-ch5-du;</seg>
+ </seglistitem>
+ </segmentedlist>
+
+ </sect2>
+
+ <sect2 role="installation">
+ <title>Installation of Util-linux</title>
+
+ <para>Prepare Util-linux for compilation:</para>
+
+<screen><userinput remap="configure">./configure --prefix=/tools \
+ --disable-makeinstall-chown \
+ --without-systemdsystemunitdir \
+ PKG_CONFIG=""</userinput></screen>
+
+ <variablelist>
+ <title>The meaning of the configure option:</title>
+
+ <varlistentry>
+ <term><parameter>--disable-makeinstall-chown</parameter></term>
+ <listitem>
+ <para>This switch disables using the <command>chown</command> command
+ during installation. This is not needed when installing into the
+ /tools directory and avoids the necessity of installing as
+ root.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><parameter>--without-systemdsystemunitdir</parameter></term>
+ <listitem>
+ <para>On systems that use systemd, the package tries to install
+ a systemd specific file to a non-existent directory in /tools.
+ This switch disables the unnecessary action.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><envar>PKG_CONFIG=""</envar></term>
+ <listitem>
+ <para>Setting this envronment variable prevents adding unneeded
+ features that may be available on the host.</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+
+ <para>Compile the package:</para>
+
+<screen><userinput remap="make">make</userinput></screen>
+
+ <para>Install the package:</para>
+
+<screen><userinput remap="install">make install</userinput></screen>
+
+ </sect2>
+
+</sect1>
diff --git a/chapter06/acl.xml b/chapter06/acl.xml
index 267160cf7..32a45409b 100644
--- a/chapter06/acl.xml
+++ b/chapter06/acl.xml
@@ -56,11 +56,15 @@
<screen><userinput remap="make">make</userinput></screen>
<para>The Acl tests need to be run on a filesystem that supports access
- controls. You will see lot of failures because Coreutils weren't compiled
- with ACL support. To test the results, issue:</para>
+ controls. You will see lot of failures because Coreutils wasn't compiled
+ with ACL support. To anyways test the results, issue:</para>
<screen><userinput remap="test">make -k tests root-tests</userinput></screen>
+ <note><para>Even if you run Acl tests after Coreutils has been built with
+ Acl support, at least 11 tests will still fail for unknown reasons.</para>
+ </note>
+
<para>Install the package:</para>
<screen><userinput remap="install">make install install-dev install-lib
diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index c568864d3..9e69a42bd 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -36,7 +36,6 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="acl.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libcap.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="shadow.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="util-linux.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="psmisc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="procps.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="e2fsprogs.xml"/>
@@ -78,6 +77,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libdbus.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="systemd.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dbus.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="util-linux.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tar.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="texinfo.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vim.xml"/>
diff --git a/chapter06/createfiles.xml b/chapter06/createfiles.xml
index d39f940f9..ce20549e5 100644
--- a/chapter06/createfiles.xml
+++ b/chapter06/createfiles.xml
@@ -98,7 +98,8 @@ adm:x:16:
messagebus:x:18:
systemd-journal:x:23:
mail:x:34:
-nogroup:x:99:</literal>
+nogroup:x:99:
+users:x:100:</literal>
EOF</userinput></screen>
<para>The created groups are not part of any standard&mdash;they are groups
diff --git a/chapter06/creatingdirs.xml b/chapter06/creatingdirs.xml
index aec7d25ec..65553e8d5 100644
--- a/chapter06/creatingdirs.xml
+++ b/chapter06/creatingdirs.xml
@@ -13,7 +13,7 @@
<para>It is time to create some structure in the LFS file system. Create a
standard directory tree by issuing the following commands:</para>
-<screen><userinput>mkdir -pv /{bin,boot,etc/{opt,sysconfig},home,lib,mnt,opt,run}
+<screen><userinput>mkdir -pv /{bin,boot,etc/{opt,sysconfig},home,lib,mnt,opt}
mkdir -pv /{media/{floppy,cdrom},sbin,srv,var}
install -dv -m 0750 /root
install -dv -m 1777 /tmp /var/tmp
diff --git a/chapter06/e2fsprogs.xml b/chapter06/e2fsprogs.xml
index 6efb07619..bf4332ba9 100644
--- a/chapter06/e2fsprogs.xml
+++ b/chapter06/e2fsprogs.xml
@@ -52,7 +52,11 @@ cd build</userinput></screen>
<para>Prepare E2fsprogs for compilation:</para>
-<screen><userinput remap="configure">../configure --prefix=/usr \
+<screen><userinput remap="configure">export PKG_CONFIG_PATH=/tools/lib/pkgconfig
+
+LIBS=-L/tools/lib \
+CFLAGS=-I/tools/include \
+../configure --prefix=/usr \
--with-root-prefix="" \
--enable-elf-shlibs \
--disable-libblkid \
@@ -61,16 +65,16 @@ cd build</userinput></screen>
--disable-fsck</userinput></screen>
<variablelist>
- <title>The meaning of the configure options:</title>
-<!--
+ <title>The meaning of the environment variable and configure options:</title>
+
<varlistentry>
- <term><parameter>PKG_CONFIG...</parameter></term>
+ <term><parameter>PKG_CONFIG_PATH, LIBS, CFLAGS</parameter></term>
<listitem>
- <para>This enables E2fsprogs to be built without requiring Pkg-config
- to be built and installed first.</para>
+ <para>These variables enable e2fsprogs to be built using the
+ <xref linkend="ch-tools-util-linux"/> package built earlier.</para>
</listitem>
</varlistentry>
--->
+
<varlistentry>
<term><parameter>--with-root-prefix=""</parameter></term>
<listitem>
@@ -127,9 +131,10 @@ cd build</userinput></screen>
<screen><userinput remap="install">make install</userinput></screen>
- <para>Install the static libraries and headers:</para>
+ <para>Install the static libraries and headers and do some clean up:</para>
-<screen><userinput remap="install">make install-libs</userinput></screen>
+<screen><userinput remap="install">make install-libs
+unset PKG_CONFIG_PATH</userinput></screen>
<para>Make the installed static libraries writable so debugging symbols can
be removed later:</para>
diff --git a/chapter06/kernfs.xml b/chapter06/kernfs.xml
index bfd583455..860cdfc00 100644
--- a/chapter06/kernfs.xml
+++ b/chapter06/kernfs.xml
@@ -22,7 +22,7 @@
<para>Begin by creating directories onto which the file systems will be
mounted:</para>
-<screen><userinput>mkdir -pv $LFS/{dev,proc,sys}</userinput></screen>
+<screen><userinput>mkdir -pv $LFS/{dev,proc,sys,run}</userinput></screen>
<sect2>
<title>Creating Initial Device Nodes</title>
@@ -70,7 +70,8 @@ mknod -m 666 $LFS/dev/null c 1 3</userinput></screen>
<screen><userinput>mount -vt devpts devpts $LFS/dev/pts -o gid=5,mode=620
mount -vt proc proc $LFS/proc
-mount -vt sysfs sysfs $LFS/sys</userinput></screen>
+mount -vt sysfs sysfs $LFS/sys
+mount -vt tmpfs tmpfs $LFS/run</userinput></screen>
<variablelist>
<title>The meaning of the mount options for devpts:</title>
@@ -102,16 +103,11 @@ mount -vt sysfs sysfs $LFS/sys</userinput></screen>
<para>In some host systems, <filename>/dev/shm</filename> is a
symbolic link to <filename class="directory">/run/shm</filename>.
- Inside a chroot environment, this temporary file system needs
- to be mounted separate from the host file system:</para>
+ The /run tmpfs was mounted above so in this case only a
+ directory needs to be created.</para>
<screen><userinput>if [ -h $LFS/dev/shm ]; then
- link=$(readlink $LFS/dev/shm)
- mkdir -pv $LFS/$link
- mount -vt tmpfs shm $LFS/$link
- unset link
-else
- mount -vt tmpfs shm $LFS/dev/shm
+ mkdir -pv $LFS/$(readlink $LFS/dev/shm)
fi</userinput></screen>
</sect2>
diff --git a/chapter06/revisedchroot.xml b/chapter06/revisedchroot.xml
index 6c4579a1e..8927a9f29 100644
--- a/chapter06/revisedchroot.xml
+++ b/chapter06/revisedchroot.xml
@@ -12,7 +12,7 @@
<para>Finally, clean up some extra files left around from running tests:</para>
-<screen><userinput>rm -rf /run/* /tmp/*</userinput></screen>
+<screen><userinput>rm -rf /tmp/*</userinput></screen>
<para>From now on, when reentering the chroot environment after
exiting, use the following modified chroot command:</para>
diff --git a/chapter06/systemd.xml b/chapter06/systemd.xml
index 3175d6e7f..628954fae 100644
--- a/chapter06/systemd.xml
+++ b/chapter06/systemd.xml
@@ -40,6 +40,21 @@
<sect2 role="installation">
<title>Installation of Systemd</title>
+ <para>First, create a file to allow Systemd to build when using Util-Linux
+ built in Chapter 5:</para>
+
+<screen><userinput remap="pre">cat &gt; config.cache &lt;&lt; "EOF"
+<literal>KILL=/bin/kill
+HAVE_BLKID=1
+BLKID_LIBS="-lblkid"
+BLKID_CFLAGS="-I/tools/include/blkid"</literal>
+EOF</userinput></screen>
+
+ <para>Aditionally, fix a build error when using Util-Linux built in
+ Chapter 5:</para>
+
+<screen><userinput remap="pre">sed -i "s:blkid/::" src/udev/udev-builtin-blkid.c</userinput></screen>
+
<para>Prepare Systemd for compilation:</para>
<screen><userinput remap="configure">./configure --prefix=/usr \
@@ -47,6 +62,7 @@
--localstatedir=/var \
--libexecdir=/usr/lib \
--docdir=/usr/share/doc/systemd-&systemd-version; \
+ --config-cache \
--with-rootprefix= \
--with-rootlibdir=/lib \
--enable-split-usr \
@@ -57,7 +73,16 @@
<title>The meaning of the configure options:</title>
<varlistentry>
- <term><parameter>--with-root-*</parameter></term>
+ <term><parameter>--config-cache</parameter></term>
+ <listitem>
+ <para>This switch tells the build system to use
+ the <filename>config.cache</filename> file which
+ was created earlier.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><parameter>--with-root*</parameter></term>
<listitem>
<para>These switches ensure that core programs and
shared libraries are installed in the subdirectories
@@ -86,14 +111,14 @@
<para>Compile the package:</para>
-<screen><userinput remap="make">make</userinput></screen>
+<screen><userinput remap="make">make LIBRARY_PATH=/tools/lib</userinput></screen>
<para>The package comes with a testsuite, but it doesn't work in
chroot. It needs to be run from a system booted using Systemd.</para>
<para>Install the package:</para>
-<screen><userinput remap="install">make install</userinput></screen>
+<screen><userinput remap="install">make LD_LIBRARY_PATH=/tools/lib install</userinput></screen>
<para>Install manual pages which are shipped in the tarball, but were
not installed by install process:</para>
diff --git a/chapter09/reboot.xml b/chapter09/reboot.xml
index d8d4aa00d..cf95c024f 100644
--- a/chapter09/reboot.xml
+++ b/chapter09/reboot.xml
@@ -87,16 +87,8 @@
<para>Then unmount the virtual file systems:</para>
<screen><userinput>umount -v $LFS/dev/pts
-
-if [ -h $LFS/dev/shm ]; then
- link=$(readlink $LFS/dev/shm)
- umount -v $LFS/$link
- unset link
-else
- umount -v $LFS/dev/shm
-fi
-
umount -v $LFS/dev
+umount -v $LFS/run
umount -v $LFS/proc
umount -v $LFS/sys</userinput></screen>
diff --git a/general.ent b/general.ent
index d48f35b3c..341b76061 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version "SYSTEMD-20140117">
-<!ENTITY releasedate "January 17, 2014">
+<!ENTITY version "SYSTEMD-20140204">
+<!ENTITY releasedate "February 04, 2014">
<!ENTITY copyrightdate "1999-2014"><!-- jhalfs needs a literal dash, not &ndash; -->
<!ENTITY milestone "7.5">
<!ENTITY generic-version "systemd"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/packages.ent b/packages.ent
index a16d2d7f2..efc67fe34 100644
--- a/packages.ent
+++ b/packages.ent
@@ -92,10 +92,10 @@
<!ENTITY bzip2-ch6-du "6.9 MB">
<!ENTITY bzip2-ch6-sbu "less than 0.1 SBU">
-<!ENTITY check-version "0.9.11">
-<!ENTITY check-size "675 KB">
+<!ENTITY check-version "0.9.12">
+<!ENTITY check-size "714 KB">
<!ENTITY check-url "http://sourceforge.net/projects/check/files/check/&check-version;/check-&check-version;.tar.gz">
-<!ENTITY check-md5 "fd5a03979bcab9fb80ba005b55f54178">
+<!ENTITY check-md5 "46fe540d1a03714c7a1967dbc6d484e7">
<!ENTITY check-home "http://check.sourceforge.net/">
<!ENTITY check-ch5-du "6.9 MB">
<!ENTITY check-ch5-sbu "0.1 SBU">
@@ -110,10 +110,10 @@
<!ENTITY coreutils-ch6-du "116 MB">
<!ENTITY coreutils-ch6-sbu "3.4 SBU">
-<!ENTITY dbus-version "1.6.18">
-<!ENTITY dbus-size "1,872 KB">
+<!ENTITY dbus-version "1.8.0">
+<!ENTITY dbus-size "1,820 KB">
<!ENTITY dbus-url "http://dbus.freedesktop.org/releases/dbus/dbus-&dbus-version;.tar.gz">
-<!ENTITY dbus-md5 "b02e9c95027a416987b81f9893831061">
+<!ENTITY dbus-md5 "059fbe84e39fc99c67a14f15b1f39dff">
<!ENTITY dbus-home "http://www.freedesktop.org/wiki/Software/dbus">
<!ENTITY dbus-ch6-du "35 MB">
<!ENTITY dbus-ch6-sbu "less than 0.4 SBU">
@@ -228,10 +228,10 @@
<!ENTITY gdbm-ch6-du "8.5 MB">
<!ENTITY gdbm-ch6-sbu "0.1 SBU">
-<!ENTITY gettext-version "0.18.3.1">
-<!ENTITY gettext-size "15,960 KB">
+<!ENTITY gettext-version "0.18.3.2">
+<!ENTITY gettext-size "15,810 KB">
<!ENTITY gettext-url "&gnu;gettext/gettext-&gettext-version;.tar.gz">
-<!ENTITY gettext-md5 "3fc808f7d25487fc72b5759df7419e02">
+<!ENTITY gettext-md5 "241aba309d07aa428252c74b40a818ef">
<!ENTITY gettext-home "&gnu-software;gettext/">
<!ENTITY gettext-ch5-du "119 MB">
<!ENTITY gettext-ch5-sbu "0.6 SBU">
@@ -394,13 +394,13 @@
<!ENTITY libtool-ch6-sbu "3.0 SBU">
<!ENTITY linux-major-version "3">
-<!ENTITY linux-minor-version "12">
-<!ENTITY linux-patch-version "6">
+<!ENTITY linux-minor-version "13">
+<!ENTITY linux-patch-version "1">
<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
-<!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
-<!ENTITY linux-size "74,606 KB">
+<!-- <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;"> -->
+<!ENTITY linux-size "75,383 KB">
<!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "ab2fcc368e20d804e77970196154fb9e">
+<!ENTITY linux-md5 "18f528e5632f0096e642c511722630dc">
<!ENTITY linux-home "http://www.kernel.org/">
<!-- measured for 3.9.0 / gcc-4.8.0 on x86_64 : minimum is
allnoconfig extended for a hopefully-bootable build on desktop machine,
@@ -433,26 +433,26 @@
<!ENTITY make-ch6-du "11.3 MB">
<!ENTITY make-ch6-sbu "0.4 SBU">
-<!ENTITY man-db-version "2.6.5">
-<!ENTITY man-db-size "1,380 KB">
+<!ENTITY man-db-version "2.6.6">
+<!ENTITY man-db-size "1,415 KB">
<!ENTITY man-db-url "http://download.savannah.gnu.org/releases/man-db/man-db-&man-db-version;.tar.xz">
-<!ENTITY man-db-md5 "36f59d9314b45a266ba350584b4d7cc1">
+<!ENTITY man-db-md5 "5d65d66191080c144437a6c854e17868">
<!ENTITY man-db-home "http://www.nongnu.org/man-db/">
<!ENTITY man-db-ch6-du "27 MB">
<!ENTITY man-db-ch6-sbu "0.5 SBU">
-<!ENTITY man-pages-version "3.55">
-<!ENTITY man-pages-size "1,150 KB">
+<!ENTITY man-pages-version "3.57">
+<!ENTITY man-pages-size "1,168 KB">
<!ENTITY man-pages-url "http://www.kernel.org/pub/linux/docs/man-pages/man-pages-&man-pages-version;.tar.xz">
-<!ENTITY man-pages-md5 "443b13defb23df578aa11c6c768f2c7d">
+<!ENTITY man-pages-md5 "18bba89745fecdfddad3caaef7cde5f4">
<!ENTITY man-pages-home "http://www.kernel.org/doc/man-pages/">
<!ENTITY man-pages-ch6-du "23 MB">
<!ENTITY man-pages-ch6-sbu "less than 0.1 SBU">
-<!ENTITY mpc-version "1.0.1">
-<!ENTITY mpc-size "610 KB">
+<!ENTITY mpc-version "1.0.2">
+<!ENTITY mpc-size "619 KB">
<!ENTITY mpc-url "http://www.multiprecision.org/mpc/download/mpc-&mpc-version;.tar.gz">
-<!ENTITY mpc-md5 "b32a2e1a3daa392372fbd586d1ed3679">
+<!ENTITY mpc-md5 "68fadff3358fb3e7976c7a398a0af4c3">
<!ENTITY mpc-home "http://www.multiprecision.org/">
<!ENTITY mpc-ch5-du "5.6 MB">
<!ENTITY mpc-ch5-sbu "0.1 SBU">
@@ -489,10 +489,10 @@
<!ENTITY patch-ch6-du "3.4 MB">
<!ENTITY patch-ch6-sbu "less than 0.1 SBU">
-<!ENTITY perl-version "5.18.1">
-<!ENTITY perl-size "13,732 KB">
+<!ENTITY perl-version "5.18.2">
+<!ENTITY perl-size "13,730 KB">
<!ENTITY perl-url "http://www.cpan.org/src/5.0/perl-&perl-version;.tar.bz2">
-<!ENTITY perl-md5 "4ec1a3f3824674552e749ae420c5e68c">
+<!ENTITY perl-md5 "d549b16ee4e9210988da39193a9389c1">
<!ENTITY perl-home "http://www.perl.org/">
<!ENTITY perl-ch5-du "235 MB">
<!ENTITY perl-ch5-sbu "1.6 SBU">
@@ -594,11 +594,13 @@
<!ENTITY tzdata-ch6-du "6.4 MB">
<!ENTITY tzdata-ch6-sbu "less than 0.1 SBU">
-<!ENTITY util-linux-version "2.24">
-<!ENTITY util-linux-size "3,450 KB">
+<!ENTITY util-linux-version "2.24.1">
+<!ENTITY util-linux-size "3,461 KB">
<!ENTITY util-linux-url "&kernel;linux/utils/util-linux/v2.24/util-linux-&util-linux-version;.tar.xz">
-<!ENTITY util-linux-md5 "4fac6443427f575fc5f3531a4ad2ca01">
+<!ENTITY util-linux-md5 "88d46ae23ca599ac5af9cf96b531590f">
<!ENTITY util-linux-home "http://userweb.kernel.org/~kzak/util-linux/">
+<!ENTITY util-linux-ch5-du "89 MB">
+<!ENTITY util-linux-ch5-sbu "0.6 SBU">
<!ENTITY util-linux-ch6-du "89 MB">
<!ENTITY util-linux-ch6-sbu "0.6 SBU">