From c6d52ce7e5688d9b38b960c46f458d86719d8a6a Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Tue, 22 Jan 2008 07:59:22 +0000
Subject: [PATCH] Fix up the migration to Util-linux-ng.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@8458 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter05/chapter05.xml                       |  2 +-
 chapter05/e2fsprogs.xml                       | 72 +++++++++++++++++++
 .../{util-linux.xml => util-linux-ng.xml}     |  2 +-
 chapter06/chapter06.xml                       |  2 +-
 .../{util-linux.xml => util-linux-ng.xml}     |  0
 5 files changed, 75 insertions(+), 3 deletions(-)
 create mode 100644 chapter05/e2fsprogs.xml
 rename chapter05/{util-linux.xml => util-linux-ng.xml} (98%)
 rename chapter06/{util-linux.xml => util-linux-ng.xml} (100%)

diff --git a/chapter05/chapter05.xml b/chapter05/chapter05.xml
index 7047df874..c2dc718ad 100644
--- a/chapter05/chapter05.xml
+++ b/chapter05/chapter05.xml
@@ -41,7 +41,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sed.xml"/>
   <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="util-linux.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="stripping.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="changingowner.xml"/>
 
diff --git a/chapter05/e2fsprogs.xml b/chapter05/e2fsprogs.xml
new file mode 100644
index 000000000..6023c756c
--- /dev/null
+++ b/chapter05/e2fsprogs.xml
@@ -0,0 +1,72 @@
+<?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-e2fsprogs" role="wrap">
+  <?dbhtml filename="e2fsprogs.html"?>
+
+  <sect1info condition="script">
+    <productname>e2fsprogs</productname>
+    <productnumber>&e2fsprogs-version;</productnumber>
+    <address>&e2fsprogs-url;</address>
+  </sect1info>
+
+  <title>E2fsprogs-&e2fsprogs-version;</title>
+
+  <indexterm zone="ch-tools-e2fsprogs">
+    <primary sortas="a-E2fsprogs">E2fsprogs</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../chapter06/e2fsprogs.xml"
+    xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
+
+    <segmentedlist>
+      <segtitle>&buildtime;</segtitle>
+      <segtitle>&diskspace;</segtitle>
+
+      <seglistitem>
+        <seg>&e2fsprogs-ch5-sbu;</seg>
+        <seg>&e2fsprogs-ch5-du;</seg>
+      </seglistitem>
+    </segmentedlist>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of E2fsprogs</title>
+
+    <para>The E2fsprogs documentation recommends that the package be built in
+    a subdirectory of the source tree: </para>
+
+<screen><userinput remap="pre">mkdir -v build
+cd build</userinput></screen>
+
+    <para>Prepare E2fsprogs for compilation:</para>
+
+<screen><userinput remap="configure">../configure --prefix=/tools</userinput></screen>
+
+    <para>Compile the package:</para>
+
+<screen><userinput remap="make">make</userinput></screen>
+
+    <para>Install the static libraries and headers required by Udev:</para>
+
+<screen><userinput remap="install">make install-libs</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Details on this package are located in
+    <xref linkend="contents-e2fsprogs" role="."/></para>
+  </sect2>
+
+</sect1>
diff --git a/chapter05/util-linux.xml b/chapter05/util-linux-ng.xml
similarity index 98%
rename from chapter05/util-linux.xml
rename to chapter05/util-linux-ng.xml
index 073d2a1c6..19a4b3770 100644
--- a/chapter05/util-linux.xml
+++ b/chapter05/util-linux-ng.xml
@@ -25,7 +25,7 @@
     <title/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../chapter06/util-linux.xml"
+    href="../chapter06/util-linux-ng.xml"
     xpointer="xpointer(/sect1/sect2[1]/para[1])"/>
 
     <segmentedlist>
diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index a0547a3e0..ecd970612 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -66,7 +66,7 @@
   <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.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/util-linux.xml b/chapter06/util-linux-ng.xml
similarity index 100%
rename from chapter06/util-linux.xml
rename to chapter06/util-linux-ng.xml