From 053b2060bbedf5187f62affe9ed61961940e46fa Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Tue, 21 Jan 2014 18:49:14 +0000
Subject: 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
---
 chapter06/chapter06.xml |  2 +-
 chapter06/e2fsprogs.xml | 23 ++++++++++++++---------
 chapter06/systemd.xml   | 15 ++++++++++++++-
 3 files changed, 29 insertions(+), 11 deletions(-)

(limited to 'chapter06')

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">
-- 
cgit v1.2.3-54-g00ecf