diff options
-rw-r--r-- | chapter05/binutils-pass1.xml | 5 | ||||
-rw-r--r-- | chapter05/chapter05.xml | 2 | ||||
-rw-r--r-- | chapter05/introduction.xml | 3 | ||||
-rw-r--r-- | index.xml | 1 | ||||
-rw-r--r-- | part3intro/generalinstructions.xml (renamed from chapter05/generalinstructions.xml) | 3 | ||||
-rw-r--r-- | part3intro/introduction.xml | 34 | ||||
-rw-r--r-- | part3intro/part3intro.xml | 18 | ||||
-rw-r--r-- | part3intro/toolchaintechnotes.xml (renamed from chapter05/toolchaintechnotes.xml) | 0 | ||||
-rw-r--r-- | stylesheets/lfs-xsl/lfs.css | 6 |
9 files changed, 64 insertions, 8 deletions
diff --git a/chapter05/binutils-pass1.xml b/chapter05/binutils-pass1.xml index 914e119b8..09a3a8afd 100644 --- a/chapter05/binutils-pass1.xml +++ b/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 diff --git a/chapter05/chapter05.xml b/chapter05/chapter05.xml index 1a2393b93..467a02a36 100644 --- a/chapter05/chapter05.xml +++ b/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"/> diff --git a/chapter05/introduction.xml b/chapter05/introduction.xml index 28b496993..0318acf8b 100644 --- a/chapter05/introduction.xml +++ b/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 @@ -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"/> diff --git a/chapter05/generalinstructions.xml b/part3intro/generalinstructions.xml index b0a5377e1..6f858969b 100644 --- a/chapter05/generalinstructions.xml +++ b/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> diff --git a/part3intro/introduction.xml b/part3intro/introduction.xml new file mode 100644 index 000000000..6d30ffe49 --- /dev/null +++ b/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> diff --git a/part3intro/part3intro.xml b/part3intro/part3intro.xml new file mode 100644 index 000000000..a4d8eecda --- /dev/null +++ b/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> diff --git a/chapter05/toolchaintechnotes.xml b/part3intro/toolchaintechnotes.xml index 1e7086aaf..1e7086aaf 100644 --- a/chapter05/toolchaintechnotes.xml +++ b/part3intro/toolchaintechnotes.xml diff --git a/stylesheets/lfs-xsl/lfs.css b/stylesheets/lfs-xsl/lfs.css index 1c6b1ca71..3608c157c 100644 --- a/stylesheets/lfs-xsl/lfs.css +++ b/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; } |