Changeset f32f537 for final-system

Timestamp:

Feb 21, 2006, 1:26:16 AM (18 years ago)

Author:

Jim Gifford <clfs@…>

Children:

4a9cdca

Parents:

360c931

Message:

r788@server (orig r786): jim | 2005-12-01 12:07:35 -0800

r851@server: jim | 2005-12-01 12:07:08 -0800
Text updates from G. Moko. Thank You

Location:

final-system

Files:

• common/bash.xml (modified) (1 diff)
• common/inetutils.xml (modified) (1 diff)
• common/readline.xml (modified) (1 diff)
• multilib/findutils.xml (modified) (1 diff)
• multilib/glibc-64bit.xml (modified) (1 diff)
• x86_64-64/grub.xml (modified) (1 diff)
• x86_64/grub.xml (modified) (1 diff)

final-system/common/bash.xml

@@ -47 +47 @@
 <screen os="d"><userinput>patch -Np1 -i ../&bash-fixes-patch;</userinput></screen>
 
-    <para os="e">Bash also has issues when compiled against newer versions of Glibc.
+    <para os="e">Bash also has an issue when compiled against newer versions of Glibc.
     The following patch resolves this problem:</para>
 

final-system/common/inetutils.xml

@@ -41 +41 @@
 <screen os="p2"><userinput>patch -Np1 -i ../&inetutils-man_pages-patch;</userinput></screen>
 
-    <para os="p3">The following patches addresses build issues with GCC 4.x:</para>
+    <para os="p3">This patch addresses build issues with GCC 4.x:</para>
 
 <screen os="p4"><userinput>patch -Np1 -i ../&inetutils-gcc4_fixes-patch;</userinput></screen>

final-system/common/readline.xml

@@ -66 +66 @@
 <screen os="i"><userinput>make install</userinput></screen>
 
-    <para os="j">Give Readline's dynamic libraries to a more appropriate
+    <para os="j">Give Readline's dynamic libraries more appropriate
     permissions:</para>
 

final-system/multilib/findutils.xml

@@ -29 +29 @@
     --libexecdir=/usr/lib64/locate --localstatedir=/var/lib64/locate</userinput></screen>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/findutils.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
+    <variablelist os="c">
+      <title>The meaning of the configure options:</title>
+
+      <varlistentry>
+        <term><parameter>--localstatedir</parameter></term>
+        <listitem>
+          <para>This option changes the location of the <command>locate</command>
+          database to be in <filename class="directory">/var/lib64/locate</filename>,
+          which is FHS-compliant.</para>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

final-system/multilib/glibc-64bit.xml

@@ -150 +150 @@
     class="directory">/usr/lib</filename> for dynamic libraries that are
     needed by programs as they are run. However, if there are libraries in
-    directories other than <filename class="directory">/lib</filename> and
-    <filename class="directory">/usr/lib</filename>, these need to be
+    directories other than <filename class="directory">/lib</filename>,
+    <filename class="directory">/lib64</filename>,
+    <filename class="directory">/usr/lib</filename>, and
+    <filename class="directory">/usr/lib64</filename>, these need to be
     added to the <filename>/etc/ld.so.conf</filename> file in order
     for the dynamic loader to find them. Some directories that are commonly

final-system/x86_64-64/grub.xml

@@ -64 +64 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/grub.xml"
+    href="../x86_64/grub.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/grub.xml"
+    href="../x86_64/grub.xml"
     xpointer="xpointer(//*[@os='j'])"/>
 

final-system/x86_64/grub.xml

@@ -51 +51 @@
 cp /usr/lib/grub/x86_64-pc/stage{1,2} /boot/grub</userinput></screen>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/grub.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
+    <para os="i">Replace <filename class="directory">x86_64-pc</filename> with whatever
+    directory is appropriate for the hardware in use.</para>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/grub.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
+    <para os="j">The <filename class="directory">x86_64-pc</filename> directory
+    contains a number of <filename>*stage1_5</filename> files, different
+    ones for different file systems. Review the files available and copy
+    the appropriate ones to the <filename
+    class="directory">/boot/grub</filename> directory. Most users will
+    copy the <filename>e2fs_stage1_5</filename> and/or
+    <filename>reiserfs_stage1_5</filename> files.</para>
 
   </sect2>