From 12fff1eb8d1c5dcf9c4049d0d08f315d1103787a Mon Sep 17 00:00:00 2001 From: Pierre Labastie Date: Wed, 17 Jun 2020 20:50:25 +0000 Subject: [PATCH] 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 --- chapter05/binutils-pass1.xml | 5 +-- chapter05/chapter05.xml | 2 -- chapter05/introduction.xml | 3 +- index.xml | 1 + .../generalinstructions.xml | 3 +- part3intro/introduction.xml | 34 +++++++++++++++++++ part3intro/part3intro.xml | 18 ++++++++++ .../toolchaintechnotes.xml | 0 stylesheets/lfs-xsl/lfs.css | 6 +++- 9 files changed, 64 insertions(+), 8 deletions(-) rename {chapter05 => part3intro}/generalinstructions.xml (97%) create mode 100644 part3intro/introduction.xml create mode 100644 part3intro/part3intro.xml rename {chapter05 => part3intro}/toolchaintechnotes.xml (100%) 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 @@ Installation of Cross Binutils - Go back and re-read the notes in the previous section. - Understanding the notes labeled important will save you a lot + Go back and re-read the notes in the section titled . + Understanding the notes labeled important can save you a lot of problems later. 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 @@ Compiling a Cross-Toolchain - - 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 @@ 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. + the same as for a real cross-toolchain. The programs compiled in this chapter will be installed under the $LFS/tools directory to keep them diff --git a/index.xml b/index.xml index b78584d05..79f6535b7 100644 --- a/index.xml +++ b/index.xml @@ -28,6 +28,7 @@ Building the LFS Cross Toolchain and Temporary Tools + diff --git a/chapter05/generalinstructions.xml b/part3intro/generalinstructions.xml similarity index 97% rename from chapter05/generalinstructions.xml rename to part3intro/generalinstructions.xml index b0a5377e1..6f858969b 100644 --- a/chapter05/generalinstructions.xml +++ b/part3intro/generalinstructions.xml @@ -5,7 +5,8 @@ %general-entities; ]> - + General Compilation Instructions 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 @@ + + + %general-entities; +]> + + + + + Introduction + + 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. + + 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 + tee utility. This allows for better diagnosing + if something gets wrong. + + The next section gives a technical introduction to the build process, + while the following one contains very + important general instructions. + + 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 @@ + + + %general-entities; +]> + + + + + + Important Preliminary Material + + + + + + diff --git a/chapter05/toolchaintechnotes.xml b/part3intro/toolchaintechnotes.xml similarity index 100% rename from chapter05/toolchaintechnotes.xml rename to 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; }