From fcc027677da55c41dcaea045f5b9ff8b088e6495 Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Sun, 7 Jun 2020 20:16:00 +0000 Subject: Initial commit of alternative cross LFS git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/cross2@11897 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- chapter06/gcc-pass2.xml | 160 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 160 insertions(+) create mode 100644 chapter06/gcc-pass2.xml (limited to 'chapter06/gcc-pass2.xml') diff --git a/chapter06/gcc-pass2.xml b/chapter06/gcc-pass2.xml new file mode 100644 index 000000000..7f7d7a021 --- /dev/null +++ b/chapter06/gcc-pass2.xml @@ -0,0 +1,160 @@ + + + %general-entities; +]> + + + + + + gcc-pass2 + &gcc-version; +
&gcc-url;
+ + + GCC-&gcc-version; - Pass 2 + + + GCC + tools, pass 2 + + + + + + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" + href="../chapter08/gcc.xml" + xpointer="xpointer(/sect1/sect2[1]/para[1])"/> + + <segmentedlist> + <segtitle>&buildtime;</segtitle> + <segtitle>&diskspace;</segtitle> + + <seglistitem> + <seg>&gcc-ch5p2-sbu;</seg> + <seg>&gcc-ch5p2-du;</seg> + </seglistitem> + </segmentedlist> + + </sect2> + + <sect2 role="installation"> + <title>Installation of GCC + + As in the first build of GCC, the GMP, MPFR, and MPC packages are + required. Unpack the tarballs and move them into the required directory + names: + +tar -xf ../mpfr-&mpfr-version;.tar.xz +mv -v mpfr-&mpfr-version; mpfr +tar -xf ../gmp-&gmp-version;.tar.xz +mv -v gmp-&gmp-version; gmp +tar -xf ../mpc-&mpc-version;.tar.gz +mv -v mpc-&mpc-version; mpc + + If building on x86_64, change the default directory name for 64-bit + libraries to lib: + +case $(uname -m) in + x86_64) + sed -e '/m64=/s/lib64/lib/' \ + -i.orig gcc/config/i386/t-linux64 + ;; +esac + + Fix an issue with GCC-10.1 when building with a cross + compiler: + +patch -Np1 -i ../&gcc-cross-patch; + + Create a separate build directory again: + +mkdir -v build +cd build + + Create a symlink that allos libgcc to be built with posix threads + support: + +mkdir -pv $LFS_TGT/libgcc +ln -s ../../../libgcc/gthr-posix.h $LFS_TGT/libgcc/gthr-default.h + + Before starting to build GCC, remember to unset any environment + variables that override the default optimization flags. + + Now prepare GCC for compilation: + +../configure \ + --build=$(../config.guess) \ + --host=$LFS_TGT \ + --prefix=/usr \ + CC_FOR_TARGET=$LFS_TGT-gcc \ + --with-build-sysroot=$LFS \ + --enable-initfini-array \ + --disable-nls \ + --disable-multilib \ + --disable-decimal-float \ + --disable-libatomic \ + --disable-libgomp \ + --disable-libquadmath \ + --disable-libssp \ + --disable-libvtv \ + --disable-libstdcxx \ + --enable-languages=c,c++ + + + The meaning of the new configure options: + + + -with-build-sysroot=$LFS + + Normally, using --host= ensures that + a cross-compiler is used for building gcc, and that compiler knows + that it has to look for headers and libraries in $LFS. But the build system of GCC uses + other tools, which are not aware of this location. This switch is + needed to have them find the needed files in $LFS, and not on the host. + + + + + --enable-initfini-array + + This option is automatically enabled when building a native + compiler with a native compiler on x86. But here, we build with + a cross compiler, so we need to explicitely set this option. + + + + + + Compile the package: + +make + + Install the package: + +make DESTDIR=$LFS install + + As a finishing touch, create a symlink. Many programs and scripts + run cc instead of gcc, which is + used to keep programs generic and therefore usable on all kinds of UNIX + systems where the GNU C compiler is not always installed. Running + cc leaves the system administrator free to decide + which C compiler to install: + +ln -sv gcc $LFS/usr/bin/cc + + + + + + + <para>Details on this package are located in + <xref linkend="contents-gcc" role="."/></para> + + </sect2> + +</sect1> -- cgit v1.2.3-54-g00ecf From bc8cca581fed74c60e201a89acb38cb2344c9b1b Mon Sep 17 00:00:00 2001 From: Bruce Dubbs <bdubbs@linuxfromscratch.org> Date: Wed, 10 Jun 2020 20:44:16 +0000 Subject: Text updates to cross2 branch Chapter 6 git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/cross2@11917 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- chapter06/bash.xml | 2 +- chapter06/coreutils.xml | 12 ++++++------ chapter06/file.xml | 3 +-- chapter06/gcc-pass2.xml | 9 ++++----- chapter06/introduction.xml | 6 +++--- chapter06/ncurses.xml | 10 +++++----- chapter06/tar.xml | 3 +-- chapter06/xz.xml | 7 +++---- chapter08/findutils.xml | 2 +- chapter08/grep.xml | 2 +- chapter08/make.xml | 4 +++- chapter08/tar.xml | 5 ++++- general.ent | 8 ++++---- 13 files changed, 37 insertions(+), 36 deletions(-) (limited to 'chapter06/gcc-pass2.xml') diff --git a/chapter06/bash.xml b/chapter06/bash.xml index 92627e92c..bc0b211af 100644 --- a/chapter06/bash.xml +++ b/chapter06/bash.xml @@ -74,7 +74,7 @@ <screen><userinput remap="install">make DESTDIR=$LFS install</userinput></screen> - <para>Move the excutable to where it is expected to be:</para> + <para>Move the excutable to where it is expected:</para> <screen><userinput remap="install">mv $LFS/usr/bin/bash $LFS/bin/bash</userinput></screen> diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml index 378abebff..3ae765e85 100644 --- a/chapter06/coreutils.xml +++ b/chapter06/coreutils.xml @@ -84,13 +84,13 @@ programs harcode executable locations:</para> <screen><userinput remap="install">mv -v $LFS/usr/bin/{cat,chgrp,chmod,chown,cp,date,dd,df,echo} $LFS/bin -mv -v $LFS/usr/bin/{false,ln,ls,mkdir,mknod,mv,pwd,rm} $LFS/bin -mv -v $LFS/usr/bin/{rmdir,stty,sync,true,uname} $LFS/bin -mv -v $LFS/usr/bin/chroot $LFS/usr/sbin +mv -v $LFS/usr/bin/{false,ln,ls,mkdir,mknod,mv,pwd,rm} $LFS/bin +mv -v $LFS/usr/bin/{rmdir,stty,sync,true,uname} $LFS/bin +mv -v $LFS/usr/bin/{head,nice,sleep,touch} $LFS/bin +mv -v $LFS/usr/bin/chroot $LFS/usr/sbin mkdir -pv $LFS/usr/share/man/man8 -mv -v $LFS/usr/share/man/man1/chroot.1 $LFS/usr/share/man/man8/chroot.8 -sed -i s/\"1\"/\"8\"/1 $LFS/usr/share/man/man8/chroot.8 -mv -v $LFS/usr/bin/{head,nice,sleep,touch} $LFS/bin</userinput></screen> +mv -v $LFS/usr/share/man/man1/chroot.1 $LFS/usr/share/man/man8/chroot.8 +sed -i 's/"1"/"8"/' $LFS/usr/share/man/man8/chroot.8</userinput></screen> </sect2> diff --git a/chapter06/file.xml b/chapter06/file.xml index 83a473b70..a13553b19 100644 --- a/chapter06/file.xml +++ b/chapter06/file.xml @@ -45,8 +45,7 @@ <para>Prepare File for compilation:</para> -<screen><userinput remap="configure">./configure --prefix=/usr \ - --host=$LFS_TGT</userinput></screen> +<screen><userinput remap="configure">./configure --prefix=/usr --host=$LFS_TGT</userinput></screen> <!-- devs: if using - -build here, the build system wants to compile the signature file with "file" on the build system, but stops if it is not diff --git a/chapter06/gcc-pass2.xml b/chapter06/gcc-pass2.xml index 7f7d7a021..a5b7f1a26 100644 --- a/chapter06/gcc-pass2.xml +++ b/chapter06/gcc-pass2.xml @@ -59,8 +59,7 @@ mv -v mpc-&mpc-version; mpc</userinput></screen> <screen><userinput remap="pre">case $(uname -m) in x86_64) - sed -e '/m64=/s/lib64/lib/' \ - -i.orig gcc/config/i386/t-linux64 + sed -e '/m64=/s/lib64/lib/' -i.orig gcc/config/i386/t-linux64 ;; esac</userinput></screen> @@ -74,7 +73,7 @@ esac</userinput></screen> <screen><userinput remap="pre">mkdir -v build cd build</userinput></screen> - <para>Create a symlink that allos libgcc to be built with posix threads + <para>Create a symlink that allows libgcc to be built with posix threads support:</para> <screen><userinput remap="pre">mkdir -pv $LFS_TGT/libgcc @@ -109,7 +108,7 @@ ln -s ../../../libgcc/gthr-posix.h $LFS_TGT/libgcc/gthr-default.h</userinput></s <varlistentry> <term><parameter>-with-build-sysroot=$LFS</parameter></term> <listitem> - <para>Normally, using <parameter>--host=</parameter> ensures that + <para>Normally, using <parameter>--host</parameter> ensures that a cross-compiler is used for building gcc, and that compiler knows that it has to look for headers and libraries in <filename class="directory">$LFS</filename>. But the build system of GCC uses @@ -138,7 +137,7 @@ ln -s ../../../libgcc/gthr-posix.h $LFS_TGT/libgcc/gthr-default.h</userinput></s <screen><userinput remap="install">make DESTDIR=$LFS install</userinput></screen> - <para>As a finishing touch, create a symlink. Many programs and scripts + <para>As a finishing touch, create a utility symlink. Many programs and scripts run <command>cc</command> instead of <command>gcc</command>, which is used to keep programs generic and therefore usable on all kinds of UNIX systems where the GNU C compiler is not always installed. Running diff --git a/chapter06/introduction.xml b/chapter06/introduction.xml index cfc8befc5..ed8000fa8 100644 --- a/chapter06/introduction.xml +++ b/chapter06/introduction.xml @@ -13,13 +13,13 @@ <para>This chapter shows how to cross-compile basic utilities using the just built cross-toolchain. Those utilities are installed into their final location, but cannot be used yet. Basic tasks still rely on - the hosts tools. Nevertheless, the installed libraries are used when + the host's tools. Nevertheless, the installed libraries are used when linking.</para> <para>Using the utilities will be possible in next chapter after entering the <quote>chroot</quote> environment. But all the packages built in the - present chapter need themselves to be built. So we cannot be independent - on the build system yet.</para> + present chapter need to be built before we do that. Therefore we cannot be + independent of the host system yet.</para> <para>Once again, let us recall that improper setting of <envar>LFS</envar> together with building as root, may render your computer unusable. diff --git a/chapter06/ncurses.xml b/chapter06/ncurses.xml index 93cf85263..d96d7d0f3 100644 --- a/chapter06/ncurses.xml +++ b/chapter06/ncurses.xml @@ -51,11 +51,11 @@ program on the build host:</para> <screen><userinput remap="pre">mkdir build -cd build -../configure -make -C include -make -C progs tic -cd ..</userinput></screen> +pushd build + ../configure + make -C include + make -C progs tic +popd</userinput></screen> <para>Prepare Ncurses for compilation:</para> diff --git a/chapter06/tar.xml b/chapter06/tar.xml index ff2008e28..e64379fc5 100644 --- a/chapter06/tar.xml +++ b/chapter06/tar.xml @@ -63,8 +63,7 @@ <sect2 role="content"> <title/> - <para>Details on this package are located in - <xref linkend="contents-tar" role="."/></para> + <para>Details on this package are located in <xref linkend="contents-tar" role="."/></para> </sect2> diff --git a/chapter06/xz.xml b/chapter06/xz.xml index 9e2d0da4b..428053ed1 100644 --- a/chapter06/xz.xml +++ b/chapter06/xz.xml @@ -61,16 +61,15 @@ <para>Make sure that all essential files are in the correct directory:</para> -<screen><userinput remap="install">mv -v $LFS/usr/bin/{lzma,unlzma,lzcat,xz,unxz,xzcat} $LFS/bin -mv -v $LFS/usr/lib/liblzma.so.* $LFS/lib +<screen><userinput remap="install">mv -v $LFS/usr/bin/{lzma,unlzma,lzcat,xz,unxz,xzcat} $LFS/bin +mv -v $LFS/usr/lib/liblzma.so.* $LFS/lib ln -svf ../../lib/$(readlink $LFS/usr/lib/liblzma.so) $LFS/usr/lib/liblzma.so</userinput></screen> </sect2> <sect2 role="content"> <title/> - <para>Details on this package are located in<!-- TODO - <xref linkend="contents-xz" role="."/> --></para> + <para>Details on this package are located in <xref linkend="contents-xz" role="."/></para> </sect2> diff --git a/chapter08/findutils.xml b/chapter08/findutils.xml index 37393f0de..19989ecaa 100644 --- a/chapter08/findutils.xml +++ b/chapter08/findutils.xml @@ -26,7 +26,7 @@ <para>The Findutils package contains programs to find files. These programs are provided to recursively search through a directory tree and to create, maintain, and search a database (often faster than the recursive - find, but unreliable if the database has not been recently updated).</para> + find, but is unreliable if the database has not been recently updated).</para> <segmentedlist> <segtitle>&buildtime;</segtitle> diff --git a/chapter08/grep.xml b/chapter08/grep.xml index 58b0db366..c911d9e06 100644 --- a/chapter08/grep.xml +++ b/chapter08/grep.xml @@ -23,7 +23,7 @@ <sect2 role="package"> <title/> - <para>The Grep package contains programs for searching through files.</para> + <para>The Grep package contains programs for searching through teh contents of files.</para> <segmentedlist> <segtitle>&buildtime;</segtitle> diff --git a/chapter08/make.xml b/chapter08/make.xml index 9c649cdc5..b996469c3 100644 --- a/chapter08/make.xml +++ b/chapter08/make.xml @@ -23,7 +23,9 @@ <sect2 role="package"> <title/> - <para>The Make package contains a program for compiling packages.</para> + <para>The Make package contains a program for controlling the generation of + executables and other non-source files of a program from the program's + source files. .</para> <segmentedlist> <segtitle>&buildtime;</segtitle> diff --git a/chapter08/tar.xml b/chapter08/tar.xml index d148c4695..56883628c 100644 --- a/chapter08/tar.xml +++ b/chapter08/tar.xml @@ -23,7 +23,10 @@ <sect2 role="package"> <title/> - <para>The Tar package contains an archiving program.</para> + <para>The Tar package provides the ability to create tar archives, as well + as various other kinds of manipulation. Tar can be used on + previously created archives to extract files, to store additional files, or + to update or list files which were already stored. </para> <segmentedlist> <segtitle>&buildtime;</segtitle> diff --git a/general.ent b/general.ent index 4a52f3b41..45ccf845f 100644 --- a/general.ent +++ b/general.ent @@ -1,13 +1,13 @@ -<!ENTITY version "20200608-cross2"> +<!ENTITY version "20200610-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 "20200608-cross2-systemd"> +<!ENTITY versiond "20200610-cross2-systemd"> <!ENTITY short-versiond "systemd"> -<!ENTITY generic-versiond "20200608-cross2-systemd"> +<!ENTITY generic-versiond "20200610-cross2-systemd"> -<!ENTITY releasedate "June 8th, 2020"> +<!ENTITY releasedate "June 10th, 2020"> <!ENTITY copyrightdate "1999-2020"><!-- jhalfs needs a literal dash, not – --> -- cgit v1.2.3-54-g00ecf From fb386e05f17d44dc6322a1b3db172cc297ed5ce5 Mon Sep 17 00:00:00 2001 From: Thomas Trepl <thomas@linuxfromscratch.org> Date: Thu, 11 Jun 2020 12:55:28 +0000 Subject: Rename package entities to be independent of chapter numbering git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/cross2@11921 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- chapter05/binutils-pass1.xml | 4 +- chapter05/gcc-pass1.xml | 4 +- chapter05/glibc.xml | 4 +- chapter05/libstdc++.xml | 4 +- chapter05/linux-headers.xml | 4 +- chapter06/bash.xml | 4 +- chapter06/binutils-pass2.xml | 4 +- chapter06/coreutils.xml | 4 +- chapter06/diffutils.xml | 4 +- chapter06/file.xml | 4 +- chapter06/findutils.xml | 4 +- chapter06/gawk.xml | 4 +- chapter06/gcc-pass2.xml | 4 +- chapter06/grep.xml | 4 +- chapter06/gzip.xml | 4 +- chapter06/m4.xml | 4 +- chapter06/make.xml | 4 +- chapter06/ncurses.xml | 4 +- chapter06/patch.xml | 4 +- chapter06/sed.xml | 4 +- chapter06/tar.xml | 4 +- chapter06/xz.xml | 4 +- chapter07/bison.xml | 4 +- chapter07/dejagnu.xml | 4 +- chapter07/expect.xml | 4 +- chapter07/gettext.xml | 4 +- chapter07/libstdc++-pass2.xml | 4 +- chapter07/perl.xml | 4 +- chapter07/python.xml | 4 +- chapter07/stripping.xml | 2 +- chapter07/tcl.xml | 4 +- chapter07/texinfo.xml | 4 +- chapter07/util-linux.xml | 4 +- chapter08/acl.xml | 4 +- chapter08/attr.xml | 4 +- chapter08/autoconf.xml | 6 +- chapter08/automake.xml | 4 +- chapter08/bash.xml | 4 +- chapter08/bc.xml | 4 +- chapter08/binutils.xml | 4 +- chapter08/bison.xml | 4 +- chapter08/bzip2.xml | 4 +- chapter08/check.xml | 4 +- chapter08/coreutils.xml | 4 +- chapter08/dbus.xml | 4 +- chapter08/diffutils.xml | 4 +- chapter08/e2fsprogs.xml | 4 +- chapter08/eudev.xml | 4 +- chapter08/expat.xml | 4 +- chapter08/file.xml | 4 +- chapter08/findutils.xml | 4 +- chapter08/flex.xml | 4 +- chapter08/gawk.xml | 4 +- chapter08/gcc.xml | 4 +- chapter08/gdbm.xml | 4 +- chapter08/gettext.xml | 4 +- chapter08/glibc.xml | 4 +- chapter08/gmp.xml | 4 +- chapter08/gperf.xml | 4 +- chapter08/grep.xml | 4 +- chapter08/groff.xml | 4 +- chapter08/grub.xml | 4 +- chapter08/gzip.xml | 4 +- chapter08/iana-etc.xml | 4 +- chapter08/inetutils.xml | 4 +- chapter08/intltool.xml | 4 +- chapter08/iproute2.xml | 4 +- chapter08/kbd.xml | 4 +- chapter08/kmod.xml | 4 +- chapter08/less.xml | 4 +- chapter08/libcap.xml | 4 +- chapter08/libelf.xml | 4 +- chapter08/libffi.xml | 4 +- chapter08/libpipeline.xml | 4 +- chapter08/libtool.xml | 4 +- chapter08/m4.xml | 4 +- chapter08/make.xml | 4 +- chapter08/man-db.xml | 4 +- chapter08/man-pages.xml | 4 +- chapter08/meson.xml | 4 +- chapter08/mpc.xml | 4 +- chapter08/mpfr.xml | 4 +- chapter08/ncurses.xml | 4 +- chapter08/ninja.xml | 4 +- chapter08/openssl.xml | 4 +- chapter08/patch.xml | 4 +- chapter08/perl.xml | 4 +- chapter08/pkgconfig.xml | 4 +- chapter08/procps.xml | 4 +- chapter08/psmisc.xml | 4 +- chapter08/python.xml | 4 +- chapter08/readline.xml | 4 +- chapter08/sed.xml | 4 +- chapter08/shadow.xml | 4 +- chapter08/sysklogd.xml | 4 +- chapter08/systemd.xml | 4 +- chapter08/sysvinit.xml | 4 +- chapter08/tar.xml | 4 +- chapter08/texinfo.xml | 4 +- chapter08/util-linux.xml | 4 +- chapter08/vim.xml | 4 +- chapter08/xml-parser.xml | 4 +- chapter08/xz.xml | 4 +- chapter08/zlib.xml | 4 +- chapter08/zstd.xml | 4 +- chapter09/bootscripts.xml | 4 +- chapter10/kernel.xml | 4 +- packages.ent | 443 +++++++++++++++++++++--------------------- 108 files changed, 439 insertions(+), 432 deletions(-) (limited to 'chapter06/gcc-pass2.xml') diff --git a/chapter05/binutils-pass1.xml b/chapter05/binutils-pass1.xml index 00816c94a..914e119b8 100644 --- a/chapter05/binutils-pass1.xml +++ b/chapter05/binutils-pass1.xml @@ -33,8 +33,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&binutils-ch5p1-sbu;</seg> - <seg>&binutils-ch5p1-du;</seg> + <seg>&binutils-tmpp1-sbu;</seg> + <seg>&binutils-tmpp1-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml index 2f8145713..e2a13a003 100644 --- a/chapter05/gcc-pass1.xml +++ b/chapter05/gcc-pass1.xml @@ -33,8 +33,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&gcc-ch5p1-sbu;</seg> - <seg>&gcc-ch5p1-du;</seg> + <seg>&gcc-tmpp1-sbu;</seg> + <seg>&gcc-tmpp1-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml index 361dd0e58..80d1638f5 100644 --- a/chapter05/glibc.xml +++ b/chapter05/glibc.xml @@ -33,8 +33,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&glibc-ch5-sbu;</seg> - <seg>&glibc-ch5-du;</seg> + <seg>&glibc-tmp-sbu;</seg> + <seg>&glibc-tmp-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter05/libstdc++.xml b/chapter05/libstdc++.xml index 5058be9a5..0153766c4 100644 --- a/chapter05/libstdc++.xml +++ b/chapter05/libstdc++.xml @@ -37,8 +37,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&libstdcpp-ch5-sbu;</seg> - <seg>&libstdcpp-ch5-du;</seg> + <seg>&libstdcpp-tmp-sbu;</seg> + <seg>&libstdcpp-tmp-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter05/linux-headers.xml b/chapter05/linux-headers.xml index 6c1af3173..213fe7dc3 100644 --- a/chapter05/linux-headers.xml +++ b/chapter05/linux-headers.xml @@ -32,8 +32,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&linux-headers-ch5-sbu;</seg> - <seg>&linux-headers-ch5-du;</seg> + <seg>&linux-headers-tmp-sbu;</seg> + <seg>&linux-headers-tmp-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter06/bash.xml b/chapter06/bash.xml index bc0b211af..6cb1dc728 100644 --- a/chapter06/bash.xml +++ b/chapter06/bash.xml @@ -33,8 +33,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&bash-ch5-sbu;</seg> - <seg>&bash-ch5-du;</seg> + <seg>&bash-tmp-sbu;</seg> + <seg>&bash-tmp-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter06/binutils-pass2.xml b/chapter06/binutils-pass2.xml index d88bb84e2..5ccff98d8 100644 --- a/chapter06/binutils-pass2.xml +++ b/chapter06/binutils-pass2.xml @@ -33,8 +33,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&binutils-ch5p2-sbu;</seg> - <seg>&binutils-ch5p2-du;</seg> + <seg>&binutils-tmpp2-sbu;</seg> + <seg>&binutils-tmpp2-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml index 3ae765e85..fe036755e 100644 --- a/chapter06/coreutils.xml +++ b/chapter06/coreutils.xml @@ -33,8 +33,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&coreutils-ch5-sbu;</seg> - <seg>&coreutils-ch5-du;</seg> + <seg>&coreutils-tmp-sbu;</seg> + <seg>&coreutils-tmp-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter06/diffutils.xml b/chapter06/diffutils.xml index 6594058be..af4d95429 100644 --- a/chapter06/diffutils.xml +++ b/chapter06/diffutils.xml @@ -33,8 +33,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&diffutils-ch5-sbu;</seg> - <seg>&diffutils-ch5-du;</seg> + <seg>&diffutils-tmp-sbu;</seg> + <seg>&diffutils-tmp-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter06/file.xml b/chapter06/file.xml index a13553b19..2506f4432 100644 --- a/chapter06/file.xml +++ b/chapter06/file.xml @@ -33,8 +33,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&file-ch5-sbu;</seg> - <seg>&file-ch5-du;</seg> + <seg>&file-tmp-sbu;</seg> + <seg>&file-tmp-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter06/findutils.xml b/chapter06/findutils.xml index bf9f9c62a..e6a19202b 100644 --- a/chapter06/findutils.xml +++ b/chapter06/findutils.xml @@ -33,8 +33,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&findutils-ch5-sbu;</seg> - <seg>&findutils-ch5-du;</seg> + <seg>&findutils-tmp-sbu;</seg> + <seg>&findutils-tmp-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter06/gawk.xml b/chapter06/gawk.xml index 105abdb8e..efe7b4380 100644 --- a/chapter06/gawk.xml +++ b/chapter06/gawk.xml @@ -33,8 +33,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&gawk-ch5-sbu;</seg> - <seg>&gawk-ch5-du;</seg> + <seg>&gawk-tmp-sbu;</seg> + <seg>&gawk-tmp-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter06/gcc-pass2.xml b/chapter06/gcc-pass2.xml index a5b7f1a26..532a8e8b4 100644 --- a/chapter06/gcc-pass2.xml +++ b/chapter06/gcc-pass2.xml @@ -33,8 +33,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&gcc-ch5p2-sbu;</seg> - <seg>&gcc-ch5p2-du;</seg> + <seg>&gcc-tmpp2-sbu;</seg> + <seg>&gcc-tmpp2-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter06/grep.xml b/chapter06/grep.xml index 6a8ada4b8..494b8616d 100644 --- a/chapter06/grep.xml +++ b/chapter06/grep.xml @@ -33,8 +33,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&grep-ch5-sbu;</seg> - <seg>&grep-ch5-du;</seg> + <seg>&grep-tmp-sbu;</seg> + <seg>&grep-tmp-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter06/gzip.xml b/chapter06/gzip.xml index e5b5d0a37..90d554b0d 100644 --- a/chapter06/gzip.xml +++ b/chapter06/gzip.xml @@ -33,8 +33,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&gzip-ch5-sbu;</seg> - <seg>&gzip-ch5-du;</seg> + <seg>&gzip-tmp-sbu;</seg> + <seg>&gzip-tmp-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter06/m4.xml b/chapter06/m4.xml index 79559f6da..7a28a08cc 100644 --- a/chapter06/m4.xml +++ b/chapter06/m4.xml @@ -33,8 +33,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&m4-ch5-sbu;</seg> - <seg>&m4-ch5-du;</seg> + <seg>&m4-tmp-sbu;</seg> + <seg>&m4-tmp-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter06/make.xml b/chapter06/make.xml index fef5555aa..cf0dbce18 100644 --- a/chapter06/make.xml +++ b/chapter06/make.xml @@ -32,8 +32,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&make-ch5-sbu;</seg> - <seg>&make-ch5-du;</seg> + <seg>&make-tmp-sbu;</seg> + <seg>&make-tmp-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter06/ncurses.xml b/chapter06/ncurses.xml index d96d7d0f3..83499f2eb 100644 --- a/chapter06/ncurses.xml +++ b/chapter06/ncurses.xml @@ -33,8 +33,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&ncurses-ch5-sbu;</seg> - <seg>&ncurses-ch5-du;</seg> + <seg>&ncurses-tmp-sbu;</seg> + <seg>&ncurses-tmp-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter06/patch.xml b/chapter06/patch.xml index ecd5b2c47..7032d6eea 100644 --- a/chapter06/patch.xml +++ b/chapter06/patch.xml @@ -33,8 +33,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&patch-ch5-sbu;</seg> - <seg>&patch-ch5-du;</seg> + <seg>&patch-tmp-sbu;</seg> + <seg>&patch-tmp-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter06/sed.xml b/chapter06/sed.xml index f146b5102..d079f836d 100644 --- a/chapter06/sed.xml +++ b/chapter06/sed.xml @@ -33,8 +33,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&sed-ch5-sbu;</seg> - <seg>&sed-ch5-du;</seg> + <seg>&sed-tmp-sbu;</seg> + <seg>&sed-tmp-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter06/tar.xml b/chapter06/tar.xml index e64379fc5..8a82cff5c 100644 --- a/chapter06/tar.xml +++ b/chapter06/tar.xml @@ -33,8 +33,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&tar-ch5-sbu;</seg> - <seg>&tar-ch5-du;</seg> + <seg>&tar-tmp-sbu;</seg> + <seg>&tar-tmp-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter06/xz.xml b/chapter06/xz.xml index 428053ed1..f8d397d1b 100644 --- a/chapter06/xz.xml +++ b/chapter06/xz.xml @@ -33,8 +33,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&xz-ch5-sbu;</seg> - <seg>&xz-ch5-du;</seg> + <seg>&xz-tmp-sbu;</seg> + <seg>&xz-tmp-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter07/bison.xml b/chapter07/bison.xml index 4e794eb44..a3718bf19 100644 --- a/chapter07/bison.xml +++ b/chapter07/bison.xml @@ -33,8 +33,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&bison-ch5-sbu;</seg> - <seg>&bison-ch5-du;</seg> + <seg>&bison-tmp-sbu;</seg> + <seg>&bison-tmp-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter07/dejagnu.xml b/chapter07/dejagnu.xml index 727173d0e..da6a44aa9 100644 --- a/chapter07/dejagnu.xml +++ b/chapter07/dejagnu.xml @@ -32,8 +32,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&dejagnu-ch5-sbu;</seg> - <seg>&dejagnu-ch5-du;</seg> + <seg>&dejagnu-tmp-sbu;</seg> + <seg>&dejagnu-tmp-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter07/expect.xml b/chapter07/expect.xml index 7e59bda8b..e73676857 100644 --- a/chapter07/expect.xml +++ b/chapter07/expect.xml @@ -38,8 +38,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&expect-ch5-sbu;</seg> - <seg>&expect-ch5-du;</seg> + <seg>&expect-tmp-sbu;</seg> + <seg>&expect-tmp-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter07/gettext.xml b/chapter07/gettext.xml index a8f5be287..12a8b5cfd 100644 --- a/chapter07/gettext.xml +++ b/chapter07/gettext.xml @@ -33,8 +33,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&gettext-ch5-sbu;</seg> - <seg>&gettext-ch5-du;</seg> + <seg>&gettext-tmp-sbu;</seg> + <seg>&gettext-tmp-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter07/libstdc++-pass2.xml b/chapter07/libstdc++-pass2.xml index a10309f4b..a98bfb282 100644 --- a/chapter07/libstdc++-pass2.xml +++ b/chapter07/libstdc++-pass2.xml @@ -35,8 +35,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&libstdcpp-ch5-sbu;</seg> - <seg>&libstdcpp-ch5-du;</seg> + <seg>&libstdcpp-tmp-sbu;</seg> + <seg>&libstdcpp-tmp-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter07/perl.xml b/chapter07/perl.xml index 62b7f4e12..d282fb4ba 100644 --- a/chapter07/perl.xml +++ b/chapter07/perl.xml @@ -33,8 +33,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&perl-ch5-sbu;</seg> - <seg>&perl-ch5-du;</seg> + <seg>&perl-tmp-sbu;</seg> + <seg>&perl-tmp-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter07/python.xml b/chapter07/python.xml index 17af90999..9354bb99e 100644 --- a/chapter07/python.xml +++ b/chapter07/python.xml @@ -33,8 +33,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&python-ch5-sbu;</seg> - <seg>&python-ch5-du;</seg> + <seg>&python-tmp-sbu;</seg> + <seg>&python-tmp-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter07/stripping.xml b/chapter07/stripping.xml index 88b44b883..2f62fd5f2 100644 --- a/chapter07/stripping.xml +++ b/chapter07/stripping.xml @@ -140,7 +140,7 @@ tar -cJpf $HOME/temp-tools.tar.xz . <para> In case some mistakes have been made and you need to start over, you can - use this backup to restore the temporary tools and save some irecovery time. + 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 diff --git a/chapter07/tcl.xml b/chapter07/tcl.xml index d64852d43..39219b06b 100644 --- a/chapter07/tcl.xml +++ b/chapter07/tcl.xml @@ -34,8 +34,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&tcl-ch5-sbu;</seg> - <seg>&tcl-ch5-du;</seg> + <seg>&tcl-tmp-sbu;</seg> + <seg>&tcl-tmp-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter07/texinfo.xml b/chapter07/texinfo.xml index b58c701e6..3ce3d08b9 100644 --- a/chapter07/texinfo.xml +++ b/chapter07/texinfo.xml @@ -33,8 +33,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&texinfo-ch5-sbu;</seg> - <seg>&texinfo-ch5-du;</seg> + <seg>&texinfo-tmp-sbu;</seg> + <seg>&texinfo-tmp-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter07/util-linux.xml b/chapter07/util-linux.xml index f9401c03a..05698ae66 100644 --- a/chapter07/util-linux.xml +++ b/chapter07/util-linux.xml @@ -31,8 +31,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&util-linux-ch5-sbu;</seg> - <seg>&util-linux-ch5-du;</seg> + <seg>&util-linux-tmp-sbu;</seg> + <seg>&util-linux-tmp-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter08/acl.xml b/chapter08/acl.xml index f9f2eddbe..03f057cb3 100644 --- a/chapter08/acl.xml +++ b/chapter08/acl.xml @@ -32,8 +32,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&acl-ch6-sbu;</seg> - <seg>&acl-ch6-du;</seg> + <seg>&acl-fin-sbu;</seg> + <seg>&acl-fin-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter08/attr.xml b/chapter08/attr.xml index 10c6eec53..0033ae58f 100644 --- a/chapter08/attr.xml +++ b/chapter08/attr.xml @@ -31,8 +31,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&attr-ch6-sbu;</seg> - <seg>&attr-ch6-du;</seg> + <seg>&attr-fin-sbu;</seg> + <seg>&attr-fin-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter08/autoconf.xml b/chapter08/autoconf.xml index 6652747fd..c490a3994 100644 --- a/chapter08/autoconf.xml +++ b/chapter08/autoconf.xml @@ -31,8 +31,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&autoconf-ch6-sbu;</seg> - <seg>&autoconf-ch6-du;</seg> + <seg>&autoconf-fin-sbu;</seg> + <seg>&autoconf-fin-du;</seg> </seglistitem> </segmentedlist> @@ -59,7 +59,7 @@ <screen><userinput remap="test">make check</userinput></screen> <!-- - <para>This takes a long time, about &autoconf-ch6-sbu-tests; SBUs. In addition, + <para>This takes a long time, about &autoconf-fin-sbu-tests; SBUs. In addition, several tests are skipped that use Automake. For full test coverage, Autoconf can be re-tested after Automake has been installed. In addition, two tests fail due to changes in libtool-2.4.3 and later.</para> diff --git a/chapter08/automake.xml b/chapter08/automake.xml index 11dccfad3..5587d577d 100644 --- a/chapter08/automake.xml +++ b/chapter08/automake.xml @@ -31,8 +31,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&automake-ch6-sbu;</seg> - <seg>&automake-ch6-du;</seg> + <seg>&automake-fin-sbu;</seg> + <seg>&automake-fin-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter08/bash.xml b/chapter08/bash.xml index 650c33ade..60cb9b491 100644 --- a/chapter08/bash.xml +++ b/chapter08/bash.xml @@ -30,8 +30,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&bash-ch6-sbu;</seg> - <seg>&bash-ch6-du;</seg> + <seg>&bash-fin-sbu;</seg> + <seg>&bash-fin-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter08/bc.xml b/chapter08/bc.xml index d848ad365..a499937e3 100644 --- a/chapter08/bc.xml +++ b/chapter08/bc.xml @@ -31,8 +31,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&bc-ch6-sbu;</seg> - <seg>&bc-ch6-du;</seg> + <seg>&bc-fin-sbu;</seg> + <seg>&bc-fin-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter08/binutils.xml b/chapter08/binutils.xml index 04dbd199c..6f6f7be95 100644 --- a/chapter08/binutils.xml +++ b/chapter08/binutils.xml @@ -31,8 +31,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&binutils-ch6-sbu;</seg> - <seg>&binutils-ch6-du;</seg> + <seg>&binutils-fin-sbu;</seg> + <seg>&binutils-fin-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter08/bison.xml b/chapter08/bison.xml index 23b6f0a95..687cdf9ee 100644 --- a/chapter08/bison.xml +++ b/chapter08/bison.xml @@ -30,8 +30,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&bison-ch6-sbu;</seg> - <seg>&bison-ch6-du;</seg> + <seg>&bison-fin-sbu;</seg> + <seg>&bison-fin-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter08/bzip2.xml b/chapter08/bzip2.xml index edf2f5bd4..6927df68e 100644 --- a/chapter08/bzip2.xml +++ b/chapter08/bzip2.xml @@ -33,8 +33,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&bzip2-ch6-sbu;</seg> - <seg>&bzip2-ch6-du;</seg> + <seg>&bzip2-fin-sbu;</seg> + <seg>&bzip2-fin-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter08/check.xml b/chapter08/check.xml index bd4306b28..fc28a9113 100644 --- a/chapter08/check.xml +++ b/chapter08/check.xml @@ -30,8 +30,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&check-ch5-sbu;</seg> - <seg>&check-ch5-du;</seg> + <seg>&check-fin-sbu;</seg> + <seg>&check-fin-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter08/coreutils.xml b/chapter08/coreutils.xml index 5a4079d78..d97b9558a 100644 --- a/chapter08/coreutils.xml +++ b/chapter08/coreutils.xml @@ -31,8 +31,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&coreutils-ch6-sbu;</seg> - <seg>&coreutils-ch6-du;</seg> + <seg>&coreutils-fin-sbu;</seg> + <seg>&coreutils-fin-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter08/dbus.xml b/chapter08/dbus.xml index bb4bffc76..0b06ad3e0 100644 --- a/chapter08/dbus.xml +++ b/chapter08/dbus.xml @@ -36,8 +36,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&dbus-ch6-sbu;</seg> - <seg>&dbus-ch6-du;</seg> + <seg>&dbus-fin-sbu;</seg> + <seg>&dbus-fin-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter08/diffutils.xml b/chapter08/diffutils.xml index 0d8bd5c77..8889077d5 100644 --- a/chapter08/diffutils.xml +++ b/chapter08/diffutils.xml @@ -31,8 +31,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&diffutils-ch6-sbu;</seg> - <seg>&diffutils-ch6-du;</seg> + <seg>&diffutils-fin-sbu;</seg> + <seg>&diffutils-fin-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter08/e2fsprogs.xml b/chapter08/e2fsprogs.xml index 984ba6db9..dbfc1e7e8 100644 --- a/chapter08/e2fsprogs.xml +++ b/chapter08/e2fsprogs.xml @@ -34,8 +34,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&e2fsprogs-ch6-sbu;</seg> - <seg>&e2fsprogs-ch6-du;</seg> + <seg>&e2fsprogs-fin-sbu;</seg> + <seg>&e2fsprogs-fin-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter08/eudev.xml b/chapter08/eudev.xml index 71511c3e7..39c86ef1f 100644 --- a/chapter08/eudev.xml +++ b/chapter08/eudev.xml @@ -31,8 +31,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&eudev-ch6-sbu;</seg> - <seg>&eudev-ch6-du;</seg> + <seg>&eudev-fin-sbu;</seg> + <seg>&eudev-fin-du;</seg> </seglistitem> </segmentedlist> </sect2> diff --git a/chapter08/expat.xml b/chapter08/expat.xml index df9f709c9..d978864c8 100644 --- a/chapter08/expat.xml +++ b/chapter08/expat.xml @@ -31,8 +31,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&expat-ch6-sbu;</seg> - <seg>&expat-ch6-du;</seg> + <seg>&expat-fin-sbu;</seg> + <seg>&expat-fin-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter08/file.xml b/chapter08/file.xml index b5e28f244..eb9f41a2b 100644 --- a/chapter08/file.xml +++ b/chapter08/file.xml @@ -31,8 +31,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&file-ch6-sbu;</seg> - <seg>&file-ch6-du;</seg> + <seg>&file-fin-sbu;</seg> + <seg>&file-fin-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter08/findutils.xml b/chapter08/findutils.xml index 19989ecaa..f55e5cbb1 100644 --- a/chapter08/findutils.xml +++ b/chapter08/findutils.xml @@ -33,8 +33,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&findutils-ch6-sbu;</seg> - <seg>&findutils-ch6-du;</seg> + <seg>&findutils-fin-sbu;</seg> + <seg>&findutils-fin-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter08/flex.xml b/chapter08/flex.xml index bd4bd545f..fc8574c1d 100644 --- a/chapter08/flex.xml +++ b/chapter08/flex.xml @@ -31,8 +31,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&flex-ch6-sbu;</seg> - <seg>&flex-ch6-du;</seg> + <seg>&flex-fin-sbu;</seg> + <seg>&flex-fin-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter08/gawk.xml b/chapter08/gawk.xml index b112eb10d..940fe3833 100644 --- a/chapter08/gawk.xml +++ b/chapter08/gawk.xml @@ -30,8 +30,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&gawk-ch6-sbu;</seg> - <seg>&gawk-ch6-du;</seg> + <seg>&gawk-fin-sbu;</seg> + <seg>&gawk-fin-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter08/gcc.xml b/chapter08/gcc.xml index ad9f5418f..6902211ca 100644 --- a/chapter08/gcc.xml +++ b/chapter08/gcc.xml @@ -31,8 +31,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&gcc-ch6-sbu;</seg> - <seg>&gcc-ch6-du;</seg> + <seg>&gcc-fin-sbu;</seg> + <seg>&gcc-fin-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter08/gdbm.xml b/chapter08/gdbm.xml index f953b63f9..06403ff56 100644 --- a/chapter08/gdbm.xml +++ b/chapter08/gdbm.xml @@ -34,8 +34,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&gdbm-ch6-sbu;</seg> - <seg>&gdbm-ch6-du;</seg> + <seg>&gdbm-fin-sbu;</seg> + <seg>&gdbm-fin-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter08/gettext.xml b/chapter08/gettext.xml index 2c4683804..dd5bebbe9 100644 --- a/chapter08/gettext.xml +++ b/chapter08/gettext.xml @@ -33,8 +33,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&gettext-ch6-sbu;</seg> - <seg>&gettext-ch6-du;</seg> + <seg>&gettext-fin-sbu;</seg> + <seg>&gettext-fin-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter08/glibc.xml b/chapter08/glibc.xml index a422c8d3c..7d993d509 100644 --- a/chapter08/glibc.xml +++ b/chapter08/glibc.xml @@ -33,8 +33,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&glibc-ch6-sbu;</seg> - <seg>&glibc-ch6-du;</seg> + <seg>&glibc-fin-sbu;</seg> + <seg>&glibc-fin-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter08/gmp.xml b/chapter08/gmp.xml index 4bc361a56..dfa2fd6e4 100644 --- a/chapter08/gmp.xml +++ b/chapter08/gmp.xml @@ -31,8 +31,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&gmp-ch6-sbu;</seg> - <seg>&gmp-ch6-du;</seg> + <seg>&gmp-fin-sbu;</seg> + <seg>&gmp-fin-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter08/gperf.xml b/chapter08/gperf.xml index d8c5b6594..aa42fe18b 100644 --- a/chapter08/gperf.xml +++ b/chapter08/gperf.xml @@ -30,8 +30,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&gperf-ch6-sbu;</seg> - <seg>&gperf-ch6-du;</seg> + <seg>&gperf-fin-sbu;</seg> + <seg>&gperf-fin-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter08/grep.xml b/chapter08/grep.xml index 44707152c..ef6357281 100644 --- a/chapter08/grep.xml +++ b/chapter08/grep.xml @@ -30,8 +30,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&grep-ch6-sbu;</seg> - <seg>&grep-ch6-du;</seg> + <seg>&grep-fin-sbu;</seg> + <seg>&grep-fin-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter08/groff.xml b/chapter08/groff.xml index aad0cbf85..032130217 100644 --- a/chapter08/groff.xml +++ b/chapter08/groff.xml @@ -31,8 +31,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&groff-ch6-sbu;</seg> - <seg>&groff-ch6-du;</seg> + <seg>&groff-fin-sbu;</seg> + <seg>&groff-fin-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter08/grub.xml b/chapter08/grub.xml index 25a61077b..51726e87f 100644 --- a/chapter08/grub.xml +++ b/chapter08/grub.xml @@ -30,8 +30,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&grub-ch6-sbu;</seg> - <seg>&grub-ch6-du;</seg> + <seg>&grub-fin-sbu;</seg> + <seg>&grub-fin-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter08/gzip.xml b/chapter08/gzip.xml index 09eebbdf7..3d7783316 100644 --- a/chapter08/gzip.xml +++ b/chapter08/gzip.xml @@ -31,8 +31,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&gzip-ch6-sbu;</seg> - <seg>&gzip-ch6-du;</seg> + <seg>&gzip-fin-sbu;</seg> + <seg>&gzip-fin-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter08/iana-etc.xml b/chapter08/iana-etc.xml index 42ab25c34..65530f9d8 100644 --- a/chapter08/iana-etc.xml +++ b/chapter08/iana-etc.xml @@ -31,8 +31,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&iana-etc-ch6-sbu;</seg> - <seg>&iana-etc-ch6-du;</seg> + <seg>&iana-etc-fin-sbu;</seg> + <seg>&iana-etc-fin-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter08/inetutils.xml b/chapter08/inetutils.xml index c8fdd456f..bbdc54955 100644 --- a/chapter08/inetutils.xml +++ b/chapter08/inetutils.xml @@ -30,8 +30,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&inetutils-ch6-sbu;</seg> - <seg>&inetutils-ch6-du;</seg> + <seg>&inetutils-fin-sbu;</seg> + <seg>&inetutils-fin-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter08/intltool.xml b/chapter08/intltool.xml index 9e9ebad20..f402fec67 100644 --- a/chapter08/intltool.xml +++ b/chapter08/intltool.xml @@ -31,8 +31,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&intltool-ch6-sbu;</seg> - <seg>&intltool-ch6-du;</seg> + <seg>&intltool-fin-sbu;</seg> + <seg>&intltool-fin-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter08/iproute2.xml b/chapter08/iproute2.xml index 8b868df65..64682a918 100644 --- a/chapter08/iproute2.xml +++ b/chapter08/iproute2.xml @@ -31,8 +31,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&iproute2-ch6-sbu;</seg> - <seg>&iproute2-ch6-du;</seg> + <seg>&iproute2-fin-sbu;</seg> + <seg>&iproute2-fin-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter08/kbd.xml b/chapter08/kbd.xml index 2f9cfd3f1..7d85e4db5 100644 --- a/chapter08/kbd.xml +++ b/chapter08/kbd.xml @@ -31,8 +31,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&kbd-ch6-sbu;</seg> - <seg>&kbd-ch6-du;</seg> + <seg>&kbd-fin-sbu;</seg> + <seg>&kbd-fin-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter08/kmod.xml b/chapter08/kmod.xml index 6cc3eb168..b1fe24911 100644 --- a/chapter08/kmod.xml +++ b/chapter08/kmod.xml @@ -31,8 +31,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&kmod-ch6-sbu;</seg> - <seg>&kmod-ch6-du;</seg> + <seg>&kmod-fin-sbu;</seg> + <seg>&kmod-fin-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter08/less.xml b/chapter08/less.xml index 087b2e6a3..237cf1e15 100644 --- a/chapter08/less.xml +++ b/chapter08/less.xml @@ -30,8 +30,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&less-ch6-sbu;</seg> - <seg>&less-ch6-du;</seg> + <seg>&less-fin-sbu;</seg> + <seg>&less-fin-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter08/libcap.xml b/chapter08/libcap.xml index 8126dfaae..c2c59831c 100644 --- a/chapter08/libcap.xml +++ b/chapter08/libcap.xml @@ -33,8 +33,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&libcap-ch6-sbu;</seg> - <seg>&libcap-ch6-du;</seg> + <seg>&libcap-fin-sbu;</seg> + <seg>&libcap-fin-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter08/libelf.xml b/chapter08/libelf.xml index b559e6aa2..2ecf7fc58 100644 --- a/chapter08/libelf.xml +++ b/chapter08/libelf.xml @@ -31,8 +31,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&elfutils-ch6-sbu;</seg> - <seg>&elfutils-ch6-du;</seg> + <seg>&elfutils-fin-sbu;</seg> + <seg>&elfutils-fin-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter08/libffi.xml b/chapter08/libffi.xml index 6a6f8a458..825b09a57 100644 --- a/chapter08/libffi.xml +++ b/chapter08/libffi.xml @@ -32,8 +32,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&libffi-ch6-sbu;</seg> - <seg>&libffi-ch6-du;</seg> + <seg>&libffi-fin-sbu;</seg> + <seg>&libffi-fin-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter08/libpipeline.xml b/chapter08/libpipeline.xml index eb5a19438..5d275d381 100644 --- a/chapter08/libpipeline.xml +++ b/chapter08/libpipeline.xml @@ -31,8 +31,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&libpipeline-ch6-sbu;</seg> - <seg>&libpipeline-ch6-du;</seg> + <seg>&libpipeline-fin-sbu;</seg> + <seg>&libpipeline-fin-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter08/libtool.xml b/chapter08/libtool.xml index 3093b4164..affeaca95 100644 --- a/chapter08/libtool.xml +++ b/chapter08/libtool.xml @@ -32,8 +32,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&libtool-ch6-sbu;</seg> - <seg>&libtool-ch6-du;</seg> + <seg>&libtool-fin-sbu;</seg> + <seg>&libtool-fin-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter08/m4.xml b/chapter08/m4.xml index 7fe282ee7..a5911b576 100644 --- a/chapter08/m4.xml +++ b/chapter08/m4.xml @@ -30,8 +30,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&m4-ch6-sbu;</seg> - <seg>&m4-ch6-du;</seg> + <seg>&m4-fin-sbu;</seg> + <seg>&m4-fin-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter08/make.xml b/chapter08/make.xml index 561bdd812..887950b4b 100644 --- a/chapter08/make.xml +++ b/chapter08/make.xml @@ -31,8 +31,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&make-ch6-sbu;</seg> - <seg>&make-ch6-du;</seg> + <seg>&make-fin-sbu;</seg> + <seg>&make-fin-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter08/man-db.xml b/chapter08/man-db.xml index f2f46b891..dd8b6f970 100644 --- a/chapter08/man-db.xml +++ b/chapter08/man-db.xml @@ -31,8 +31,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&man-db-ch6-sbu;</seg> - <seg>&man-db-ch6-du;</seg> + <seg>&man-db-fin-sbu;</seg> + <seg>&man-db-fin-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter08/man-pages.xml b/chapter08/man-pages.xml index 3d2c52046..1fe3f4287 100644 --- a/chapter08/man-pages.xml +++ b/chapter08/man-pages.xml @@ -30,8 +30,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&man-pages-ch6-sbu;</seg> - <seg>&man-pages-ch6-du;</seg> + <seg>&man-pages-fin-sbu;</seg> + <seg>&man-pages-fin-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter08/meson.xml b/chapter08/meson.xml index 0b49c5441..1060fa2d4 100644 --- a/chapter08/meson.xml +++ b/chapter08/meson.xml @@ -30,8 +30,8 @@ <segtitle>&buildtime;</segtitle> <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&meson-ch6-sbu;</seg> - <seg>&meson-ch6-du;</seg> + <seg>&meson-fin-sbu;</seg> + <seg>&meson-fin-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter08/mpc.xml b/chapter08/mpc.xml index 2d518c8c1..ad46b7e43 100644 --- a/chapter08/mpc.xml +++ b/chapter08/mpc.xml @@ -32,8 +32,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&mpc-ch6-sbu;</seg> - <seg>&mpc-ch6-du;</seg> + <seg>&mpc-fin-sbu;</seg> + <seg>&mpc-fin-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter08/mpfr.xml b/chapter08/mpfr.xml index ff8e323b7..f2344facb 100644 --- a/chapter08/mpfr.xml +++ b/chapter08/mpfr.xml @@ -31,8 +31,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&mpfr-ch6-sbu;</seg> - <seg>&mpfr-ch6-du;</seg> + <seg>&mpfr-fin-sbu;</seg> + <seg>&mpfr-fin-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter08/ncurses.xml b/chapter08/ncurses.xml index b37f1f69c..d0036c7de 100644 --- a/chapter08/ncurses.xml +++ b/chapter08/ncurses.xml @@ -31,8 +31,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&ncurses-ch6-sbu;</seg> - <seg>&ncurses-ch6-du;</seg> + <seg>&ncurses-fin-sbu;</seg> + <seg>&ncurses-fin-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter08/ninja.xml b/chapter08/ninja.xml index e998c64fb..15d45cacf 100644 --- a/chapter08/ninja.xml +++ b/chapter08/ninja.xml @@ -30,8 +30,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&ninja-ch6-sbu;</seg> - <seg>&ninja-ch6-du;</seg> + <seg>&ninja-fin-sbu;</seg> + <seg>&ninja-fin-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter08/openssl.xml b/chapter08/openssl.xml index f2ff1fa80..c620ae629 100644 --- a/chapter08/openssl.xml +++ b/chapter08/openssl.xml @@ -33,8 +33,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&openssl-ch6-sbu;</seg> - <seg>&openssl-ch6-du;</seg> + <seg>&openssl-fin-sbu;</seg> + <seg>&openssl-fin-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter08/patch.xml b/chapter08/patch.xml index 6c6c6852b..174aa9192 100644 --- a/chapter08/patch.xml +++ b/chapter08/patch.xml @@ -32,8 +32,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&patch-ch6-sbu;</seg> - <seg>&patch-ch6-du;</seg> + <seg>&patch-fin-sbu;</seg> + <seg>&patch-fin-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter08/perl.xml b/chapter08/perl.xml index 284464d87..1841b819e 100644 --- a/chapter08/perl.xml +++ b/chapter08/perl.xml @@ -31,8 +31,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&perl-ch6-sbu;</seg> - <seg>&perl-ch6-du;</seg> + <seg>&perl-fin-sbu;</seg> + <seg>&perl-fin-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter08/pkgconfig.xml b/chapter08/pkgconfig.xml index 3c311e389..aa39b72e0 100644 --- a/chapter08/pkgconfig.xml +++ b/chapter08/pkgconfig.xml @@ -32,8 +32,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&pkgconfig-ch6-sbu;</seg> - <seg>&pkgconfig-ch6-du;</seg> + <seg>&pkgconfig-fin-sbu;</seg> + <seg>&pkgconfig-fin-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter08/procps.xml b/chapter08/procps.xml index 59bf0864c..a7080f247 100644 --- a/chapter08/procps.xml +++ b/chapter08/procps.xml @@ -30,8 +30,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&procps-ng-ch6-sbu;</seg> - <seg>&procps-ng-ch6-du;</seg> + <seg>&procps-ng-fin-sbu;</seg> + <seg>&procps-ng-fin-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter08/psmisc.xml b/chapter08/psmisc.xml index b01303131..febf90748 100644 --- a/chapter08/psmisc.xml +++ b/chapter08/psmisc.xml @@ -31,8 +31,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&psmisc-ch6-sbu;</seg> - <seg>&psmisc-ch6-du;</seg> + <seg>&psmisc-fin-sbu;</seg> + <seg>&psmisc-fin-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter08/python.xml b/chapter08/python.xml index cc440903d..54b0eeab3 100644 --- a/chapter08/python.xml +++ b/chapter08/python.xml @@ -32,8 +32,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&python-ch6-sbu;</seg> - <seg>&python-ch6-du;</seg> + <seg>&python-fin-sbu;</seg> + <seg>&python-fin-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter08/readline.xml b/chapter08/readline.xml index 87571ea9d..c59cdcf97 100644 --- a/chapter08/readline.xml +++ b/chapter08/readline.xml @@ -31,8 +31,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&readline-ch6-sbu;</seg> - <seg>&readline-ch6-du;</seg> + <seg>&readline-fin-sbu;</seg> + <seg>&readline-fin-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter08/sed.xml b/chapter08/sed.xml index 030e77a0b..77d30479b 100644 --- a/chapter08/sed.xml +++ b/chapter08/sed.xml @@ -30,8 +30,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&sed-ch6-sbu;</seg> - <seg>&sed-ch6-du;</seg> + <seg>&sed-fin-sbu;</seg> + <seg>&sed-fin-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter08/shadow.xml b/chapter08/shadow.xml index 425112cbd..49d2789dc 100644 --- a/chapter08/shadow.xml +++ b/chapter08/shadow.xml @@ -31,8 +31,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&shadow-ch6-sbu;</seg> - <seg>&shadow-ch6-du;</seg> + <seg>&shadow-fin-sbu;</seg> + <seg>&shadow-fin-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter08/sysklogd.xml b/chapter08/sysklogd.xml index e96980cb4..26f57020b 100644 --- a/chapter08/sysklogd.xml +++ b/chapter08/sysklogd.xml @@ -31,8 +31,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&sysklogd-ch6-sbu;</seg> - <seg>&sysklogd-ch6-du;</seg> + <seg>&sysklogd-fin-sbu;</seg> + <seg>&sysklogd-fin-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter08/systemd.xml b/chapter08/systemd.xml index 2cf2d1d1b..319f107a1 100644 --- a/chapter08/systemd.xml +++ b/chapter08/systemd.xml @@ -31,8 +31,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&systemd-ch6-sbu;</seg> - <seg>&systemd-ch6-du;</seg> + <seg>&systemd-fin-sbu;</seg> + <seg>&systemd-fin-du;</seg> </seglistitem> </segmentedlist> </sect2> diff --git a/chapter08/sysvinit.xml b/chapter08/sysvinit.xml index 0c171acf5..4a68cc37b 100644 --- a/chapter08/sysvinit.xml +++ b/chapter08/sysvinit.xml @@ -31,8 +31,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&sysvinit-ch6-sbu;</seg> - <seg>&sysvinit-ch6-du;</seg> + <seg>&sysvinit-fin-sbu;</seg> + <seg>&sysvinit-fin-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter08/tar.xml b/chapter08/tar.xml index 56883628c..0af1216ee 100644 --- a/chapter08/tar.xml +++ b/chapter08/tar.xml @@ -33,8 +33,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&tar-ch6-sbu;</seg> - <seg>&tar-ch6-du;</seg> + <seg>&tar-fin-sbu;</seg> + <seg>&tar-fin-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter08/texinfo.xml b/chapter08/texinfo.xml index d61df477b..2f428bf47 100644 --- a/chapter08/texinfo.xml +++ b/chapter08/texinfo.xml @@ -31,8 +31,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&texinfo-ch6-sbu;</seg> - <seg>&texinfo-ch6-du;</seg> + <seg>&texinfo-fin-sbu;</seg> + <seg>&texinfo-fin-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter08/util-linux.xml b/chapter08/util-linux.xml index 519c3b171..b2b6f2c0e 100644 --- a/chapter08/util-linux.xml +++ b/chapter08/util-linux.xml @@ -32,8 +32,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&util-linux-ch6-sbu;</seg> - <seg>&util-linux-ch6-du;</seg> + <seg>&util-linux-fin-sbu;</seg> + <seg>&util-linux-fin-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter08/vim.xml b/chapter08/vim.xml index 263122bd7..4ec0d1a3b 100644 --- a/chapter08/vim.xml +++ b/chapter08/vim.xml @@ -30,8 +30,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&vim-ch6-sbu;</seg> - <seg>&vim-ch6-du;</seg> + <seg>&vim-fin-sbu;</seg> + <seg>&vim-fin-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter08/xml-parser.xml b/chapter08/xml-parser.xml index 54d5bcb35..62053d566 100644 --- a/chapter08/xml-parser.xml +++ b/chapter08/xml-parser.xml @@ -31,8 +31,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&xml-parser-ch6-sbu;</seg> - <seg>&xml-parser-ch6-du;</seg> + <seg>&xml-parser-fin-sbu;</seg> + <seg>&xml-parser-fin-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter08/xz.xml b/chapter08/xz.xml index 5a342b2ff..b8a9f9206 100644 --- a/chapter08/xz.xml +++ b/chapter08/xz.xml @@ -34,8 +34,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&xz-ch6-sbu;</seg> - <seg>&xz-ch6-du;</seg> + <seg>&xz-fin-sbu;</seg> + <seg>&xz-fin-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter08/zlib.xml b/chapter08/zlib.xml index 2dcc49413..90c343ca5 100644 --- a/chapter08/zlib.xml +++ b/chapter08/zlib.xml @@ -31,8 +31,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&zlib-ch6-sbu;</seg> - <seg>&zlib-ch6-du;</seg> + <seg>&zlib-fin-sbu;</seg> + <seg>&zlib-fin-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter08/zstd.xml b/chapter08/zstd.xml index 71e7794b6..9ed863659 100644 --- a/chapter08/zstd.xml +++ b/chapter08/zstd.xml @@ -32,8 +32,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&zstd-ch6-sbu;</seg> - <seg>&zstd-ch6-du;</seg> + <seg>&zstd-fin-sbu;</seg> + <seg>&zstd-fin-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter09/bootscripts.xml b/chapter09/bootscripts.xml index 5c2b28d7c..009590d64 100644 --- a/chapter09/bootscripts.xml +++ b/chapter09/bootscripts.xml @@ -33,8 +33,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&lfs-bootscripts-ch7-sbu;</seg> - <seg>&lfs-bootscripts-ch7-du;</seg> + <seg>&lfs-bootscripts-cfg-sbu;</seg> + <seg>&lfs-bootscripts-cfg-du;</seg> </seglistitem> </segmentedlist> diff --git a/chapter10/kernel.xml b/chapter10/kernel.xml index 0033028cf..82042386c 100644 --- a/chapter10/kernel.xml +++ b/chapter10/kernel.xml @@ -30,8 +30,8 @@ <segtitle>&diskspace;</segtitle> <seglistitem> - <seg>&linux-ch8-sbu;</seg> - <seg>&linux-ch8-du;</seg> + <seg>&linux-knl-sbu;</seg> + <seg>&linux-knl-du;</seg> </seglistitem> </segmentedlist> diff --git a/packages.ent b/packages.ent index 8948195ab..dd8a9b401 100644 --- a/packages.ent +++ b/packages.ent @@ -4,32 +4,39 @@ For empty *-home entities use " " not "" Packages sizes allways in KB Allowed deviation in SBUs : 10% - Allowed deviation in disk usage : 2% --> + Allowed deviation in disk usage : 2% + + Suffixes: + *-tmp-* Package info for Temporary Tools + *-fin-* Package info for Final System + *-cfg-* Package info for System Configuration + *-knl-* Package info for Kernel stuff +--> <!ENTITY acl-version "2.2.53"> <!ENTITY acl-size "513 KB"> <!ENTITY acl-url "&savannah;/releases/acl/acl-&acl-version;.tar.gz"> <!ENTITY acl-md5 "007aabf1dbb550bcddde52a244cd1070"> <!ENTITY acl-home "&savannah-nongnu;/projects/acl"> -<!ENTITY acl-ch6-du "6.4 MB"> -<!ENTITY acl-ch6-sbu "0.1 SBU"> +<!ENTITY acl-fin-du "6.4 MB"> +<!ENTITY acl-fin-sbu "0.1 SBU"> <!ENTITY attr-version "2.4.48"> <!ENTITY attr-size "457 KB"> <!ENTITY attr-url "&savannah;/releases/attr/attr-&attr-version;.tar.gz"> <!ENTITY attr-md5 "bc1e5cb5c96d99b24886f1f527d3bb3d"> <!ENTITY attr-home "&savannah-nongnu;/projects/attr"> -<!ENTITY attr-ch6-du "4.2 MB"> -<!ENTITY attr-ch6-sbu "less than 0.1 SBU"> +<!ENTITY attr-fin-du "4.2 MB"> +<!ENTITY attr-fin-sbu "less than 0.1 SBU"> <!ENTITY autoconf-version "2.69"> <!ENTITY autoconf-size "1,186 KB"> <!ENTITY autoconf-url "&gnu;autoconf/autoconf-&autoconf-version;.tar.xz"> <!ENTITY autoconf-md5 "50f97f4159805e374639a73e2636f22e"> <!ENTITY autoconf-home "&gnu-software;autoconf/"> -<!ENTITY autoconf-ch6-du "79 MB"> -<!ENTITY autoconf-ch6-sbu-tests "3.2"> -<!ENTITY autoconf-ch6-sbu "less than 0.1 SBU (about &autoconf-ch6-sbu-tests; SBU with tests)"> +<!ENTITY autoconf-fin-du "79 MB"> +<!ENTITY autoconf-fin-sbu-tests "3.2"> +<!ENTITY autoconf-fin-sbu "less than 0.1 SBU (about &autoconf-fin-sbu-tests; SBU with tests)"> <!ENTITY automake-version "1.16.2"> <!ENTITY am-minor-version "1.16"> @@ -37,58 +44,58 @@ <!ENTITY automake-url "&gnu;automake/automake-&automake-version;.tar.xz"> <!ENTITY automake-md5 "6cb234c86f3f984df29ce758e6d0d1d7"> <!ENTITY automake-home "&gnu-software;automake/"> -<!ENTITY automake-ch6-du "107 MB"> -<!ENTITY automake-ch6-sbu "less than 0.1 SBU (about 8.1 SBU with tests)"> +<!ENTITY automake-fin-du "107 MB"> +<!ENTITY automake-fin-sbu "less than 0.1 SBU (about 8.1 SBU with tests)"> <!ENTITY bash-version "5.0"> <!ENTITY bash-size "9,898 KB"> <!ENTITY bash-url "&gnu;bash/bash-&bash-version;.tar.gz"> <!ENTITY bash-md5 "2b44b47b905be16f45709648f671820b"> <!ENTITY bash-home "&gnu-software;bash/"> -<!ENTITY bash-ch5-du "67 MB"> -<!ENTITY bash-ch5-sbu "0.4 SBU"> -<!ENTITY bash-ch6-du "62 MB"> -<!ENTITY bash-ch6-sbu "1.9 SBU"> +<!ENTITY bash-tmp-du "67 MB"> +<!ENTITY bash-tmp-sbu "0.4 SBU"> +<!ENTITY bash-fin-du "62 MB"> +<!ENTITY bash-fin-sbu "1.9 SBU"> <!ENTITY bc-version "2.7.2"> <!ENTITY bc-size "185 KB"> <!ENTITY bc-url "https://github.com/gavinhoward/bc/releases/download/&bc-version;/bc-&bc-version;.tar.xz"> <!ENTITY bc-md5 "28235ceaf2280b909591ace7a3a4f051"> <!ENTITY bc-home "https://github.com/gavinhoward/bc"> -<!ENTITY bc-ch6-du "2.9 MB"> -<!ENTITY bc-ch6-sbu "0.1 SBU"> +<!ENTITY bc-fin-du "2.9 MB"> +<!ENTITY bc-fin-sbu "0.1 SBU"> <!ENTITY binutils-version "2.34"> <!ENTITY binutils-size "21,131 KB"> <!ENTITY binutils-url "&gnu;binutils/binutils-&binutils-version;.tar.xz"> <!ENTITY binutils-md5 "664ec3a2df7805ed3464639aaae332d6"> <!ENTITY binutils-home "&gnu-software;binutils/"> -<!ENTITY binutils-ch5p1-du "625 MB"> -<!ENTITY binutils-ch5p1-sbu "1 SBU"> -<!ENTITY binutils-ch5p2-du "651 MB"> -<!ENTITY binutils-ch5p2-sbu "1.1 SBU"> -<!ENTITY binutils-ch6-du "5.1 GB"> -<!ENTITY binutils-ch6-sbu "6.7 SBU"> +<!ENTITY binutils-tmpp1-du "625 MB"> +<!ENTITY binutils-tmpp1-sbu "1 SBU"> +<!ENTITY binutils-tmpp2-du "651 MB"> +<!ENTITY binutils-tmpp2-sbu "1.1 SBU"> +<!ENTITY binutils-fin-du "5.1 GB"> +<!ENTITY binutils-fin-sbu "6.7 SBU"> <!ENTITY bison-version "3.6.3"> <!ENTITY bison-size "2,416 KB"> <!ENTITY bison-url "&gnu;bison/bison-&bison-version;.tar.xz"> <!ENTITY bison-md5 "ca0513e77de1de46b9f2419d175cb3b4"> <!ENTITY bison-home "&gnu-software;bison/"> -<!ENTITY bison-ch5-du "43 MB"> -<!ENTITY bison-ch5-sbu "0.3 SBU"> -<!ENTITY bison-ch6-du "52 MB"> -<!ENTITY bison-ch6-sbu "5.8 SBU"> +<!ENTITY bison-tmp-du "43 MB"> +<!ENTITY bison-tmp-sbu "0.3 SBU"> +<!ENTITY bison-fin-du "52 MB"> +<!ENTITY bison-fin-sbu "5.8 SBU"> <!ENTITY bzip2-version "1.0.8"> <!ENTITY bzip2-size "792 KB"> <!ENTITY bzip2-url "https://www.sourceware.org/pub/bzip2/bzip2-&bzip2-version;.tar.gz"> <!ENTITY bzip2-md5 "67e051268d0c475ea773822f7500d0e5"> <!--<!ENTITY bzip2-home "http://www.bzip.org/">--> -<!ENTITY bzip2-ch5-du "6.4 MB"> -<!ENTITY bzip2-ch5-sbu "less than 0.1 SBU"> -<!ENTITY bzip2-ch6-du "7.7 MB"> -<!ENTITY bzip2-ch6-sbu "less than 0.1 SBU"> +<!ENTITY bzip2-tmp-du "6.4 MB"> +<!ENTITY bzip2-tmp-sbu "less than 0.1 SBU"> +<!ENTITY bzip2-fin-du "7.7 MB"> +<!ENTITY bzip2-fin-sbu "less than 0.1 SBU"> <!ENTITY ref5-version "&version;"> <!ENTITY ref5-size "REF5-SUM KB"> @@ -105,75 +112,75 @@ <!ENTITY check-url "&github;/libcheck/check/releases/download/&check-version;/check-&check-version;.tar.gz"> <!ENTITY check-md5 "270e82a445be6026040267a5e11cc94b"> <!ENTITY check-home "https://libcheck.github.io/check"> -<!ENTITY check-ch5-du "13 MB"> -<!ENTITY check-ch5-sbu "0.1 SBU (about 3.5 SBU with tests)"> +<!ENTITY check-fin-du "13 MB"> +<!ENTITY check-fin-sbu "0.1 SBU (about 3.5 SBU with tests)"> <!ENTITY coreutils-version "8.32"> <!ENTITY coreutils-size "5,418 KB"> <!ENTITY coreutils-url "&gnu;coreutils/coreutils-&coreutils-version;.tar.xz"> <!ENTITY coreutils-md5 "022042695b7d5bcf1a93559a9735e668"> <!ENTITY coreutils-home "&gnu-software;coreutils/"> -<!ENTITY coreutils-ch5-du "157 MB"> -<!ENTITY coreutils-ch5-sbu "0.7 SBU"> -<!ENTITY coreutils-ch6-du "202 MB"> -<!ENTITY coreutils-ch6-sbu "2.3 SBU"> +<!ENTITY coreutils-tmp-du "157 MB"> +<!ENTITY coreutils-tmp-sbu "0.7 SBU"> +<!ENTITY coreutils-fin-du "202 MB"> +<!ENTITY coreutils-fin-sbu "2.3 SBU"> <!ENTITY dbus-version "1.12.18"> <!ENTITY dbus-size "2,048 KB"> <!ENTITY dbus-url "https://dbus.freedesktop.org/releases/dbus/dbus-&dbus-version;.tar.gz"> <!ENTITY dbus-md5 "4ca570c281be35d0b30ab83436712242"> <!ENTITY dbus-home "https://www.freedesktop.org/wiki/Software/dbus"> -<!ENTITY dbus-ch6-du "18 MB"> -<!ENTITY dbus-ch6-sbu "0.2 SBU"> +<!ENTITY dbus-fin-du "18 MB"> +<!ENTITY dbus-fin-sbu "0.2 SBU"> <!ENTITY dejagnu-version "1.6.2"> <!ENTITY dejagnu-size "514 KB"> <!ENTITY dejagnu-url "&gnu;dejagnu/dejagnu-&dejagnu-version;.tar.gz"> <!ENTITY dejagnu-md5 "e1b07516533f351b3aba3423fafeffd6"> <!ENTITY dejagnu-home "&gnu-software;dejagnu/"> -<!ENTITY dejagnu-ch5-du "3.2 MB"> -<!ENTITY dejagnu-ch5-sbu "less than 0.1 SBU"> +<!ENTITY dejagnu-tmp-du "3.2 MB"> +<!ENTITY dejagnu-tmp-sbu "less than 0.1 SBU"> <!ENTITY diffutils-version "3.7"> <!ENTITY diffutils-size "1,415 KB"> <!ENTITY diffutils-url "&gnu;diffutils/diffutils-&diffutils-version;.tar.xz"> <!ENTITY diffutils-md5 "4824adc0e95dbbf11dfbdfaad6a1e461"> <!ENTITY diffutils-home "&gnu-software;diffutils/"> -<!ENTITY diffutils-ch5-du "26 MB"> -<!ENTITY diffutils-ch5-sbu "0.2 SBU"> -<!ENTITY diffutils-ch6-du "36 MB"> -<!ENTITY diffutils-ch6-sbu "0.4 SBU"> +<!ENTITY diffutils-tmp-du "26 MB"> +<!ENTITY diffutils-tmp-sbu "0.2 SBU"> +<!ENTITY diffutils-fin-du "36 MB"> +<!ENTITY diffutils-fin-sbu "0.4 SBU"> <!ENTITY e2fsprogs-version "1.45.6"> <!ENTITY e2fsprogs-size "7,753 KB"> <!ENTITY e2fsprogs-url "https://downloads.sourceforge.net/project/e2fsprogs/e2fsprogs/v&e2fsprogs-version;/e2fsprogs-&e2fsprogs-version;.tar.gz"> <!ENTITY e2fsprogs-md5 "cccfb706d162514e4f9dbfbc9e5d65ee"> <!ENTITY e2fsprogs-home "http://e2fsprogs.sourceforge.net/"> -<!ENTITY e2fsprogs-ch6-du "108 MB"> -<!ENTITY e2fsprogs-ch6-sbu "1.6 SBU"> +<!ENTITY e2fsprogs-fin-du "108 MB"> +<!ENTITY e2fsprogs-fin-sbu "1.6 SBU"> <!ENTITY elfutils-version "0.179"> <!ENTITY elfutils-size "8,846 KB"> <!ENTITY elfutils-url "https://sourceware.org/ftp/elfutils/&elfutils-version;/elfutils-&elfutils-version;.tar.bz2"> <!ENTITY elfutils-md5 "8ee56b371b5a7ea081284c44e5164600"> <!ENTITY elfutils-home "https://sourceware.org/ftp/elfutils/"> -<!ENTITY elfutils-ch6-du "124 MB"> -<!ENTITY elfutils-ch6-sbu "0.9 SBU"> +<!ENTITY elfutils-fin-du "124 MB"> +<!ENTITY elfutils-fin-sbu "0.9 SBU"> <!ENTITY eudev-version "3.2.9"> <!ENTITY eudev-size "1,914 KB"> <!ENTITY eudev-url "https://dev.gentoo.org/~blueness/eudev/eudev-&eudev-version;.tar.gz"> <!ENTITY eudev-md5 "dedfb1964f6098fe9320de827957331f"> -<!ENTITY eudev-ch6-du "83 MB"> -<!ENTITY eudev-ch6-sbu "0.2 SBU"> +<!ENTITY eudev-fin-du "83 MB"> +<!ENTITY eudev-fin-sbu "0.2 SBU"> <!ENTITY expat-version "2.2.9"> <!ENTITY expat-size "413 KB"> <!ENTITY expat-url "&sourceforge;expat/expat-&expat-version;.tar.xz"> <!ENTITY expat-md5 "d2384fa607223447e713e1b9bd272376"> <!ENTITY expat-home "https://libexpat.github.io/"> -<!ENTITY expat-ch6-du "11 MB"> -<!ENTITY expat-ch6-sbu "0.1 SBU"> +<!ENTITY expat-fin-du "11 MB"> +<!ENTITY expat-fin-sbu "0.1 SBU"> <!ENTITY expect-version "5.45.4"> <!ENTITY expect-lib-version "5.45"> @@ -181,60 +188,60 @@ <!ENTITY expect-url "&sourceforge;expect/expect&expect-version;.tar.gz"> <!ENTITY expect-md5 "00fce8de158422f5ccd2666512329bd2"> <!ENTITY expect-home "https://core.tcl.tk/expect/"> -<!ENTITY expect-ch5-du "4.0 MB"> -<!ENTITY expect-ch5-sbu "0.1 SBU"> +<!ENTITY expect-tmp-du "4.0 MB"> +<!ENTITY expect-tmp-sbu "0.1 SBU"> <!ENTITY file-version "5.38"> <!ENTITY file-size "911 KB"> <!ENTITY file-url "ftp://ftp.astron.com/pub/file/file-&file-version;.tar.gz"> <!ENTITY file-md5 "3217633ed09c7cd35ed8d04191675574"> <!ENTITY file-home "https://www.darwinsys.com/file/"> -<!ENTITY file-ch5-du "20 MB"> -<!ENTITY file-ch5-sbu "0.1 SBU"> -<!ENTITY file-ch6-du "20 MB"> -<!ENTITY file-ch6-sbu "0.1 SBU"> +<!ENTITY file-tmp-du "20 MB"> +<!ENTITY file-tmp-sbu "0.1 SBU"> +<!ENTITY file-fin-du "20 MB"> +<!ENTITY file-fin-sbu "0.1 SBU"> <!ENTITY findutils-version "4.7.0"> <!ENTITY findutils-size "1,851 KB"> <!ENTITY findutils-url "&gnu;findutils/findutils-&findutils-version;.tar.xz"> <!ENTITY findutils-md5 "731356dec4b1109b812fecfddfead6b2"> <!ENTITY findutils-home "&gnu-software;findutils/"> -<!ENTITY findutils-ch5-du "39 MB"> -<!ENTITY findutils-ch5-sbu "0.3 SBU"> -<!ENTITY findutils-ch6-du "57 MB"> -<!ENTITY findutils-ch6-sbu "0.7 SBU"> +<!ENTITY findutils-tmp-du "39 MB"> +<!ENTITY findutils-tmp-sbu "0.3 SBU"> +<!ENTITY findutils-fin-du "57 MB"> +<!ENTITY findutils-fin-sbu "0.7 SBU"> <!ENTITY flex-version "2.6.4"> <!ENTITY flex-size "1,386 KB"> <!ENTITY flex-url "&github;/westes/flex/releases/download/v&flex-version;/flex-&flex-version;.tar.gz"> <!ENTITY flex-md5 "2882e3179748cc9f9c23ec593d6adc8d"> <!ENTITY flex-home "&github;/westes/flex"> -<!ENTITY flex-ch5-du "15 MB"> -<!ENTITY flex-ch5-sbu "0.1 SBU"> -<!ENTITY flex-ch6-du "36 MB"> -<!ENTITY flex-ch6-sbu "0.4 SBU"> +<!ENTITY flex-tmp-du "15 MB"> +<!ENTITY flex-tmp-sbu "0.1 SBU"> +<!ENTITY flex-fin-du "36 MB"> +<!ENTITY flex-fin-sbu "0.4 SBU"> <!ENTITY gawk-version "5.1.0"> <!ENTITY gawk-size "3,081 KB"> <!ENTITY gawk-url "&gnu;gawk/gawk-&gawk-version;.tar.xz"> <!ENTITY gawk-md5 "8470c34eeecc41c1aa0c5d89e630df50"> <!ENTITY gawk-home "&gnu-software;gawk/"> -<!ENTITY gawk-ch5-du "46 MB"> -<!ENTITY gawk-ch5-sbu "0.2 SBU"> -<!ENTITY gawk-ch6-du "47 MB"> -<!ENTITY gawk-ch6-sbu "0.4 SBU"> +<!ENTITY gawk-tmp-du "46 MB"> +<!ENTITY gawk-tmp-sbu "0.2 SBU"> +<!ENTITY gawk-fin-du "47 MB"> +<!ENTITY gawk-fin-sbu "0.4 SBU"> <!ENTITY gcc-version "10.1.0"> <!ENTITY gcc-size "72,844 KB"> <!ENTITY gcc-url "&gnu;gcc/gcc-&gcc-version;/gcc-&gcc-version;.tar.xz"> <!ENTITY gcc-md5 "7d48e00245330c48b670ec9a2c518291"> <!ENTITY gcc-home "https://gcc.gnu.org/"> -<!ENTITY gcc-ch5p1-du "3.9 GB"> -<!ENTITY gcc-ch5p1-sbu "12 SBU"> -<!ENTITY gcc-ch5p2-du "4.3 GB"> -<!ENTITY gcc-ch5p2-sbu "14 SBU"> -<!ENTITY gcc-ch6-du "4.9 GB "> -<!ENTITY gcc-ch6-sbu "103 SBU (with tests)"> +<!ENTITY gcc-tmpp1-du "3.9 GB"> +<!ENTITY gcc-tmpp1-sbu "12 SBU"> +<!ENTITY gcc-tmpp2-du "4.3 GB"> +<!ENTITY gcc-tmpp2-sbu "14 SBU"> +<!ENTITY gcc-fin-du "4.9 GB "> +<!ENTITY gcc-fin-sbu "103 SBU (with tests)"> <!ENTITY libquadmath-version "0.0.0"> <!ENTITY libstdcpp-version "6.0.28"> <!ENTITY libitm-version "1.0.0"> @@ -243,36 +250,36 @@ <!--<!ENTITY libmpxwrap-version "2.0.1">--> <!--<!ENTITY libcilkrts-version "5.0.0">--> -<!ENTITY libstdcpp-ch5-du "878 MB"> -<!ENTITY libstdcpp-ch5-sbu "0.5 SBU"> +<!ENTITY libstdcpp-tmp-du "878 MB"> +<!ENTITY libstdcpp-tmp-sbu "0.5 SBU"> <!ENTITY gdbm-version "1.18.1"> <!ENTITY gdbm-size "920 KB"> <!ENTITY gdbm-url "&gnu;gdbm/gdbm-&gdbm-version;.tar.gz"> <!ENTITY gdbm-md5 "988dc82182121c7570e0cb8b4fcd5415"> <!ENTITY gdbm-home "&gnu-software;gdbm/"> -<!ENTITY gdbm-ch6-du "11 MB"> -<!ENTITY gdbm-ch6-sbu "0.1 SBU"> +<!ENTITY gdbm-fin-du "11 MB"> +<!ENTITY gdbm-fin-sbu "0.1 SBU"> <!ENTITY gettext-version "0.20.2"> <!ENTITY gettext-size "9,292 KB"> <!ENTITY gettext-url "&gnu;gettext/gettext-&gettext-version;.tar.xz"> <!ENTITY gettext-md5 "0cf5f68338d5d941bbf9ac93b847310f"> <!ENTITY gettext-home "&gnu-software;gettext/"> -<!ENTITY gettext-ch5-du "300 MB"> -<!ENTITY gettext-ch5-sbu "1.6 SBU"> -<!ENTITY gettext-ch6-du "249 MB"> -<!ENTITY gettext-ch6-sbu "2.7 SBU"> +<!ENTITY gettext-tmp-du "300 MB"> +<!ENTITY gettext-tmp-sbu "1.6 SBU"> +<!ENTITY gettext-fin-du "249 MB"> +<!ENTITY gettext-fin-sbu "2.7 SBU"> <!ENTITY glibc-version "2.31"> <!ENTITY glibc-size "16,286 KB"> <!ENTITY glibc-url "&gnu;glibc/glibc-&glibc-version;.tar.xz"> <!ENTITY glibc-md5 "78a720f17412f3c3282be5a6f3363ec6"> <!ENTITY glibc-home "&gnu-software;libc/"> -<!ENTITY glibc-ch5-du "896 MB"> -<!ENTITY glibc-ch5-sbu "4.5 SBU"> -<!ENTITY glibc-ch6-du "5.5 GB"> -<!ENTITY glibc-ch6-sbu "19 SBU"> +<!ENTITY glibc-tmp-du "896 MB"> +<!ENTITY glibc-tmp-sbu "4.5 SBU"> +<!ENTITY glibc-fin-du "5.5 GB"> +<!ENTITY glibc-fin-sbu "19 SBU"> <!ENTITY libthread_db-version "1.0"> <!ENTITY gmp-version "6.2.0"> @@ -280,148 +287,148 @@ <!ENTITY gmp-url "&gnu;gmp/gmp-&gmp-version;.tar.xz"> <!ENTITY gmp-md5 "a325e3f09e6d91e62101e59f9bda3ec1"> <!ENTITY gmp-home "&gnu-software;gmp/"> -<!ENTITY gmp-ch6-du "51 MB"> -<!ENTITY gmp-ch6-sbu "1.1 SBU"> +<!ENTITY gmp-fin-du "51 MB"> +<!ENTITY gmp-fin-sbu "1.1 SBU"> <!ENTITY gperf-version "3.1"> <!ENTITY gperf-size "1,188 KB"> <!ENTITY gperf-url "&gnu;gperf/gperf-&gperf-version;.tar.gz"> <!ENTITY gperf-md5 "9e251c0a618ad0824b51117d5d9db87e"> <!ENTITY gperf-home "&gnu-software;gperf/"> -<!ENTITY gperf-ch6-du "6.3 MB"> -<!ENTITY gperf-ch6-sbu "less than 0.1 SBU"> +<!ENTITY gperf-fin-du "6.3 MB"> +<!ENTITY gperf-fin-sbu "less than 0.1 SBU"> <!ENTITY grep-version "3.4"> <!ENTITY grep-size "1,520 KB"> <!ENTITY grep-url "&gnu;grep/grep-&grep-version;.tar.xz"> <!ENTITY grep-md5 "111b117d22d6a7d049d6ae7505e9c4d2"> <!ENTITY grep-home "&gnu-software;grep/"> -<!ENTITY grep-ch5-du "25 MB"> -<!ENTITY grep-ch5-sbu "0.2 SBU"> -<!ENTITY grep-ch6-du "39 MB"> -<!ENTITY grep-ch6-sbu "0.7 SBU"> +<!ENTITY grep-tmp-du "25 MB"> +<!ENTITY grep-tmp-sbu "0.2 SBU"> +<!ENTITY grep-fin-du "39 MB"> +<!ENTITY grep-fin-sbu "0.7 SBU"> <!ENTITY groff-version "1.22.4"> <!ENTITY groff-size "4,044 KB"> <!ENTITY groff-url "&gnu;groff/groff-&groff-version;.tar.gz"> <!ENTITY groff-md5 "08fb04335e2f5e73f23ea4c3adbf0c5f"> <!ENTITY groff-home "&gnu-software;groff/"> -<!ENTITY groff-ch6-du "95 MB"> -<!ENTITY groff-ch6-sbu "0.5 SBU"> +<!ENTITY groff-fin-du "95 MB"> +<!ENTITY groff-fin-sbu "0.5 SBU"> <!ENTITY grub-version "2.04"> <!ENTITY grub-size "6,245 KB"> <!ENTITY grub-url "https://ftp.gnu.org/gnu/grub/grub-&grub-version;.tar.xz"> <!ENTITY grub-md5 "5aaca6713b47ca2456d8324a58755ac7"> <!ENTITY grub-home "&gnu-software;grub/"> -<!ENTITY grub-ch6-du "161 MB"> -<!ENTITY grub-ch6-sbu "0.8 SBU"> +<!ENTITY grub-fin-du "161 MB"> +<!ENTITY grub-fin-sbu "0.8 SBU"> <!ENTITY gzip-version "1.10"> <!ENTITY gzip-size "757 KB"> <!ENTITY gzip-url "&gnu;gzip/gzip-&gzip-version;.tar.xz"> <!ENTITY gzip-md5 "691b1221694c3394f1c537df4eee39d3"> <!ENTITY gzip-home "&gnu-software;gzip/"> -<!ENTITY gzip-ch5-du "10 MB"> -<!ENTITY gzip-ch5-sbu "0.1 SBU"> -<!ENTITY gzip-ch6-du "20 MB"> -<!ENTITY gzip-ch6-sbu "0.1 SBU"> +<!ENTITY gzip-tmp-du "10 MB"> +<!ENTITY gzip-tmp-sbu "0.1 SBU"> +<!ENTITY gzip-fin-du "20 MB"> +<!ENTITY gzip-fin-sbu "0.1 SBU"> <!ENTITY iana-etc-version "20200429"> <!ENTITY iana-etc-size "574 KB"> <!ENTITY iana-etc-url "&anduin-sources;/iana-etc-&iana-etc-version;.tar.gz"> <!ENTITY iana-etc-md5 "f9f7cda56c0ebe6ac2fa69a0be5d5400"> <!ENTITY iana-etc-home "http://freecode.com/projects/iana-etc"> -<!ENTITY iana-etc-ch6-du "4.7 MB"> -<!ENTITY iana-etc-ch6-sbu "less than 0.1 SBU"> +<!ENTITY iana-etc-fin-du "4.7 MB"> +<!ENTITY iana-etc-fin-sbu "less than 0.1 SBU"> <!ENTITY inetutils-version "1.9.4"> <!ENTITY inetutils-size "1,333 KB"> <!ENTITY inetutils-url "&gnu;inetutils/inetutils-&inetutils-version;.tar.xz"> <!ENTITY inetutils-md5 "87fef1fa3f603aef11c41dcc097af75e"> <!ENTITY inetutils-home "&gnu-software;inetutils/"> -<!ENTITY inetutils-ch6-du "29 MB"> -<!ENTITY inetutils-ch6-sbu "0.3 SBU"> +<!ENTITY inetutils-fin-du "29 MB"> +<!ENTITY inetutils-fin-sbu "0.3 SBU"> <!ENTITY intltool-version "0.51.0"> <!ENTITY intltool-size "159 KB"> <!ENTITY intltool-url "https://launchpad.net/intltool/trunk/&intltool-version;/+download/intltool-&intltool-version;.tar.gz"> <!ENTITY intltool-md5 "12e517cac2b57a0121cda351570f1e63"> <!ENTITY intltool-home "https://freedesktop.org/wiki/Software/intltool"> -<!ENTITY intltool-ch6-du "1.5 MB"> -<!ENTITY intltool-ch6-sbu "less than 0.1 SBU"> +<!ENTITY intltool-fin-du "1.5 MB"> +<!ENTITY intltool-fin-sbu "less than 0.1 SBU"> <!ENTITY iproute2-version "5.6.0"> <!ENTITY iproute2-size "738 KB"> <!ENTITY iproute2-url "&kernel;linux/utils/net/iproute2/iproute2-&iproute2-version;.tar.xz"> <!ENTITY iproute2-md5 "9da0c352707c34b8b1fec3bf42fcfd09"> <!ENTITY iproute2-home "&kernel;linux/utils/net/iproute2/"> -<!ENTITY iproute2-ch6-du "14 MB"> -<!ENTITY iproute2-ch6-sbu "0.2 SBU"> +<!ENTITY iproute2-fin-du "14 MB"> +<!ENTITY iproute2-fin-sbu "0.2 SBU"> <!ENTITY kbd-version "2.2.0"> <!ENTITY kbd-size "1,090 KB"> <!ENTITY kbd-url "https://www.kernel.org/pub/linux/utils/kbd/kbd-&kbd-version;.tar.xz"> <!ENTITY kbd-md5 "d1d7ae0b5fb875dc082731e09cd0c8bc"> <!ENTITY kbd-home "http://ftp.altlinux.org/pub/people/legion/kbd"> -<!ENTITY kbd-ch6-du "36 MB"> -<!ENTITY kbd-ch6-sbu "0.1 SBU"> +<!ENTITY kbd-fin-du "36 MB"> +<!ENTITY kbd-fin-sbu "0.1 SBU"> <!ENTITY kmod-version "27"> <!ENTITY kmod-size "537 KB"> <!ENTITY kmod-url "&kernel;linux/utils/kernel/kmod/kmod-&kmod-version;.tar.xz"> <!ENTITY kmod-md5 "3973a74786670d3062d89a827e266581"> <!ENTITY kmod-home " "> -<!ENTITY kmod-ch6-du "13 MB"> -<!ENTITY kmod-ch6-sbu "0.1 SBU"> +<!ENTITY kmod-fin-du "13 MB"> +<!ENTITY kmod-fin-sbu "0.1 SBU"> <!ENTITY less-version "551"> <!ENTITY less-size "339 KB"> <!ENTITY less-url "http://www.greenwoodsoftware.com/less/less-&less-version;.tar.gz"> <!ENTITY less-md5 "4ad4408b06d7a6626a055cb453f36819"> <!ENTITY less-home "http://www.greenwoodsoftware.com/less/"> -<!ENTITY less-ch6-du "4.1 MB"> -<!ENTITY less-ch6-sbu "less than 0.1 SBU"> +<!ENTITY less-fin-du "4.1 MB"> +<!ENTITY less-fin-sbu "less than 0.1 SBU"> <!ENTITY lfs-bootscripts-version "20191031"> <!-- Scripts depend on this format --> <!ENTITY lfs-bootscripts-size "BOOTSCRIPTS-SIZE KB"> <!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.xz"> <!ENTITY lfs-bootscripts-md5 "BOOTSCRIPTS-MD5SUM"> <!ENTITY lfs-bootscripts-home " "> -<!ENTITY lfs-bootscripts-ch7-du "BOOTSCRIPTS-INSTALL-KB KB"> -<!ENTITY lfs-bootscripts-ch7-sbu "less than 0.1 SBU"> +<!ENTITY lfs-bootscripts-cfg-du "BOOTSCRIPTS-INSTALL-KB KB"> +<!ENTITY lfs-bootscripts-cfg-sbu "less than 0.1 SBU"> <!ENTITY libcap-version "2.36"> <!ENTITY libcap-size "112 KB"> <!ENTITY libcap-url "&kernel;linux/libs/security/linux-privs/libcap2/libcap-&libcap-version;.tar.xz"> <!ENTITY libcap-md5 "3d8cd4a87650cdee130691cb110c2ce2"> <!ENTITY libcap-home "https://sites.google.com/site/fullycapable/"> -<!ENTITY libcap-ch6-du "8.5 MB"> -<!ENTITY libcap-ch6-sbu "less than 0.1 SBU"> +<!ENTITY libcap-fin-du "8.5 MB"> +<!ENTITY libcap-fin-sbu "less than 0.1 SBU"> <!ENTITY libffi-version "3.3"> <!ENTITY libffi-size "1,275 KB"> <!ENTITY libffi-url "ftp://sourceware.org/pub/libffi/libffi-&libffi-version;.tar.gz"> <!ENTITY libffi-md5 "6313289e32f1d38a9df4770b014a2ca7"> <!ENTITY libffi-home "https://sourceware.org/libffi/"> -<!ENTITY libffi-ch6-du "10 MB"> -<!ENTITY libffi-ch6-sbu "1.9 SBU"> +<!ENTITY libffi-fin-du "10 MB"> +<!ENTITY libffi-fin-sbu "1.9 SBU"> <!ENTITY libpipeline-version "1.5.2"> <!ENTITY libpipeline-size "971 KB"> <!ENTITY libpipeline-url "&savannah;/releases/libpipeline/libpipeline-&libpipeline-version;.tar.gz"> <!ENTITY libpipeline-md5 "169de4cc1f6f7f7d430a5bed858b2fd3"> <!ENTITY libpipeline-home "http://libpipeline.nongnu.org/"> -<!ENTITY libpipeline-ch6-du "9.2 MB"> -<!ENTITY libpipeline-ch6-sbu "0.2 SBU"> +<!ENTITY libpipeline-fin-du "9.2 MB"> +<!ENTITY libpipeline-fin-sbu "0.2 SBU"> <!ENTITY libtool-version "2.4.6"> <!ENTITY libtool-size "951 KB"> <!ENTITY libtool-url "&gnu;libtool/libtool-&libtool-version;.tar.xz"> <!ENTITY libtool-md5 "1bfb9b923f2c1339b4d2ce1807064aa5"> <!ENTITY libtool-home "&gnu-software;libtool/"> -<!ENTITY libtool-ch6-du "43 MB"> -<!ENTITY libtool-ch6-sbu "1.8 SBU"> +<!ENTITY libtool-fin-du "43 MB"> +<!ENTITY libtool-fin-sbu "1.8 SBU"> <!ENTITY linux-major-version "5"> <!ENTITY linux-minor-version "6"> @@ -435,143 +442,143 @@ <!-- measured for 4.8.3 / gcc-6.2.0 on x86_64 : minimum is allnoconfig extended for a hopefully-bootable build on desktop machine, max is allyesconfig which requires openssl --> -<!ENTITY linux-ch8-du "960 - 4250 MB (typically about 1100 MB)"> -<!ENTITY linux-ch8-sbu "4.4 - 66.0 SBU (typically about 6 SBU)"> +<!ENTITY linux-knl-du "960 - 4250 MB (typically about 1100 MB)"> +<!ENTITY linux-knl-sbu "4.4 - 66.0 SBU (typically about 6 SBU)"> -<!ENTITY linux-headers-ch5-du "1 GB"> -<!ENTITY linux-headers-ch5-sbu "0.1 SBU"> -<!ENTITY linux-headers-ch6-du "1 GB"> -<!ENTITY linux-headers-ch6-sbu "0.1 SBU"> +<!ENTITY linux-headers-tmp-du "1 GB"> +<!ENTITY linux-headers-tmp-sbu "0.1 SBU"> +<!ENTITY linux-headers-fin-du "1 GB"> +<!ENTITY linux-headers-fin-sbu "0.1 SBU"> <!ENTITY m4-version "1.4.18"> <!ENTITY m4-size "1,180 KB"> <!ENTITY m4-url "&gnu;m4/m4-&m4-version;.tar.xz"> <!ENTITY m4-md5 "730bb15d96fffe47e148d1e09235af82"> <!ENTITY m4-home "&gnu-software;m4/"> -<!ENTITY m4-ch5-du "20 MB"> -<!ENTITY m4-ch5-sbu "0.2 SBU"> -<!ENTITY m4-ch6-du "33 MB"> -<!ENTITY m4-ch6-sbu "0.4 SBU"> +<!ENTITY m4-tmp-du "20 MB"> +<!ENTITY m4-tmp-sbu "0.2 SBU"> +<!ENTITY m4-fin-du "33 MB"> +<!ENTITY m4-fin-sbu "0.4 SBU"> <!ENTITY make-version "4.3"> <!ENTITY make-size "2,263 KB"> <!ENTITY make-url "&gnu;make/make-&make-version;.tar.gz"> <!ENTITY make-md5 "fc7a67ea86ace13195b0bce683fd4469"> <!ENTITY make-home "&gnu-software;make/"> -<!ENTITY make-ch5-du "16 MB"> -<!ENTITY make-ch5-sbu "0.1 SBU"> -<!ENTITY make-ch6-du "16 MB"> -<!ENTITY make-ch6-sbu "0.5 SBU"> +<!ENTITY make-tmp-du "16 MB"> +<!ENTITY make-tmp-sbu "0.1 SBU"> +<!ENTITY make-fin-du "16 MB"> +<!ENTITY make-fin-sbu "0.5 SBU"> <!ENTITY man-db-version "2.9.2"> <!ENTITY man-db-size "1,844 KB"> <!ENTITY man-db-url "&savannah;/releases/man-db/man-db-&man-db-version;.tar.xz"> <!ENTITY man-db-md5 "86c7b99ce5969d9b20bf9aeae8d86e0b"> <!ENTITY man-db-home "https://www.nongnu.org/man-db/"> -<!ENTITY man-db-ch6-du "40 MB"> -<!ENTITY man-db-ch6-sbu "0.5 SBU"> +<!ENTITY man-db-fin-du "40 MB"> +<!ENTITY man-db-fin-sbu "0.5 SBU"> <!ENTITY man-pages-version "5.06"> <!ENTITY man-pages-size "1,664 KB"> <!ENTITY man-pages-url "&kernel;linux/docs/man-pages/man-pages-&man-pages-version;.tar.xz"> <!ENTITY man-pages-md5 "df2054d875c83bbc0bc0cfb8f53f3d43"> <!ENTITY man-pages-home "https://www.kernel.org/doc/man-pages/"> -<!ENTITY man-pages-ch6-du "31 MB"> -<!ENTITY man-pages-ch6-sbu "less than 0.1 SBU"> +<!ENTITY man-pages-fin-du "31 MB"> +<!ENTITY man-pages-fin-sbu "less than 0.1 SBU"> <!ENTITY meson-version "0.54.2"> <!ENTITY meson-size "1,652 KB"> <!ENTITY meson-url "&github;/mesonbuild/meson/releases/download/&meson-version;/meson-&meson-version;.tar.gz"> <!ENTITY meson-md5 "6da6600c230d4124a73ca77ffef69cad"> <!ENTITY meson-home "https://mesonbuild.com"> -<!ENTITY meson-ch6-du "31 MB"> -<!ENTITY meson-ch6-sbu "less than 0.1 SBU"> +<!ENTITY meson-fin-du "31 MB"> +<!ENTITY meson-fin-sbu "less than 0.1 SBU"> <!ENTITY mpc-version "1.1.0"> <!ENTITY mpc-size "685 KB"> <!ENTITY mpc-url "https://ftp.gnu.org/gnu/mpc/mpc-&mpc-version;.tar.gz"> <!ENTITY mpc-md5 "4125404e41e482ec68282a2e687f6c73"> <!ENTITY mpc-home "http://www.multiprecision.org/"> -<!ENTITY mpc-ch6-du "22 MB"> -<!ENTITY mpc-ch6-sbu "0.3 SBU"> +<!ENTITY mpc-fin-du "22 MB"> +<!ENTITY mpc-fin-sbu "0.3 SBU"> <!ENTITY mpfr-version "4.0.2"> <!ENTITY mpfr-size "1,409 KB"> <!ENTITY mpfr-url "http://www.mpfr.org/mpfr-&mpfr-version;/mpfr-&mpfr-version;.tar.xz"> <!ENTITY mpfr-md5 "320fbc4463d4c8cb1e566929d8adc4f8"> <!ENTITY mpfr-home "https://www.mpfr.org/"> -<!ENTITY mpfr-ch6-du "37 MB"> -<!ENTITY mpfr-ch6-sbu "0.8 SBU"> +<!ENTITY mpfr-fin-du "37 MB"> +<!ENTITY mpfr-fin-sbu "0.8 SBU"> <!ENTITY ncurses-version "6.2"> <!ENTITY ncurses-size "3,346 KB"> <!ENTITY ncurses-url "&gnu;ncurses/ncurses-&ncurses-version;.tar.gz"> <!ENTITY ncurses-md5 "e812da327b1c2214ac1aed440ea3ae8d"> <!ENTITY ncurses-home "&gnu-software;ncurses/"> -<!ENTITY ncurses-ch5-du "41 MB"> -<!ENTITY ncurses-ch5-sbu "0.6 SBU"> -<!ENTITY ncurses-ch6-du "43 MB"> -<!ENTITY ncurses-ch6-sbu "0.4 SBU"> +<!ENTITY ncurses-tmp-du "41 MB"> +<!ENTITY ncurses-tmp-sbu "0.6 SBU"> +<!ENTITY ncurses-fin-du "43 MB"> +<!ENTITY ncurses-fin-sbu "0.4 SBU"> <!ENTITY ninja-version "1.10.0"> <!ENTITY ninja-size "206 KB"> <!ENTITY ninja-url "&github;/ninja-build/ninja/archive/v&ninja-version;/ninja-&ninja-version;.tar.gz"> <!ENTITY ninja-md5 "cf1d964113a171da42a8940e7607e71a"> <!ENTITY ninja-home "https://ninja-build.org/"> -<!ENTITY ninja-ch6-du "89 MB"> -<!ENTITY ninja-ch6-sbu "0.3 SBU"> +<!ENTITY ninja-fin-du "89 MB"> +<!ENTITY ninja-fin-sbu "0.3 SBU"> <!ENTITY openssl-version "1.1.1g"> <!ENTITY openssl-size "9,572 KB"> <!ENTITY openssl-url "https://www.openssl.org/source/openssl-&openssl-version;.tar.gz"> <!ENTITY openssl-md5 "76766e98997660138cdaf13a187bd234"> <!ENTITY openssl-home "https://www.openssl.org/"> -<!ENTITY openssl-ch6-du "147 MB"> -<!ENTITY openssl-ch6-sbu "2.2 SBU"> +<!ENTITY openssl-fin-du "147 MB"> +<!ENTITY openssl-fin-sbu "2.2 SBU"> <!ENTITY patch-version "2.7.6"> <!ENTITY patch-size "766 KB"> <!ENTITY patch-url "&gnu;patch/patch-&patch-version;.tar.xz"> <!ENTITY patch-md5 "78ad9937e4caadcba1526ef1853730d5"> <!ENTITY patch-home "https://savannah.gnu.org/projects/patch/"> -<!ENTITY patch-ch5-du "13 MB"> -<!ENTITY patch-ch5-sbu "0.2 SBU"> -<!ENTITY patch-ch6-du "13 MB"> -<!ENTITY patch-ch6-sbu "0.2 SBU"> +<!ENTITY patch-tmp-du "13 MB"> +<!ENTITY patch-tmp-sbu "0.2 SBU"> +<!ENTITY patch-fin-du "13 MB"> +<!ENTITY patch-fin-sbu "0.2 SBU"> <!ENTITY perl-version "5.30.3"> <!ENTITY perl-size "12,088 KB"> <!ENTITY perl-url "https://www.cpan.org/src/5.0/perl-&perl-version;.tar.xz"> <!ENTITY perl-md5 "0af2ab0f01ec13e37cc13a27de930936"> <!ENTITY perl-home "https://www.perl.org/"> -<!ENTITY perl-ch5-du "275 MB"> -<!ENTITY perl-ch5-sbu "1.5 SBU"> -<!ENTITY perl-ch6-du "272 MB"> -<!ENTITY perl-ch6-sbu "9.2 SBU"> +<!ENTITY perl-tmp-du "275 MB"> +<!ENTITY perl-tmp-sbu "1.5 SBU"> +<!ENTITY perl-fin-du "272 MB"> +<!ENTITY perl-fin-sbu "9.2 SBU"> <!ENTITY pkgconfig-version "0.29.2"> <!ENTITY pkgconfig-size "1,970 KB"> <!ENTITY pkgconfig-url "https://pkg-config.freedesktop.org/releases/pkg-config-&pkgconfig-version;.tar.gz"> <!ENTITY pkgconfig-md5 "f6e931e319531b736fadc017f470e68a"> <!ENTITY pkgconfig-home "https://www.freedesktop.org/wiki/Software/pkg-config"> -<!ENTITY pkgconfig-ch6-du "30 MB"> -<!ENTITY pkgconfig-ch6-sbu "0.3 SBU"> +<!ENTITY pkgconfig-fin-du "30 MB"> +<!ENTITY pkgconfig-fin-sbu "0.3 SBU"> <!ENTITY procps-ng-version "3.3.16"> <!ENTITY procps-ng-size "840 KB"> <!ENTITY procps-ng-url "https://sourceforge.net/projects/procps-ng/files/Production/procps-ng-&procps-ng-version;.tar.xz"> <!ENTITY procps-ng-md5 "e8dc8455e573bdc40b8381d572bbb89b"> <!ENTITY procps-ng-home "https://sourceforge.net/projects/procps-ng"> -<!ENTITY procps-ng-ch6-du "17 MB"> -<!ENTITY procps-ng-ch6-sbu "0.1 SBU"> +<!ENTITY procps-ng-fin-du "17 MB"> +<!ENTITY procps-ng-fin-sbu "0.1 SBU"> <!ENTITY psmisc-version "23.3"> <!ENTITY psmisc-size "305 KB"> <!ENTITY psmisc-url "https://sourceforge.net/projects/psmisc/files/psmisc/psmisc-&psmisc-version;.tar.xz"> <!ENTITY psmisc-md5 "573bf80e6b0de86e7f307e310098cf86"> <!ENTITY psmisc-home "http://psmisc.sourceforge.net/"> -<!ENTITY psmisc-ch6-du "4.6 MB"> -<!ENTITY psmisc-ch6-sbu "less than 0.1 SBU"> +<!ENTITY psmisc-fin-du "4.6 MB"> +<!ENTITY psmisc-fin-sbu "less than 0.1 SBU"> <!-- If python minor version changes, updates in python and meson pages will be needed: python3.6 and python3.6m --> @@ -582,10 +589,10 @@ <!ENTITY python-url "https://www.python.org/ftp/python/&python-version;/Python-&python-version;.tar.xz"> <!ENTITY python-md5 "3000cf50aaa413052aef82fd2122ca78"> <!ENTITY python-home "https://www.python.org/"> -<!ENTITY python-ch5-du "409 MB"> -<!ENTITY python-ch5-sbu "1.3 SBU"> -<!ENTITY python-ch6-du "426 MB"> -<!ENTITY python-ch6-sbu "1.2 SBU"> +<!ENTITY python-tmp-du "409 MB"> +<!ENTITY python-tmp-sbu "1.3 SBU"> +<!ENTITY python-fin-du "426 MB"> +<!ENTITY python-fin-sbu "1.2 SBU"> <!ENTITY python-docs-url "https://www.python.org/ftp/python/doc/&python-version;/python-&python-version;-docs-html.tar.bz2"> <!ENTITY python-docs-md5 "2568df23eb5ad90aabab4b1e84b99fd9"> <!ENTITY python-docs-size "6,404 KB"> @@ -595,34 +602,34 @@ <!ENTITY readline-url "&gnu;readline/readline-&readline-version;.tar.gz"> <!ENTITY readline-md5 "7e6c1f16aee3244a69aba6e438295ca3"> <!ENTITY readline-home "https://tiswww.case.edu/php/chet/readline/rltop.html"> -<!ENTITY readline-ch6-du "15 MB"> -<!ENTITY readline-ch6-sbu "0.1 SBU"> +<!ENTITY readline-fin-du "15 MB"> +<!ENTITY readline-fin-sbu "0.1 SBU"> <!ENTITY sed-version "4.8"> <!ENTITY sed-size "1,317 KB"> <!ENTITY sed-url "&gnu;sed/sed-&sed-version;.tar.xz"> <!ENTITY sed-md5 "6d906edfdb3202304059233f51f9a71d"> <!ENTITY sed-home "&gnu-software;sed/"> -<!ENTITY sed-ch5-du "21 MB"> -<!ENTITY sed-ch5-sbu "0.2 SBU"> -<!ENTITY sed-ch6-du "34 MB"> -<!ENTITY sed-ch6-sbu "0.4 SBU"> +<!ENTITY sed-tmp-du "21 MB"> +<!ENTITY sed-tmp-sbu "0.2 SBU"> +<!ENTITY sed-fin-du "34 MB"> +<!ENTITY sed-fin-sbu "0.4 SBU"> <!ENTITY shadow-version "4.8.1"> <!ENTITY shadow-size "1,574 KB"> <!ENTITY shadow-url "&github;/shadow-maint/shadow/releases/download/&shadow-version;/shadow-&shadow-version;.tar.xz"> <!ENTITY shadow-md5 "4b05eff8a427cf50e615bda324b5bc45"> <!ENTITY shadow-home "https://pkg-shadow.alioth.debian.org/"> -<!ENTITY shadow-ch6-du "46 MB"> -<!ENTITY shadow-ch6-sbu "0.2 SBU"> +<!ENTITY shadow-fin-du "46 MB"> +<!ENTITY shadow-fin-sbu "0.2 SBU"> <!ENTITY sysklogd-version "1.5.1"> <!ENTITY sysklogd-size "88 KB"> <!ENTITY sysklogd-url "http://www.infodrom.org/projects/sysklogd/download/sysklogd-&sysklogd-version;.tar.gz"> <!ENTITY sysklogd-md5 "c70599ab0d037fde724f7210c2c8d7f8"> <!ENTITY sysklogd-home "http://www.infodrom.org/projects/sysklogd/"> -<!ENTITY sysklogd-ch6-du "0.6 MB"> -<!ENTITY sysklogd-ch6-sbu "less than 0.1 SBU"> +<!ENTITY sysklogd-fin-du "0.6 MB"> +<!ENTITY sysklogd-fin-sbu "less than 0.1 SBU"> <!ENTITY systemd-version "245"> <!--<!ENTITY systemd-stable "6b4878d">--> @@ -637,26 +644,26 @@ <!--<!ENTITY systemd-man-url "&anduin-sources;/systemd-man-pages-&systemd-version;-&systemd-stable;.tar.xz">--> <!ENTITY systemd-man-url "&anduin-sources;/systemd-man-pages-&systemd-version;.tar.xz"> <!ENTITY systemd-man-md5 "ecf8cc4baa33b91ad4212d28e88f8edd"> -<!ENTITY systemd-ch6-du "176 MB"> -<!ENTITY systemd-ch6-sbu "1.9 SBU"> +<!ENTITY systemd-fin-du "176 MB"> +<!ENTITY systemd-fin-sbu "1.9 SBU"> <!ENTITY sysvinit-version "2.96"> <!ENTITY sysvinit-size "120 KB"> <!ENTITY sysvinit-url "&savannah;/releases/sysvinit/sysvinit-&sysvinit-version;.tar.xz"> <!ENTITY sysvinit-md5 "48cebffebf2a96ab09bec14bf9976016"> <!ENTITY sysvinit-home "https://savannah.nongnu.org/projects/sysvinit"> -<!ENTITY sysvinit-ch6-du "1.4 MB"> -<!ENTITY sysvinit-ch6-sbu "less than 0.1 SBU"> +<!ENTITY sysvinit-fin-du "1.4 MB"> +<!ENTITY sysvinit-fin-sbu "less than 0.1 SBU"> <!ENTITY tar-version "1.32"> <!ENTITY tar-size "2,055 KB"> <!ENTITY tar-url "&gnu;tar/tar-&tar-version;.tar.xz"> <!ENTITY tar-md5 "83e38700a80a26e30b2df054e69956e5"> <!ENTITY tar-home "&gnu-software;tar/"> -<!ENTITY tar-ch5-du "38 MB"> -<!ENTITY tar-ch5-sbu "0.3 SBU"> -<!ENTITY tar-ch6-du "45 MB"> -<!ENTITY tar-ch6-sbu "2.0 SBU"> +<!ENTITY tar-tmp-du "38 MB"> +<!ENTITY tar-tmp-sbu "0.3 SBU"> +<!ENTITY tar-fin-du "45 MB"> +<!ENTITY tar-fin-sbu "2.0 SBU"> <!ENTITY tcl-version "8.6.10"> <!ENTITY tcl-major-version "8.6"> @@ -664,18 +671,18 @@ <!ENTITY tcl-url "https://downloads.sourceforge.net/tcl/tcl&tcl-version;-src.tar.gz"> <!ENTITY tcl-md5 "97c55573f8520bcab74e21bfd8d0aadc"> <!ENTITY tcl-home "http://tcl.sourceforge.net/"> -<!ENTITY tcl-ch5-du "72 MB"> -<!ENTITY tcl-ch5-sbu "0.9 SBU"> +<!ENTITY tcl-tmp-du "72 MB"> +<!ENTITY tcl-tmp-sbu "0.9 SBU"> <!ENTITY texinfo-version "6.7"> <!ENTITY texinfo-size "4,237 KB"> <!ENTITY texinfo-url "&gnu;texinfo/texinfo-&texinfo-version;.tar.xz"> <!ENTITY texinfo-md5 "d4c5d8cc84438c5993ec5163a59522a6"> <!ENTITY texinfo-home "&gnu-software;texinfo/"> -<!ENTITY texinfo-ch5-du "104 MB"> -<!ENTITY texinfo-ch5-sbu "0.2 SBU"> -<!ENTITY texinfo-ch6-du "116 MB"> -<!ENTITY texinfo-ch6-sbu "0.7 SBU"> +<!ENTITY texinfo-tmp-du "104 MB"> +<!ENTITY texinfo-tmp-sbu "0.2 SBU"> +<!ENTITY texinfo-fin-du "116 MB"> +<!ENTITY texinfo-fin-sbu "0.7 SBU"> <!ENTITY tzdata-version "2020a"> <!ENTITY tzdata-size "388 KB"> @@ -695,10 +702,10 @@ <!ENTITY util-linux-url "&kernel;linux/utils/util-linux/v&util-linux-minor;/util-linux-&util-linux-version;.tar.xz"> <!ENTITY util-linux-md5 "248a4d0810c9193e0e9a4bb3f26b93d8"> <!ENTITY util-linux-home "http://freecode.com/projects/util-linux"> -<!ENTITY util-linux-ch5-du "154 MB"> -<!ENTITY util-linux-ch5-sbu "0.9 SBU"> -<!ENTITY util-linux-ch6-du "289 MB"> -<!ENTITY util-linux-ch6-sbu "1.1 SBU"> +<!ENTITY util-linux-tmp-du "154 MB"> +<!ENTITY util-linux-tmp-sbu "0.9 SBU"> +<!ENTITY util-linux-fin-du "289 MB"> +<!ENTITY util-linux-fin-sbu "1.1 SBU"> <!ENTITY vim-version "8.2.0814"> <!ENTITY vim-majmin "82"> @@ -708,40 +715,40 @@ <!ENTITY vim-url "&anduin-sources;/vim-&vim-version;.tar.gz"> <!ENTITY vim-md5 "02b8b91bd2a9a97879fc60616f4eb767"> <!ENTITY vim-home "https://www.vim.org"> -<!ENTITY vim-ch6-du "202 MB"> -<!ENTITY vim-ch6-sbu "1.7 SBU"> +<!ENTITY vim-fin-du "202 MB"> +<!ENTITY vim-fin-sbu "1.7 SBU"> <!ENTITY xml-parser-version "2.46"> <!ENTITY xml-parser-size "249 KB"> <!ENTITY xml-parser-url "https://cpan.metacpan.org/authors/id/T/TO/TODDR/XML-Parser-&xml-parser-version;.tar.gz"> <!ENTITY xml-parser-md5 "80bb18a8e6240fcf7ec2f7b57601c170"> <!ENTITY xml-parser-home "&github;/chorny/XML-Parser"> -<!ENTITY xml-parser-ch6-du "2.4 MB"> -<!ENTITY xml-parser-ch6-sbu "less than 0.1 SBU"> +<!ENTITY xml-parser-fin-du "2.4 MB"> +<!ENTITY xml-parser-fin-sbu "less than 0.1 SBU"> <!ENTITY xz-version "5.2.5"> <!ENTITY xz-size "1,122 KB"> <!ENTITY xz-url "https://tukaani.org/xz/xz-&xz-version;.tar.xz"> <!ENTITY xz-md5 "aa1621ec7013a19abab52a8aff04fe5b"> <!ENTITY xz-home "https://tukaani.org/xz"> -<!ENTITY xz-ch5-du "18 MB"> -<!ENTITY xz-ch5-sbu "0.2 SBU"> -<!ENTITY xz-ch6-du "16 MB"> -<!ENTITY xz-ch6-sbu "0.2 SBU"> +<!ENTITY xz-tmp-du "18 MB"> +<!ENTITY xz-tmp-sbu "0.2 SBU"> +<!ENTITY xz-fin-du "16 MB"> +<!ENTITY xz-fin-sbu "0.2 SBU"> <!ENTITY zlib-version "1.2.11"> <!ENTITY zlib-size "457 KB"> <!ENTITY zlib-url "https://zlib.net/zlib-&zlib-version;.tar.xz"> <!ENTITY zlib-md5 "85adef240c5f370b308da8c938951a68"> <!ENTITY zlib-home "https://www.zlib.net/"> -<!ENTITY zlib-ch6-du "5.1 MB"> -<!ENTITY zlib-ch6-sbu "less than 0.1 SBU"> +<!ENTITY zlib-fin-du "5.1 MB"> +<!ENTITY zlib-fin-sbu "less than 0.1 SBU"> <!ENTITY zstd-version "1.4.5"> <!ENTITY zstd-size "1,928 KB"> <!ENTITY zstd-url "https://github.com/facebook/zstd/releases/download/v&zstd-version;/zstd-&zstd-version;.tar.gz"> <!ENTITY zstd-md5 "dd0b53631303b8f972dafa6fd34beb0c"> <!ENTITY zstd-home "https://facebook.github.io/zstd/"> -<!ENTITY zstd-ch6-du "16 MB"> -<!ENTITY zstd-ch6-sbu "0.7 SBU"> +<!ENTITY zstd-fin-du "16 MB"> +<!ENTITY zstd-fin-sbu "0.7 SBU"> -- cgit v1.2.3-54-g00ecf From 77d2cd8d437a6ba11e13ac0af109a887582e988b Mon Sep 17 00:00:00 2001 From: Pierre Labastie <pieere@linuxfromscratch.org> Date: Sat, 13 Jun 2020 08:55:55 +0000 Subject: - fix some gcc->GCC - remove commented text in glibc (chap 5), and fix a directory location git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/cross2@11934 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- chapter05/gcc-pass1.xml | 2 +- chapter05/glibc.xml | 25 ++++--------------------- chapter05/toolchaintechnotes.xml | 2 +- chapter06/gcc-pass2.xml | 2 +- chapter08/libffi.xml | 4 ++-- chapter08/strippingagain.xml | 2 +- 6 files changed, 10 insertions(+), 27 deletions(-) (limited to 'chapter06/gcc-pass2.xml') diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml index e2a13a003..0cd852ee6 100644 --- a/chapter05/gcc-pass1.xml +++ b/chapter05/gcc-pass1.xml @@ -193,7 +193,7 @@ cd build</userinput></screen> headers. Normally one of them, <filename>limits.h</filename>, would in turn include the corresponding system <filename>limits.h</filename> header, in this case, <filename>$LFS/usr/include/limits.h</filename>. However, at the - time of this build of gcc <filename>$LFS/usr/include/limits.h</filename> + time of this build of GCC <filename>$LFS/usr/include/limits.h</filename> does not exist, so the internal header that has just been installed is a partial, self-contained file and does not include the extended features of the system header. This is adequate for building glibc, but the full diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml index 6e14f0c7d..1b72b4e20 100644 --- a/chapter05/glibc.xml +++ b/chapter05/glibc.xml @@ -99,9 +99,10 @@ cd build</userinput></screen> <varlistentry> <term><parameter>--with-headers=$LFS/usr/include</parameter></term> <listitem> - <para>This tells Glibc to compile itself against the headers recently - installed to the usr/include directory, so that it knows exactly what - features the kernel has and can optimize itself accordingly.</para> + <para>This tells Glibc to compile itself against the headers + recently installed to the $LFS/usr/include directory, so that + it knows exactly what features the kernel has and can optimize + itself accordingly.</para> </listitem> </varlistentry> @@ -112,24 +113,6 @@ cd build</userinput></screen> of the default /lib64 on 64 bit machines.</para> </listitem> </varlistentry> -<!-- - <varlistentry> - <term><parameter>libc_cv_c_cleanup=yes</parameter></term> - <listitem> - <para>Similarly, we pass libc_cv_c_cleanup=yes through to the - <command>configure</command> script so that the test is skipped and C - cleanup handling support is configured.</para> - </listitem> - </varlistentry> - - <varlistentry> - <term><parameter>libc_cv_ctors_header=yes</parameter></term> - <listitem> - <para>Similarly, we pass libc_cv_ctors_header=yes through to the - <command>configure</command> script so that the test is skipped and - gcc constructor support is configured.</para> - </listitem> - </varlistentry>--> </variablelist> diff --git a/chapter05/toolchaintechnotes.xml b/chapter05/toolchaintechnotes.xml index 9e582e345..1e7086aaf 100644 --- a/chapter05/toolchaintechnotes.xml +++ b/chapter05/toolchaintechnotes.xml @@ -227,7 +227,7 @@ this is the only compiler available for building the C/C++ libraries during stage 2! Of course, the compiler built during stage 2, cc-lfs, would be able to build those libraries, but (1) the build system of - gcc does not know that it is usable on pc, and (2) using it on pc + GCC does not know that it is usable on pc, and (2) using it on pc would be at risk of linking to the pc libraries, since cc-lfs is a native compiler. So we have to build libstdc++ later, in chroot.</para> diff --git a/chapter06/gcc-pass2.xml b/chapter06/gcc-pass2.xml index 532a8e8b4..c64d6f780 100644 --- a/chapter06/gcc-pass2.xml +++ b/chapter06/gcc-pass2.xml @@ -109,7 +109,7 @@ ln -s ../../../libgcc/gthr-posix.h $LFS_TGT/libgcc/gthr-default.h</userinput></s <term><parameter>-with-build-sysroot=$LFS</parameter></term> <listitem> <para>Normally, using <parameter>--host</parameter> ensures that - a cross-compiler is used for building gcc, and that compiler knows + a cross-compiler is used for building GCC, and that compiler knows that it has to look for headers and libraries in <filename class="directory">$LFS</filename>. But the build system of GCC uses other tools, which are not aware of this location. This switch is diff --git a/chapter08/libffi.xml b/chapter08/libffi.xml index 3b5347992..b6a49b122 100644 --- a/chapter08/libffi.xml +++ b/chapter08/libffi.xml @@ -60,14 +60,14 @@ <varlistentry> <term><parameter>--with-gcc-arch=native</parameter></term> <listitem> - <para>Ensure gcc optimizes for the current system. If this + <para>Ensure GCC optimizes for the current system. If this is not specified, the system is guessed and the code generated may not be correct for some systems. If the generated code will be copied from the native system to a less capable system, use the less capable system as a parameter. For details about alternative system types, see <ulink url='https://gcc.gnu.org/onlinedocs/gcc-&gcc-version;/gcc/x86-Options.html'> - the x86 options in the gcc manual</ulink>.</para> + the x86 options in the GCC manual</ulink>.</para> </listitem> </varlistentry> diff --git a/chapter08/strippingagain.xml b/chapter08/strippingagain.xml index d436fcbda..891d2e000 100644 --- a/chapter08/strippingagain.xml +++ b/chapter08/strippingagain.xml @@ -30,7 +30,7 @@ url='&blfs-book;/general/gdb.html'>gdb</ulink> later in BLFS. </para> -<!-- also of interest are libgfortan, libgo, libgomp, and libobjc from gcc --> +<!-- also of interest are libgfortan, libgo, libgomp, and libobjc from GCC --> <!--<screen><userinput>save_lib="ld-2.25.so libc-2.25.so libpthread-2.25.so libthread_db-1.0.so"--> <screen><userinput>save_lib="ld-&glibc-version;.so libc-&glibc-version;.so libpthread-&glibc-version;.so libthread_db-&libthread_db-version;.so" -- cgit v1.2.3-54-g00ecf