Author: bdubbs
Date: Sun Jun 14 08:24:09 2020
New Revision: 11939
Log:
Minor updates.
Modified:
branches/cross2/chapter06/ncurses.xml
branches/cross2/chapter07/stripping.xml
branches/cross2/chapter08/automake.xml
branches/cross2/chapter08/bison.xml
branches/cross2/chapter08/shadow.xml
Modified: branches/cross2/chapter06/ncurses.xml
==============================================================================
--- branches/cross2/chapter06/ncurses.xml Sun Jun 14 06:00:39 2020
(r11938)
+++ branches/cross2/chapter06/ncurses.xml Sun Jun 14 08:24:09 2020
(r11939)
@@ -106,30 +106,13 @@
</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>
Modified: branches/cross2/chapter07/stripping.xml
==============================================================================
--- branches/cross2/chapter07/stripping.xml Sun Jun 14 06:00:39 2020
(r11938)
+++ branches/cross2/chapter07/stripping.xml Sun Jun 14 08:24:09 2020
(r11939)
@@ -107,7 +107,7 @@
</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 @@
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 @@
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
Modified: branches/cross2/chapter08/automake.xml
==============================================================================
--- branches/cross2/chapter08/automake.xml Sun Jun 14 06:00:39 2020
(r11938)
+++ branches/cross2/chapter08/automake.xml Sun Jun 14 08:24:09 2020
(r11939)
@@ -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>
Modified: branches/cross2/chapter08/bison.xml
==============================================================================
--- branches/cross2/chapter08/bison.xml Sun Jun 14 06:00:39 2020 (r11938)
+++ branches/cross2/chapter08/bison.xml Sun Jun 14 08:24:09 2020 (r11939)
@@ -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>
Modified: branches/cross2/chapter08/shadow.xml
==============================================================================
--- branches/cross2/chapter08/shadow.xml Sun Jun 14 06:00:39 2020
(r11938)
+++ branches/cross2/chapter08/shadow.xml Sun Jun 14 08:24:09 2020
(r11939)
@@ -67,8 +67,7 @@
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>
--
http://lists.linuxfromscratch.org/listinfo/lfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
