Update scripts to support BLFS bridge devices.

Cosmetic cleanups


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

3 files changed, 3 insertions, 284 deletions

diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml
index 226a1d9bd..1d0edba88 100644
--- a/chapter06/coreutils.xml
+++ b/chapter06/coreutils.xml
@@ -64,8 +64,9 @@ esac</userinput></screen>
 
     <para>Now prepare Coreutils for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr --libexecdir=/usr/lib \
---enable-no-install-program=kill,uptime</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr         \
+            --libexecdir=/usr/lib \
+            --enable-no-install-program=kill,uptime</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure options:</title>
diff --git a/chapter06/glib.xml b/chapter06/glib.xml
deleted file mode 100644
index 25689e915..000000000
--- a/chapter06/glib.xml
+++ /dev/null
@@ -1,173 +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-system-glib" role="wrap">
-  <?dbhtml filename="glib.html"?>
-
-  <sect1info condition="script">
-    <productname>glib</productname>
-    <productnumber>&glib-version;</productnumber>
-    <address>&glib-url;</address>
-  </sect1info>
-
-  <title>Glib-&glib-version;</title>
-
-  <indexterm zone="ch-system-glib">
-    <primary sortas="a-Glib">Glib</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The GLib package contains a low-level core library. This is useful
-    for providing data structure handling for C, portability wrappers and
-    interfaces for such runtime functionality as an event loop, threads,
-    dynamic loading, and an object system.</para>
-
-    <segmentedlist>
-      <segtitle>&buildtime;</segtitle>
-      <segtitle>&diskspace;</segtitle>
-
-      <seglistitem>
-        <seg>&glib-ch6-sbu;</seg>
-        <seg>&glib-ch6-du;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Glib</title>
-
-    <para>Prepare Glib for compilation:</para>
-
-<screen><userinput remap="configure">PCRE_LIBS="-L/usr/lib -lpcre" PCRE_CFLAGS="-I/usr/include" \
-./configure --prefix=/usr --sysconfdir=/etc --with-pcre=system</userinput></screen>
-
-    <variablelist>
-      <title>The meaning of the configure options:</title>
-
-      <varlistentry>
-        <term><parameter>--with-pcre=system</parameter></term>
-        <listitem>
-          <para>This parameter causes the build to use a system-provided
-          version of the PCRE library instead of an internal version.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-    <para>Compile the package:</para>
-
-<screen><userinput remap="make">make</userinput></screen>
-
-    <para>Due to dependencies on additional Perl modules and other packages not yet present
-    (e.g. desktop-file-utils and DBus), it is not possible to run Glib's test suite.</para>
-
-    <para>Install the package:</para>
-
-<screen><userinput remap="install">make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-glib" role="content">
-    <title>Contents of Glib</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed libraries</segtitle>
-      <segtitle>Installed directories</segtitle>
-
-      <seglistitem>
-        <seg>gio-querymodules, glib-genmarshal, glib-gettextize,
-        glib-mkenums, gobject-query, gtester and gtester-report</seg>
-        <seg>libgio-2.0.so, libglib-2.0.so, libgmodule-2.0.so,
-        libgobject-2.0.so, and libgthread-2.0.so</seg>
-        <seg>/usr/include/{gio-unix-2.0/gio,glib-2.0/{gio,glib,gobject}},
-             /usr/lib/{gio/modules,glib-2.0/include},
-             /usr/share/{gdb/auto-load,glib-2.0/{gdb, gettext/po},gtk-doc/html/{gio,glib,gobject}}</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gio-querymodules">
-        <term><command>gio-querymodules</command></term>
-        <listitem>
-          <para>is a C code marshaller generation utility for GLib
-          closures.</para>
-          <indexterm zone="ch-system-glib gio-querymodules">
-            <primary sortas="b-glib">gio-querymodules</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="glib-gettextize">
-        <term><command>glib-gettextize</command></term>
-        <listitem>
-          <para>is a variant of the gettext internationalization
-          utility.</para>
-          <indexterm zone="ch-system-glib glib-gettextize">
-            <primary sortas="b-glib-gettextize">glib-gettextize</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="glib-mkenums">
-        <term><command>glib-mkenums</command></term>
-        <listitem>
-          <para>is a C language enum description generation utility.</para>
-          <indexterm zone="ch-system-glib glib-mkenums">
-            <primary sortas="b-glib-mkenums">glib-mkenums</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gobject-query">
-        <term><command>gobject-query</command></term>
-        <listitem>
-          <para>Is a small utility that draws a tree of types.</para>
-          <indexterm zone="ch-system-glib gobject-query">
-            <primary sortas="b-gobject-query">gobject-query</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtester">
-        <term><command>gtester</command></term>
-        <listitem>
-          <para>Is a test running utility.</para>
-          <indexterm zone="ch-system-glib gtester">
-            <primary sortas="b-gtester">gtester</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtester-report">
-        <term><command>gtester-report</command></term>
-        <listitem>
-          <para>Is a test report formatting utility.</para>
-          <indexterm zone="ch-system-glib gtester-report">
-            <primary sortas="b-gtester-report">gtester-report</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="glib">
-        <term><filename class="libraryfile">Glib libraries</filename></term>
-        <listitem>
-          <para>contain a general purpose low-level core library.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
diff --git a/chapter06/pkg-config.xml b/chapter06/pkg-config.xml
deleted file mode 100644
index 13a98b396..000000000
--- a/chapter06/pkg-config.xml
+++ /dev/null
@@ -1,109 +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-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>
-
-    <note><para>Pkg-Config will use an included version of Popt to parse
-    command line options.  If an external version of Popt is desired, install
-    that version using the <ulink
-    url="&blfs-root;view/svn/general/popt.html">BLFS Popt build
-    instructions</ulink> before installing Pkg-config.</para></note>
-
-
-    <para>Fix a problem with one of Pkg-config's tests:</para>
-
-<screen><userinput remap="pre">sed -i -e '/!done/a\
-        longArg = NULL;' popt/popt.c</userinput></screen>
-
-    <para>Prepare Pkg-config for compilation:</para>
-
-<screen><userinput remap="configure">GLIB_LIBS="-L/usr/lib -lglib-2.0" \
-  GLIB_CFLAGS="-I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include" \
-  ./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>