diff options
| -rw-r--r-- | appendices/dependencies.xml | 8 | ||||
| -rw-r--r-- | chapter07/libstdc++-pass2.xml | 2 | ||||
| -rw-r--r-- | chapter07/stripping.xml | 51 | ||||
| -rw-r--r-- | chapter07/util-linux.xml | 2 | ||||
| -rw-r--r-- | general.ent | 8 | ||||
| -rw-r--r-- | prologue/organization.xml | 2 | ||||
| -rw-r--r-- | prologue/why.xml | 8 |
7 files changed, 46 insertions, 35 deletions
diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml index 6db31fe4e..d93438fce 100644 --- a/appendices/dependencies.xml +++ b/appendices/dependencies.xml @@ -828,8 +828,8 @@ </seglistitem> </segmentedlist> -<!-- Begin Gcc dependency info --> - <bridgehead renderas="sect2" id="gcc-dep">Gcc</bridgehead> +<!-- Begin GCC dependency info --> + <bridgehead renderas="sect2" id="gcc-dep">GCC</bridgehead> <segmentedlist> <segtitle>&dependencies;</segtitle> @@ -1948,7 +1948,7 @@ <segtitle>&dependencies;</segtitle> <seglistitem> - <seg>Binutils, Coreutils, Gcc, and Python</seg> + <seg>Binutils, Coreutils, GCC, and Python</seg> </seglistitem> </segmentedlist> @@ -1983,7 +1983,7 @@ <segtitle>&dependencies;</segtitle> <seglistitem> - <seg>Binutils, Coreutils, Gcc, Make, and Perl</seg> + <seg>Binutils, Coreutils, GCC, Make, and Perl</seg> </seglistitem> </segmentedlist> diff --git a/chapter07/libstdc++-pass2.xml b/chapter07/libstdc++-pass2.xml index a98bfb282..903400bda 100644 --- a/chapter07/libstdc++-pass2.xml +++ b/chapter07/libstdc++-pass2.xml @@ -28,7 +28,7 @@ the installation of the C++ standard library because no suitable compiler was available to compile it. We could not use the compiler built in that section because it is a native compiler and should not be used outside of - chroot and risk polluting the libraries with some host components.</para> + chroot and risks polluting the libraries with some host components.</para> <segmentedlist> <segtitle>&buildtime;</segtitle> diff --git a/chapter07/stripping.xml b/chapter07/stripping.xml index 2f62fd5f2..1b846f195 100644 --- a/chapter07/stripping.xml +++ b/chapter07/stripping.xml @@ -19,12 +19,12 @@ <para> The following steps are performed from outside the chroot environment. That means, you have to leave the chroot environment - first before continuing. The reason for that is to + first before continuing. The reason for that is to: <itemizedlist> <listitem> <para> - make sure that objects are not in use while they gets - manipulated. + make sure that objects are not in use while they are + manipulated. </para> </listitem> <listitem> @@ -44,10 +44,6 @@ systems: </para> -<screen role="nodump"><userinput>exit -umount $LFS/dev{/pts,} -umount $LFS/{sys,proc,run}</userinput></screen> - <note> <para>All of the following instructions are executed by <systemitem class="username">root</systemitem>. Take extra @@ -63,12 +59,16 @@ umount $LFS/{sys,proc,run}</userinput></screen> </para> </note> +<screen role="nodump"><userinput>exit +umount $LFS/dev{/pts,} +umount $LFS/{sys,proc,run}</userinput></screen> + <sect2> <title>Stripping</title> - <para>If the LFS partition is rather small, it is beneficial to - learn that unnecessary items can be removed. The executables and - libraries built so far contain about 94 MB of unneeded debugging + <para>If the LFS partition is rather small, it is good to + know that unnecessary items can be removed. The executables and + libraries built so far contain a little over 90 MB of unneeded debugging symbols.</para> <para>Strip off debugging symbols from binaries:</para> @@ -87,7 +87,7 @@ strip --strip-unneeded $LFS/tools/bin/*</userinput></screen> ones would be destroyed and the toolchain packages would need to be built all over again.</para> - <para>To save more space (about 37 MB), remove the documentation:</para> + <para>To save more space (slightly more than 35 MB), remove the documentation:</para> <screen role="nodump"><userinput>rm -rf $LFS/usr/share/{info,man,doc}</userinput></screen> @@ -99,10 +99,10 @@ strip --strip-unneeded $LFS/tools/bin/*</userinput></screen> <screen role="nodump"><userinput>find $LFS/usr/{lib,libexec} -name \*.la -delete</userinput></screen> <para>At this point, you should have at least 5 GB of free space on the - chroot partition that can be used to build and install Glibc and Gcc in + chroot partition that can be used to build and install Glibc and GCC in the next phase. If you can build and install Glibc, you can build and install the rest too. You can check the free disk space with the command - <command>df -h $LFS/</command>.</para> + <command>df -h $LFS</command>.</para> </sect2> @@ -129,13 +129,19 @@ strip --strip-unneeded $LFS/tools/bin/*</userinput></screen> <para> Create the backup archive by running the following command: </para> -<screen role="nodump"><userinput>cd $LFS && -tar -cJpf $HOME/temp-tools.tar.xz . + +<screen role="nodump" revision="sysv"><userinput>cd $LFS && +tar -cJpf $HOME/lfs-temp-tools-&version;.tar.xz . +</userinput></screen> + +<screen role="nodump" revision="systemd"><userinput>cd $LFS && +tar -cJpf $HOME/lfs-temp-tools-&versiond;.tar.xz . </userinput></screen> + <para> Replace <envar>$HOME</envar> by a directory of your choice if you - do not want to have the backup stored in <systemitem class="username">root</systemitem>'s - home directory. + do not want to have the backup stored in <systemitem + class="username">root</systemitem>'s home directory. </para> <para> @@ -143,14 +149,19 @@ tar -cJpf $HOME/temp-tools.tar.xz . use this backup to restore the temporary tools and save some recovery time. Since the sources are located under <filename class="directory">$LFS</filename>, they are included in the - backup archive as well, so you need not to download them again. After + backup archive as well, so they do not need to be downloaded again. After checking that <filename class="directory">$LFS</filename> is set properly, restore the backup by executing the following commands: </para> -<screen role="nodump"><userinput>cd $LFS && +<screen role="nodump" revision="sysv"><userinput>cd $LFS && +rm -rf ./* && +tar -xpf $HOME/lfs-temp-tools-&version;.tar.xz +</userinput></screen> + +<screen role="nodump" revision="systemd"><userinput>cd $LFS && rm -rf ./* && -tar -xpf $HOME/temp-tools.tar.xz +tar -xpf $HOME/lfs-temp-tools-&versiond;.tar.xz </userinput></screen> <para> diff --git a/chapter07/util-linux.xml b/chapter07/util-linux.xml index 05698ae66..33dc8862d 100644 --- a/chapter07/util-linux.xml +++ b/chapter07/util-linux.xml @@ -69,7 +69,7 @@ <listitem> <para>This sets the location of the file recording information about the hardware clock in accordance to the FHS. This is not stricly - needed for his temporary tool, but it prevents creating a file + needed for this temporary tool, but it prevents creating a file at another location, which would not be overwritten or removed when building the final util-linux package.</para> </listitem> diff --git a/general.ent b/general.ent index 45ccf845f..397b14095 100644 --- a/general.ent +++ b/general.ent @@ -1,13 +1,13 @@ -<!ENTITY version "20200610-cross2"> +<!ENTITY version "20200611-cross2"> <!ENTITY short-version "svn"> <!-- Used below in &blfs-book; Change to x.y for release but not -rc releases --> <!ENTITY generic-version "cross-chap5"> <!-- Use "development" or "x.y[-pre{x}]" --> -<!ENTITY versiond "20200610-cross2-systemd"> +<!ENTITY versiond "20200611-cross2-systemd"> <!ENTITY short-versiond "systemd"> -<!ENTITY generic-versiond "20200610-cross2-systemd"> +<!ENTITY generic-versiond "20200611-cross2-systemd"> -<!ENTITY releasedate "June 10th, 2020"> +<!ENTITY releasedate "June 11th, 2020"> <!ENTITY copyrightdate "1999-2020"><!-- jhalfs needs a literal dash, not – --> diff --git a/prologue/organization.xml b/prologue/organization.xml index 814bc6025..c2c82b63c 100644 --- a/prologue/organization.xml +++ b/prologue/organization.xml @@ -32,7 +32,7 @@ <title>Part III - Building the LFS Cross Toolchain and Temporary Tools</title> <para>Part III provides instructions for building the tools - needed for construction the final LFS system.</para> + needed for constructing the final LFS system.</para> </sect2> <sect2> diff --git a/prologue/why.xml b/prologue/why.xml index ca100e1f9..e2b9a55a1 100644 --- a/prologue/why.xml +++ b/prologue/why.xml @@ -194,7 +194,7 @@ </listitem> <listitem> - <para>Gcc</para> + <para>GCC</para> <para>This package is the Gnu Compiler Collection. It contains the C and C++ compilers as well as several others not built by LFS. @@ -226,7 +226,7 @@ <para>GMP</para> <para>This package contains math libraries that provide useful functions - for arbitrary precision arithmetic. It is required to build Gcc.</para> + for arbitrary precision arithmetic. It is required to build GCC.</para> </listitem> <listitem> @@ -416,14 +416,14 @@ <para>MPC</para> <para>This package contains functions for the arithmetic of complex - numbers. It is required by Gcc.</para> + numbers. It is required by GCC.</para> </listitem> <listitem> <para>MPFR</para> <para>This package contains functions for multiple precision - arithmetic. It is required by Gcc.</para> + arithmetic. It is required by GCC.</para> </listitem> <listitem> |