r1828 - / trunk/BOOK trunk/BOOK/boot/64 trunk/BOOK/boot/common trunk/BOOK/boot/multilib trunk/BOOK/boot/ppc64 trunk/BOOK/partitioning/common

jim at linuxfromscratch.org jim at linuxfromscratch.org
Fri Jun 23 00:54:08 PDT 2006


Author: jim
Date: 2006-06-23 01:54:06 -0600 (Fri, 23 Jun 2006)
New Revision: 1828

Modified:
   /
   trunk/BOOK/boot/64/e2fsprogs.xml
   trunk/BOOK/boot/common/e2fsprogs.xml
   trunk/BOOK/boot/multilib/e2fsprogs.xml
   trunk/BOOK/boot/ppc64/e2fsprogs.xml
   trunk/BOOK/general.ent
   trunk/BOOK/partitioning/common/creatingfilesystem.xml
Log:
 r4083 at server (orig r1898):  chris at beaker67.com | 2006-06-22 22:27:23 -0700
 Text updates to boot/e2fsprogs instructions



Property changes on: 
___________________________________________________________________
Name: svk:merge
   - b6734a72-470d-0410-b049-f317dca95413:/:1897
   + b6734a72-470d-0410-b049-f317dca95413:/:1898

Modified: trunk/BOOK/boot/64/e2fsprogs.xml
===================================================================
--- trunk/BOOK/boot/64/e2fsprogs.xml	2006-06-23 03:55:01 UTC (rev 1827)
+++ trunk/BOOK/boot/64/e2fsprogs.xml	2006-06-23 07:54:06 UTC (rev 1828)
@@ -48,6 +48,10 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/e2fsprogs.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/e2fsprogs.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/boot/common/e2fsprogs.xml
===================================================================
--- trunk/BOOK/boot/common/e2fsprogs.xml	2006-06-23 03:55:01 UTC (rev 1827)
+++ trunk/BOOK/boot/common/e2fsprogs.xml	2006-06-23 07:54:06 UTC (rev 1828)
@@ -59,13 +59,23 @@
     href="../../final-system/common/e2fsprogs.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
-    <para os="i">The installation for e2fsprogs hard-codes a path to the 
-    <emphasis>mke2fs.conf</emphasis> file, causing the installation to fail
-    unless the DESTDIR parameter is used.  Install the binaries and
-    documentation with the following command:</para>
+    <para os="h">Install the binaries and documentation:</para>
 
-<screen os="j"><userinput>make DESTDIR=${LFS} install</userinput></screen>
+<screen os="i"><userinput>make DESTDIR=${LFS} install</userinput></screen>
 
+    <variablelist os="j">
+      <title>The meaning of the make option:</title>
+
+      <varlistentry>
+        <term><parameter>SHLIB_XLDFLAGS=-lncurses</parameter></term>
+        <listitem>
+          <para>The Makefile for e2fsprogs hard-codes a path to the 
+          <filename>mke2fs.conf</filename> file, causing the installation to
+          fail unless the DESTDIR parameter is used.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/e2fsprogs.xml"
     xpointer="xpointer(//*[@os='k'])"/>

Modified: trunk/BOOK/boot/multilib/e2fsprogs.xml
===================================================================
--- trunk/BOOK/boot/multilib/e2fsprogs.xml	2006-06-23 03:55:01 UTC (rev 1827)
+++ trunk/BOOK/boot/multilib/e2fsprogs.xml	2006-06-23 07:54:06 UTC (rev 1828)
@@ -57,6 +57,10 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/e2fsprogs.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/e2fsprogs.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/boot/ppc64/e2fsprogs.xml
===================================================================
--- trunk/BOOK/boot/ppc64/e2fsprogs.xml	2006-06-23 03:55:01 UTC (rev 1827)
+++ trunk/BOOK/boot/ppc64/e2fsprogs.xml	2006-06-23 07:54:06 UTC (rev 1828)
@@ -67,6 +67,10 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/e2fsprogs.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/e2fsprogs.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2006-06-23 03:55:01 UTC (rev 1827)
+++ trunk/BOOK/general.ent	2006-06-23 07:54:06 UTC (rev 1828)
@@ -4,7 +4,7 @@
 <!ENTITY minor-version "0">
 <!ENTITY extra-version "1">
 
-<!ENTITY version "SVN-&major-version;.&minor-version;.&extra-version;-20060622">
+<!ENTITY version "SVN-&major-version;.&minor-version;.&extra-version;-20060623">
 
 <!ENTITY version-x86 "&version;-x86">
 <!ENTITY version-x86_64 "&version;-x86_64-Multilib">
@@ -20,7 +20,7 @@
 <!ENTITY version-mips64-64 "&version;-MIPS64-Pure64">
 <!ENTITY version-alpha "&version;-ALPHA">
 
-<!ENTITY releasedate "June 22, 2006">
+<!ENTITY releasedate "June 23, 2006">
 <!ENTITY milestone "0.1">
 <!ENTITY generic-version "svn"> <!-- Use "svn", "testing", or "x.y[-pre{x}]" -->
 

Modified: trunk/BOOK/partitioning/common/creatingfilesystem.xml
===================================================================
--- trunk/BOOK/partitioning/common/creatingfilesystem.xml	2006-06-23 03:55:01 UTC (rev 1827)
+++ trunk/BOOK/partitioning/common/creatingfilesystem.xml	2006-06-23 07:54:06 UTC (rev 1828)
@@ -15,7 +15,7 @@
   extended file system (ext2), but with newer high-capacity hard disks,
   journaling file systems are becoming increasingly popular. We will create
   an <systemitem class="filesystem">ext2</systemitem> file system.
-  Build instructions for other file systems can be found at
+  Instructions for other file systems can be found at
   <ulink url="&blfs-root;view/svn/postlfs/filesystems.html"/>.</para>
 
   <para os="b">To create an <systemitem class="filesystem">ext2</systemitem> file




More information about the cross-lfs mailing list