diff options
| -rw-r--r-- | chapter06/ncurses.xml | 19 | ||||
| -rw-r--r-- | chapter07/stripping.xml | 17 | ||||
| -rw-r--r-- | chapter08/automake.xml | 14 | ||||
| -rw-r--r-- | chapter08/bison.xml | 25 | ||||
| -rw-r--r-- | chapter08/shadow.xml | 3 |
5 files changed, 17 insertions, 61 deletions
diff --git a/chapter06/ncurses.xml b/chapter06/ncurses.xml index 38da3ca22..5c48b3619 100644 --- a/chapter06/ncurses.xml +++ b/chapter06/ncurses.xml @@ -106,30 +106,13 @@ popd</userinput></screen> </varlistentry> <varlistentry> - <term><parameter>--enable-pc-files</parameter></term> - <listitem> - <para>This switch generates and installs .pc files for pkg-config. - </para> - </listitem> - </varlistentry> - - <varlistentry> <term><parameter>--without-normal</parameter></term> <listitem> <para>This switch disables building and installing most static libraries. </para> </listitem> </varlistentry> - <!-- - <varlistentry> - <term><parameter>- -disable-db-install</parameter></term> - <listitem> - <para>This switch disables building the terminfo database: it is not - needed at this stage, and if <command>tic</command> is too old, - it cannot compile recent databases.</para> - </listitem> - </varlistentry> - --> + </variablelist> <para>Compile the package:</para> diff --git a/chapter07/stripping.xml b/chapter07/stripping.xml index 431affdc3..a31faadc3 100644 --- a/chapter07/stripping.xml +++ b/chapter07/stripping.xml @@ -107,7 +107,7 @@ strip --strip-unneeded $LFS/tools/bin/*</userinput></screen> </sect2> <sect2> - <title>Backup / Restore</title> + <title>Backup</title> <para> Now that the essential tools have been created, its time to think about @@ -141,6 +141,10 @@ tar -cJpf $HOME/lfs-temp-tools-&versiond;.tar.xz .</userinput></screen> do not want to have the backup stored in <systemitem class="username">root</systemitem>'s home directory. </para> + </sect2> + + <sect2> + <title>Restore</title> <para> In case some mistakes have been made and you need to start over, you can @@ -152,13 +156,16 @@ tar -cJpf $HOME/lfs-temp-tools-&versiond;.tar.xz .</userinput></screen> restore the backup by executing the following commands: </para> -<screen role="nodump" revision="sysv"><userinput>cd $LFS && +<!-- Make the following look different so users don't blindly run the + restore when they don't need to. --> + +<screen role="nodump" revision="sysv"><computeroutput>cd $LFS && rm -rf ./* && -tar -xpf $HOME/lfs-temp-tools-&version;.tar.xz</userinput></screen> +tar -xpf $HOME/lfs-temp-tools-&version;.tar.xz</computeroutput></screen> -<screen role="nodump" revision="systemd"><userinput>cd $LFS && +<screen role="nodump" revision="systemd"><computeroutput>cd $LFS && rm -rf ./* && -tar -xpf $HOME/lfs-temp-tools-&versiond;.tar.xz</userinput></screen> +tar -xpf $HOME/lfs-temp-tools-&versiond;.tar.xz</computeroutput></screen> <para> Again, double check that the environment has been setup properly diff --git a/chapter08/automake.xml b/chapter08/automake.xml index 7c4143e91..f89f71ced 100644 --- a/chapter08/automake.xml +++ b/chapter08/automake.xml @@ -53,26 +53,12 @@ <screen><userinput remap="make">make</userinput></screen> -<!--<para>There are a couple of tests that incorrectly link to the - wrong version of the flex library, so we temporarily work around - the problem. Also, using the -j4 make option speeds up the tests, even on - systems with only one processor, due to internal delays in individual - tests. To test the results, issue:</para> - --> - <para> Using the -j4 make option speeds up the tests, even on systems with only one processor, due to internal delays in individual tests. To test the results, issue:</para> - <!--<screen><userinput remap="test">sed -i "s:./configure:LEXLIB=/usr/lib/libfl.a &:" t/lex-{clean,depend}-cxx.sh - make -j4 check</userinput></screen>--> - <screen><userinput remap="test">make -j4 check</userinput></screen> - - <para>One test is known to fail in the LFS environment: - tags-lisp-space.sh.</para> - <para>Install the package:</para> <screen><userinput remap="install">make install</userinput></screen> diff --git a/chapter08/bison.xml b/chapter08/bison.xml index 687cdf9ee..1727660d8 100644 --- a/chapter08/bison.xml +++ b/chapter08/bison.xml @@ -39,38 +39,19 @@ <sect2 role="installation"> <title>Installation of Bison</title> -<!-- - <para>First, fix a build problem with the current version:</para> -<screen><userinput remap="pre">sed -i '9327 s/mv/cp/' Makefile.in</userinput></screen> ---> <para>Prepare Bison for compilation:</para> <screen><userinput remap="configure">./configure --prefix=/usr --docdir=/usr/share/doc/bison-&bison-version;</userinput></screen> -<!-- I could not find a race condidtion in the current version. - <para>Compile the package, but work around a race condition in the - current version:</para> - -<screen><userinput remap="make">make -j1</userinput></screen>--> - <para>Compile the package:</para> <screen><userinput remap="make">make</userinput></screen> - <para>To test the results (about 5.5 SBU), issue:</para> - -<screen><userinput remap="test">make check</userinput></screen> - - <para>Fourteen tests fail in the "Diagnostics" section, probably because of - missing locales.</para> + <para>The tests are known to fail using multiple processors. + To test the results (about 5.5 SBU), issue:</para> -<!-- - <para>There is a circular dependency between bison and flex with regard to - the checks. If desired, after installing flex in the next section, the - bison package can be rebuilt and the bison checks can be run with - <command>make check</command>.</para> ---> +<screen><userinput remap="test">make -j1 check</userinput></screen> <para>Install the package:</para> diff --git a/chapter08/shadow.xml b/chapter08/shadow.xml index 36a81d966..3ccbfbb58 100644 --- a/chapter08/shadow.xml +++ b/chapter08/shadow.xml @@ -67,8 +67,7 @@ find man -name Makefile.in -exec sed -i 's/passwd\.5 / /' {} \;</userinput></s for user mailboxes that Shadow uses by default to the <filename class="directory">/var/mail</filename> location used currently:</para> -<screen><userinput remap="pre"> -sed -e 's:#ENCRYPT_METHOD DES:ENCRYPT_METHOD SHA512:' \ +<screen><userinput remap="pre">sed -e 's:#ENCRYPT_METHOD DES:ENCRYPT_METHOD SHA512:' \ -e 's:/var/spool/mail:/var/mail:' \ -i etc/login.defs</userinput></screen> |