Browse Source

Merge r8682, r8683 and r8684 to jh branch

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/jh/BOOK@8685 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Jeremy Huntwork 17 years ago
parent
commit
3efd483db8
5 changed files with 33 additions and 6 deletions
  1. 15 0
      chapter01/changelog.xml
  2. 4 4
      chapter05/adjusting.xml
  3. 2 2
      general.ent
  4. 11 0
      prologue/hostreqs.xml
  5. 1 0
      stylesheets/lfs-xsl/lfs.css

+ 15 - 0
chapter01/changelog.xml

@@ -37,9 +37,24 @@
 
 
 -->
 -->
 
 
+    <listitem>
+      <para>2008-10-20</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jhuntwork] - GCC 4.3.2 uses a new directory for fixed includes. Fixed
+          the adjust toolchain scripts to point to the new location.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
     <listitem>
       <para>2008-10-19</para>
       <para>2008-10-19</para>
       <itemizedlist>
       <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Added a note to the Host System Requirements that the
+          Linux host must be a 32-bit system and that the book only supports 
+          a 32-bit build.</para>
+        </listitem>
         <listitem>
         <listitem>
           <para>[randy] - Updated the book to use 4.13a as the Texinfo version,
           <para>[randy] - Updated the book to use 4.13a as the Texinfo version,
           even though the tarball is exactly the same as the previous 4.13
           even though the tarball is exactly the same as the previous 4.13

+ 4 - 4
chapter05/adjusting.xml

@@ -64,10 +64,10 @@ ln -sv /tools/bin/ld /tools/$(gcc -dumpmachine)/bin/ld</userinput></screen>
   their length):</para>
   their length):</para>
 
 
 <!-- && used to ease copy and pasting -->
 <!-- && used to ease copy and pasting -->
-<screen><userinput>GCC_INCLUDEDIR=`dirname $(gcc -print-libgcc-file-name)`/include &amp;&amp;
-find ${GCC_INCLUDEDIR}/* -maxdepth 0 -xtype d -exec rm -rvf '{}' \; &amp;&amp;
-rm -vf `grep -l "DO NOT EDIT THIS FILE" ${GCC_INCLUDEDIR}/*` &amp;&amp;
-unset GCC_INCLUDEDIR</userinput></screen>
+<screen><userinput>GCC_FIXED=`dirname $(gcc -print-libgcc-file-name)`/include-fixed &amp;&amp;
+find ${GCC_FIXED}/* -maxdepth 0 -xtype d -exec rm -rvf '{}' \; &amp;&amp;
+rm -vf `grep -l "DO NOT EDIT THIS FILE" ${GCC_FIXED}/*` &amp;&amp;
+unset GCC_FIXED</userinput></screen>
 
 
   <caution>
   <caution>
     <para>At this point, it is imperative to stop and ensure that the basic
     <para>At this point, it is imperative to stop and ensure that the basic

+ 2 - 2
general.ent

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-JH-20081019">
-<!ENTITY releasedate "October 19, 2008">
+<!ENTITY version "SVN-JH-20081020">
+<!ENTITY releasedate "October 20, 2008">
 <!ENTITY copyrightdate "1999&ndash;2008">
 <!ENTITY copyrightdate "1999&ndash;2008">
 <!ENTITY milestone "7.0">
 <!ENTITY milestone "7.0">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->

+ 11 - 0
prologue/hostreqs.xml

@@ -99,6 +99,17 @@
       then you can compile a 2.6 kernel yourself. Instructions for compiling the
       then you can compile a 2.6 kernel yourself. Instructions for compiling the
       kernel and configuring the boot loader (assuming the host uses GRUB) are
       kernel and configuring the boot loader (assuming the host uses GRUB) are
       located in <xref linkend="chapter-bootable"/>.</para>
       located in <xref linkend="chapter-bootable"/>.</para>
+
+      <note>
+        <para>This version of the book builds a 32-bit Linux system and
+        requires an existing 32-bit version of of the kernel on the Intel/AMD
+        x86 architecture.  Adding capabilty for x86_64 systems is a major
+        objective of a future version of LFS.  Support for 64-bit systems and
+        additional architectures can be found in the Cross-Compiled Linux From
+        Scratch (CLFS) project at <ulink url="http://cross-lfs.org/view/svn/"/>.
+        </para>
+      </note>
+
     </listitem>
     </listitem>
 
 
     <listitem>
     <listitem>

+ 1 - 0
stylesheets/lfs-xsl/lfs.css

@@ -291,6 +291,7 @@ div.admon h3 {
 
 
 div.admon p {
 div.admon p {
   margin-left: .5em;
   margin-left: .5em;
+  padding-bottom: .4em;
 }
 }
 
 
 div.admon pre {
 div.admon pre {