Changeset 3d92d63

Timestamp:

06/14/2020 03:24:09 PM (4 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

10.0, 10.0-rc1, 10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

6e18f2f

Parents:

a4053b5b

Message:

Minor updates.

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/branches/cross2@11939 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Files:

• chapter06/ncurses.xml (modified) (2 diffs)
• chapter07/stripping.xml (modified) (3 diffs)
• chapter08/automake.xml (modified) (1 diff)
• chapter08/bison.xml (modified) (2 diffs)
• chapter08/shadow.xml (modified) (1 diff)

chapter06/ncurses.xml

@@ -107 +107 @@
 
       <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>
@@ -121 +113 @@
         </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>
 

chapter07/stripping.xml

@@ -108 +108 @@
 
   <sect2>
-    <title>Backup / Restore</title>
+    <title>Backup</title>
 
     <para>
@@ -142 +142 @@
       class="username">root</systemitem>'s home directory.
     </para>
+  </sect2>
+
+  <sect2>
+    <title>Restore</title>
 
     <para>
@@ -153 +157 @@
     </para>
 
-<screen role="nodump" revision="sysv"><userinput>cd $LFS &amp;&amp;
+<!-- 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 &amp;&amp;
 rm -rf ./* &amp;&amp;
-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 &amp;&amp;
+<screen role="nodump" revision="systemd"><computeroutput>cd $LFS &amp;&amp;
 rm -rf ./* &amp;&amp;
-tar -xpf $HOME/lfs-temp-tools-&versiond;.tar.xz</userinput></screen>
+tar -xpf $HOME/lfs-temp-tools-&versiond;.tar.xz</computeroutput></screen>
 
     <para>

chapter08/automake.xml

@@ -54 +54 @@
 <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 &amp;:" 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>

chapter08/bison.xml

@@ -40 +40 @@
   <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>
@@ -59 +49 @@
 <screen><userinput remap="make">make</userinput></screen>
 
-    <para>To test the results (about 5.5 SBU), issue:</para>
+    <para>The tests are known to fail using multiple processors. 
+    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>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>

chapter08/shadow.xml

@@ -68 +68 @@
     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>