Update to sed 4,2,1

Update to Linux 2.6.30.1
Correct GCC to use -fomit-frame-pointer
Add pkg-config
Remove --with-col from Man-DB
Move Util-Linux-NG to before E2fsprogs in Chapter 6
Update to e2fsprogs-1.41.7
Remove E2fsprogs in Chapter 5


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

6 files changed, 109 insertions, 52 deletions

diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index bc6158607..3b14b217c 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -28,12 +28,14 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="db.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sed.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="pkg-config.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ncurses.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="util-linux-ng.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="iana-etc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bison.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="procps.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="readline.xml"/>
@@ -67,7 +69,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="texinfo.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="util-linux-ng.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="aboutdebug.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="strippingagain.xml"/>
diff --git a/chapter06/e2fsprogs.xml b/chapter06/e2fsprogs.xml
index 4e2e39eea..64e79e560 100644
--- a/chapter06/e2fsprogs.xml
+++ b/chapter06/e2fsprogs.xml
@@ -58,7 +58,7 @@ cd build</userinput></screen>
     <para>Prepare E2fsprogs for compilation:</para>
 
 <screen><userinput remap="configure">../configure --prefix=/usr --with-root-prefix="" \
-    --enable-elf-shlibs</userinput></screen>
+    --enable-elf-shlibs --disable-libblkid --disable-libuuid</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure options:</title>
@@ -113,7 +113,7 @@ cd build</userinput></screen>
     <para>Make the installed static libraries writable so debugging symbols can 
     be removed later.</para>
 
-<screen><userinput remap="install">chmod -v u+w /usr/lib/{libblkid,libcom_err,libe2p,libext2fs,libss,libuuid}.a</userinput></screen>
+<screen><userinput remap="install">chmod -v u+w /usr/lib/{libcom_err,libe2p,libext2fs,libss}.a</userinput></screen>
 
     <para>This package installs a gzipped
     <filename class="extension">.info</filename> file but doesn't update the
@@ -131,11 +131,7 @@ install-info --dir-file=/usr/share/info/dir \
 <screen><userinput remap="install">makeinfo -o      doc/com_err.info ../lib/et/com_err.texinfo
 install -v -m644 doc/com_err.info /usr/share/info
 install-info --dir-file=/usr/share/info/dir \
-             /usr/share/info/com_err.info
-
-install -v -m644 -D ../doc/libblkid.txt \
-        /usr/share/doc/e2fsprogs-&e2fsprogs-version;/libblkid.txt</userinput></screen>
-
+             /usr/share/info/com_err.info</userinput></screen>
   </sect2>
 
   <sect2 id="contents-e2fsprogs" role="content">
@@ -151,8 +147,8 @@ install -v -m644 -D ../doc/libblkid.txt \
         fsck.ext2, fsck.ext3, fsck.ext4, fsck.ext4dev, logsave, lsattr,
         mk_cmds, mke2fs, mkfs.ext2, mkfs.ext3, mkfs.ext4, mkfs.ext4dev,
         mklost+found, resize2fs, tune2fs, uuidd, and uuidgen.</seg>
-        <seg>libblkid.{a,so}, libcom_err.{a,so}, libe2p.{a,so},
-        libext2fs.{a,so}, libss.{a,so}, and libuuid.{a,so}</seg>
+        <seg>libcom_err.{a,so}, libe2p.{a,so}, libext2fs.{a,so} and
+        libss.{a,so}</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -513,17 +509,6 @@ install -v -m644 -D ../doc/libblkid.txt \
         </listitem>
       </varlistentry>
 
-      <varlistentry id="libblkid">
-        <term><filename class="libraryfile">libblkid</filename></term>
-        <listitem>
-          <para>Contains routines for device identification and token
-          extraction</para>
-          <indexterm zone="ch-system-e2fsprogs libblkid">
-            <primary sortas="c-libblkid">libblkid</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="libcom_err">
         <term><filename class="libraryfile">libcom_err</filename></term>
         <listitem>
@@ -566,17 +551,6 @@ install -v -m644 -D ../doc/libblkid.txt \
         </listitem>
       </varlistentry>
 
-      <varlistentry id="libuuid">
-        <term><filename class="libraryfile">libuuid</filename></term>
-        <listitem>
-          <para>Contains routines for generating unique identifiers for objects
-          that may be accessible beyond the local system</para>
-          <indexterm zone="ch-system-e2fsprogs libuuid">
-            <primary sortas="c-libuuid">libuuid</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
     </variablelist>
 
   </sect2>
diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml
index ff2ea17f8..e2ef9bf29 100644
--- a/chapter06/gcc.xml
+++ b/chapter06/gcc.xml
@@ -54,7 +54,7 @@
     consistent compiler builds:</para> 
 
 <screen><userinput remap="pre">case `uname -m` in
-  i?86) sed -i 's/^XCFLAGS =$/&amp; -fomit-frame-pointer/' \
+  i?86) sed -i 's/^T_CFLAGS =$/&amp; -fomit-frame-pointer/' \
         gcc/Makefile.in ;;
 esac</userinput></screen>
 
diff --git a/chapter06/man-db.xml b/chapter06/man-db.xml
index da27532ad..2e2b1c0f6 100644
--- a/chapter06/man-db.xml
+++ b/chapter06/man-db.xml
@@ -51,8 +51,8 @@
 
 <screen><userinput remap="configure">./configure --prefix=/usr --libexecdir=/usr/lib \
     --sysconfdir=/etc --disable-setuid \
-    --with-browser=/usr/bin/lynx --with-col=/usr/bin/col \
-    --with-vgrind=/usr/bin/vgrind --with-grap=/usr/bin/grap</userinput></screen>
+    --with-browser=/usr/bin/lynx --with-vgrind=/usr/bin/vgrind \
+    --with-grap=/usr/bin/grap</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure options:</title>
@@ -68,9 +68,8 @@
       <varlistentry>
         <term><parameter>--with-...</parameter></term>
         <listitem>
-          <para>These four parameters are used to set some default programs.
-          The <command>col</command> program is a part of the Util-linux-ng
-          package, <command>lynx</command> is a text-based web browser (see
+          <para>These three parameters are used to set some default programs.
+          <command>lynx</command> is a text-based web browser (see
           BLFS for installation instructions), <command>vgrind</command>
           converts program sources to Groff input, and <command>grap</command>
           is useful for typesetting graphs in Groff documents. The
diff --git a/chapter06/module-init-tools.xml b/chapter06/module-init-tools.xml
index b19ac384f..20c4cb452 100644
--- a/chapter06/module-init-tools.xml
+++ b/chapter06/module-init-tools.xml
@@ -86,8 +86,7 @@ make clean</userinput></screen>
       <segtitle>Installed programs</segtitle>
 
       <seglistitem>
-        <seg>depmod, generate-modprobe.conf, insmod, insmod.static, lsmod,
-        modinfo, modprobe, and rmmod</seg>
+        <seg>depmod, insmod, insmod.static, lsmod, modinfo, modprobe, and rmmod</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -109,17 +108,6 @@ make clean</userinput></screen>
         </listitem>
       </varlistentry>
 
-      <varlistentry id="generate-modprobe.conf">
-        <term><command>generate-modprobe.conf</command></term>
-        <listitem>
-          <para>Creates a modprobe.conf file from an existing 2.2 or 2.4 module
-          setup</para>
-          <indexterm zone="ch-system-module-init-tools generate-modprobe.conf">
-            <primary sortas="b-generate-modprobe.conf">generate-modprobe.conf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="insmod">
         <term><command>insmod</command></term>
         <listitem>
diff --git a/chapter06/pkg-config.xml b/chapter06/pkg-config.xml
new file mode 100644
index 000000000..ceb9581cf
--- /dev/null
+++ b/chapter06/pkg-config.xml
@@ -0,0 +1,95 @@
+<?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-system-pkg-config" role="wrap">
+  <?dbhtml filename="pkg-config.html"?>
+
+  <sect1info condition="script">
+    <productname>pkg-config</productname>
+    <productnumber>&pkg-config-version;</productnumber>
+    <address>&pkg-config-url;</address>
+  </sect1info>
+
+  <title>Pkg-config-&pkg-config-version;</title>
+
+  <indexterm zone="ch-system-pkg-config">
+    <primary sortas="a-Pkg-config">Pkg-config</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
+
+    <para>The pkg-config package contains a tool for passing the include path
+    and/or library paths to build tools during the configure and make file
+    execution.</para>
+
+    <segmentedlist>
+      <segtitle>&buildtime;</segtitle>
+      <segtitle>&diskspace;</segtitle>
+
+      <seglistitem>
+        <seg>&pkg-config-ch6-sbu;</seg>
+        <seg>&pkg-config-ch6-du;</seg>
+      </seglistitem>
+    </segmentedlist>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Pkg-config</title>
+
+    <para>Prepare Pkg-config for compilation:</para>
+
+<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
+
+    <para>Compile the package:</para>
+
+<screen><userinput remap="make">make</userinput></screen>
+
+    <para>To test the results, issue:</para>
+
+<screen><userinput remap="test">make check</userinput></screen>
+
+    <para>Install the package:</para>
+
+<screen><userinput remap="install">make install</userinput></screen>
+
+  </sect2>
+
+
+  <sect2 id="contents-pkg-config" role="content">
+    <title>Contents of Pkg-config</title>
+
+    <segmentedlist>
+      <segtitle>Installed program</segtitle>
+
+      <seglistitem>
+        <seg>pkg-config</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="pkg-config">
+        <term><command>pkg-config</command></term>
+        <listitem>
+          <para>Returns meta information for the specified library or
+          package.</para>
+          <indexterm zone="ch-system-pkg-config pkg-config">
+            <primary sortas="b-pkg-config">pkg-config</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>