diff options
| -rw-r--r-- | chapter01/changelog.xml | 11 | ||||
| -rw-r--r-- | chapter05/generalinstructions.xml | 65 | ||||
| -rw-r--r-- | general.ent | 6 |
3 files changed, 53 insertions, 29 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 11987b2cf..4fe1edb1c 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -37,6 +37,17 @@ --> <listitem> + <para>2011-04-12</para> + <itemizedlist> + <listitem> + <para>[bdubbs] - Rewrote General Compilation Instructions using + better docbook structures and clarified a couple of points. Fixes + <ulink url="&lfs-ticket-root;2725">#2725</ulink>.</para> + </listitem> + </itemizedlist> + </listitem> + + <listitem> <para>2011-03-30</para> <itemizedlist> <listitem> diff --git a/chapter05/generalinstructions.xml b/chapter05/generalinstructions.xml index 79f29b709..58f32c45e 100644 --- a/chapter05/generalinstructions.xml +++ b/chapter05/generalinstructions.xml @@ -33,13 +33,6 @@ deprecated, but not invalid, use of the C or C++ syntax. C standards change fairly often, and some packages still use the older standard. This is not a problem, but does prompt the warning.</para> - - <important> - <para>After installing each package, delete its source and build - directories, unless specifically instructed otherwise. Deleting the - sources prevents mis-configuration when the same package is reinstalled - later.</para> - </important> </listitem> <listitem> @@ -63,28 +56,48 @@ </important> <important> - <para>Before issuing the build instructions for a package, the package - should be unpacked as user <systemitem class="username">lfs</systemitem>, - and a <command>cd</command> into the created directory should be - performed.</para> + <para>To re-emphasize the build process:</para> + + <orderedlist numeration="arabic" spacing="compact"> + <listitem> + <para>Place all the sources and patches in a directory that will be + accessible from the chroot environment such as + <filename class="directory">/mnt/lfs/sources/</filename>. Do + <emphasis>not</emphasis> put sources in + <filename class="directory">/mnt/lfs/tools/</filename>.</para> + </listitem> + <listitem> + <para>Change to the sources directory.</para> + </listitem> + <listitem> + <para>For each package:</para> + <orderedlist numeration="loweralpha" spacing="compact"> + <listitem> + <para>Using the <command>tar</command> program, extract the package + to be built. In Chapter 5, ensure you are the <emphasis>lfs</emphasis> + user when extracting the package.</para> + </listitem> + <listitem> + <para>Change to the directory created when the package was + extracted.</para> + </listitem> + <listitem> + <para>Follow the book's instructions for building the package.</para> + </listitem> + <listitem> + <para>Change back to the sources directory.</para> + </listitem> + <listitem> + <para>Delete the extracted source directory and any + <filename class="directory"><replaceable><package></replaceable>-build</filename> + directories that were created in the build process unless instructed otherwise.</para> + </listitem> + </orderedlist> + </listitem> + </orderedlist> </important> </listitem> </itemizedlist> - <para>To re-emphasize the build process:</para> - -<screen role="nodump"> -1. Place all the sources and patches in a directory that will be accessible - from the chroot environment such as /mnt/lfs/sources/. Do <emphasis>not</emphasis> put - sources in /mnt/lfs/tools/. -2. Change to the sources directory. -3. For each package: - a. Using the tar program, extract the package to be built. - b. Change to the directory created when the package was extracted. - c. Follow the book's instructions for building the package. - d. Change back to the sources directory. - e. Delete the extracted source directory and any <package>-build - directories that were created in the build process.</screen> - </sect1> diff --git a/general.ent b/general.ent index f78b8da30..6521ba8ac 100644 --- a/general.ent +++ b/general.ent @@ -1,7 +1,7 @@ -<!ENTITY version "SVN-20110330"> -<!ENTITY releasedate "March 30, 2011"> +<!ENTITY version "SVN-20110412"> +<!ENTITY releasedate "April 12, 2011"> <!ENTITY copyrightdate "1999-2011"><!-- jhalfs needs a literal dash, not – --> -<!ENTITY milestone "6.8"> +<!ENTITY milestone "6.9"> <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" --> <!ENTITY lfs-root "http://www.linuxfromscratch.org/"> |