Moved util-linux final build to be after udev.

Fixed up e2fsprogs and udev to use the Chapter 5 build of util-linux.

Changed umount instructions in Chapter 9 to be compatible with
changes in mounting /run as a tmpfs.



git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10448 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

8 files changed, 52 insertions, 30 deletions

diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml
index 6b39cfc7d..d591ae91d 100644
--- a/appendices/dependencies.xml
+++ b/appendices/dependencies.xml
@@ -2055,7 +2055,7 @@
 
         <seglistitem>
          <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep,
-         Kmod, Make, and Sed</seg>
+         Kmod, Make, Sed, and Util-linux</seg>
         </seglistitem>
       </segmentedlist>
 
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 8a2d666db..842d3d9ea 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,13 +39,25 @@
       <para>2014-01-15</para>
       <itemizedlist>
         <listitem>
-          <para>[bdubbs] - Added a Chapter 5 build of util-linux after
-          udev to satify a circular dependency.  This is not the 
-          complete fix as this build has not yet been incorporated into
-          Chapter 6.</para>
+          <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-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] - Moutn /run as a tmpfs for Chapter 6.</para>
+          <para>[bdubbs] - Mount /run as a tmpfs for Chapter 6.</para>
         </listitem>
       </itemizedlist>
     </listitem>
diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index b984f1a11..842b30a91 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -33,7 +33,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pkgconfig.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ncurses.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"/>
@@ -73,6 +72,7 @@
   <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="systemd.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="vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="aboutdebug.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="strippingagain.xml"/>
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/systemd.xml b/chapter06/systemd.xml
index ca1fa4b43..3af23cc38 100644
--- a/chapter06/systemd.xml
+++ b/chapter06/systemd.xml
@@ -53,7 +53,14 @@
 
 <screen><userinput remap="pre">tar -xvf ../&udev-lfs;.tar.bz2</userinput></screen>
 
-    <para>Compile the package:</para>
+    <para>Create two symbolic links to header files and set an
+    environment variable to properly use <xref linkend="ch-tools-util-linux"/>.</para>
+
+<screen><userinput remap="pre">ln -svf /tools/include/blkid /usr/include
+ln -svf /tools/include/uuid  /usr/include
+export LD_LIBRARY_PATH=/tools/lib</userinput></screen>
+
+    <para>Install the package:</para>
 
 <screen><userinput remap="make">make -f &udev-lfs;/Makefile.lfs</userinput></screen>
 
@@ -80,6 +87,12 @@
     following script to work.</para>
 
 <screen><userinput remap="install">bash &udev-lfs;/init-net-rules.sh</userinput></screen>
+
+    <para>Do some cleanup:</para>
+
+<screen><userinput remap="install">rm -fv /usr/include/{uuid,blkid}
+unset LD_LIBRARY_PATH</userinput></screen>
+
   </sect2>
 
   <sect2 id="contents-udev" role="content">
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 5c98a5afe..f1254b5f9 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version         "SVN-20140119">
-<!ENTITY releasedate     "January 19, 2014">
+<!ENTITY version         "SVN-20140121">
+<!ENTITY releasedate     "January 21, 2014">
 <!ENTITY copyrightdate   "1999-2014"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "7.5">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/packages.ent b/packages.ent
index 331b3e472..2df50fb4a 100644
--- a/packages.ent
+++ b/packages.ent
@@ -554,10 +554,10 @@
 <!ENTITY tzdata-ch6-du "6.4 MB">
 <!ENTITY tzdata-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY udev-lfs        "udev-lfs-&systemd-version;-1">
+<!ENTITY udev-lfs        "udev-lfs-&systemd-version;-2">
 <!ENTITY udev-lfs-size   "29 KB">
 <!ENTITY udev-lfs-url    "&anduin-other;&udev-lfs;.tar.bz2">
-<!ENTITY udev-lfs-md5    "67a5339e7ef1fa08f5db8315a5ea69e7">
+<!ENTITY udev-lfs-md5    "ed85205909de6e4f96ea2b0ebc57df7e">
 <!ENTITY udev-lfs-home   " ">
 
 <!ENTITY util-linux-version "2.24">