Browse Source

Slightly change the layout in part III, so that the preliminary material
appear separated. Minor rewrites for accounting for the new layout

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

Pierre Labastie 3 years ago
parent
commit
12fff1eb8d

+ 3 - 2
chapter05/binutils-pass1.xml

@@ -43,8 +43,9 @@
   <sect2 role="installation">
     <title>Installation of Cross Binutils</title>
 
-    <note><para>Go back and re-read the notes in the previous section.
-    Understanding the notes labeled important will save you a lot
+    <note><para>Go back and re-read the notes in the section titled <xref
+    linkend="ch-tools-generalinstructions"/>.
+    Understanding the notes labeled important can save you a lot
     of problems later.</para></note>
 
     <para>It is important that Binutils be the first package compiled

+ 0 - 2
chapter05/chapter05.xml

@@ -12,8 +12,6 @@
   <title>Compiling a Cross-Toolchain</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="toolchaintechnotes.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="generalinstructions.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="binutils-pass1.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gcc-pass1.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="linux-headers.xml"/>

+ 1 - 2
chapter05/introduction.xml

@@ -12,8 +12,7 @@
 
   <para>This chapter shows how to build a cross-compiler and its associated
   tools. Although here cross-compilation is faked, the principles are
-  the same as for a real cross-toolchain, and are detailed in the next
-  section.</para>
+  the same as for a real cross-toolchain.</para>
 
   <para>The programs compiled in this chapter will be installed under the
   <filename class="directory">$LFS/tools</filename> directory to keep them

+ 1 - 0
index.xml

@@ -28,6 +28,7 @@
 <part id="part3">
 <title>Building the LFS Cross Toolchain and Temporary Tools</title>
 <?dbhtml filename="part3.html"?>
+<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="part3intro/part3intro.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="chapter05/chapter05.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="chapter06/chapter06.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="chapter07/chapter07.xml"/>

+ 2 - 1
chapter05/generalinstructions.xml → part3intro/generalinstructions.xml

@@ -5,7 +5,8 @@
   %general-entities;
 ]>
 
-<sect1 id="ch-tools-generalinstructions">
+<sect1 id="ch-tools-generalinstructions"
+       xreflabel="General Compilation Instructions">
   <?dbhtml filename="generalinstructions.html"?>
 
   <title>General Compilation Instructions</title>

+ 34 - 0
part3intro/introduction.xml

@@ -0,0 +1,34 @@
+<?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-part3intro-intro">
+  <?dbhtml filename="introduction.html"?>
+
+  <title>Introduction</title>
+
+  <para>This part is divided into three stages: first building a cross
+  compiler and its associated libraries; second, use this cross toolchain
+  to build several utilities in a way that isolates them from the host
+  distribution; third, enter the chroot environment, which further improves
+  host isolation, and build the remaining tools needed to build the final
+  system.</para>
+
+  <important><para>With this part begins the real work of building a new
+  system. It requires much care in ensuring that the instructions are
+  followed exactly as the book shows them. You should try to understand
+  what they do, and whatever your eagerness to finish your build, you should
+  refrain from blindly type them as shown, but rather read documentation when
+  there is something you do not understand. Also, keep track of your typing
+  and of the output of commands, by sending them to a file, using the
+  <command>tee</command> utility. This allows for better diagnosing
+  if something gets wrong.</para></important>
+
+  <para>The next section gives a technical introduction to the build process,
+  while the following one contains <emphasis role="strong">very
+  important</emphasis> general instructions.</para>
+
+</sect1>

+ 18 - 0
part3intro/part3intro.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE chapter 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;
+]>
+
+<preface id="partintro-cross-temp">
+  <?dbhtml dir="partintro"?>
+  <?dbhtml filename="partintro.html"?>
+
+  <title>Important Preliminary Material</title>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="introduction.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="toolchaintechnotes.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="generalinstructions.xml"/>
+
+</preface>

+ 0 - 0
chapter05/toolchaintechnotes.xml → part3intro/toolchaintechnotes.xml


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

@@ -237,10 +237,14 @@ div.toc {
   padding-left: 1em;
 }
 
-li.preface, .part li.appendix {
+.book li.preface, .part li.appendix {
   margin-left: 1em;
 }
 
+.part li.preface {
+  margin-left: 0em;
+}
+
 div.toc h3 {
   margin: 1em 0 .3em 0;
 }