diff options
| -rw-r--r-- | chapter06/bash.xml | 2 | ||||
| -rw-r--r-- | chapter06/coreutils.xml | 12 | ||||
| -rw-r--r-- | chapter06/file.xml | 3 | ||||
| -rw-r--r-- | chapter06/gcc-pass2.xml | 9 | ||||
| -rw-r--r-- | chapter06/introduction.xml | 6 | ||||
| -rw-r--r-- | chapter06/ncurses.xml | 10 | ||||
| -rw-r--r-- | chapter06/tar.xml | 3 | ||||
| -rw-r--r-- | chapter06/xz.xml | 7 | ||||
| -rw-r--r-- | chapter08/findutils.xml | 2 | ||||
| -rw-r--r-- | chapter08/grep.xml | 2 | ||||
| -rw-r--r-- | chapter08/make.xml | 4 | ||||
| -rw-r--r-- | chapter08/tar.xml | 5 | ||||
| -rw-r--r-- | general.ent | 8 |
13 files changed, 37 insertions, 36 deletions
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 – --> |