Changeset 0e89a47

Timestamp:

08/20/2021 08:48:12 PM (3 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

11.0, 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:

b649e6b, c443cc7, fd6a5f8

Parents:

de8b6cb (diff), 3089d45 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'trunk' of git.linuxfromscratch.org:lfs into trunk

Files:

• appendices/dependencies.xml (modified) (1 diff)
• chapter02/hostreqs.xml (modified) (1 diff)
• chapter11/reboot.xml (modified) (2 diffs)

appendices/dependencies.xml

@@ -2578 +2578 @@
           <seg>
             <ulink url="&blfs-book;server/db.html">Berkeley DB</ulink>,
-            <ulink url="&blfs-book;server/sqlite.html"> SQLite</ulink>, and
+            <ulink url="&blfs-book;basicnet/libnsl.html">libnsl</ulink>,
+            <ulink url="&blfs-book;server/sqlite.html">SQLite</ulink>, and
             <ulink url="&blfs-book;general/tk.html">Tk</ulink>
           </seg>

chapter02/hostreqs.xml

@@ -86 +86 @@
 
       <para>The reason for the kernel version requirement is that we specify
-      that version when building <application>glibc</application> in Chapter&nbsp;6
+      that version when building <application>glibc</application> in
+      <xref linkend="chapter-cross-tools"/> and
+      <xref linkend="chapter-building-system"/>,
       at the recommendation of the developers.  It is also required by
       udev.</para>

chapter11/reboot.xml

@@ -37 +37 @@
     terminals.</para></listitem>
 
-    <listitem><para>If you are in a situation where static IP configuration
+    <listitem revision="sysv"><para>
+    If you are in a situation where static IP configuration
     does not meet your networking requirements, installing a package
     such as <ulink url='&blfs-book;basicnet/dhcpcd.html'>dhcpcd</ulink>
@@ -56 +57 @@
     <listitem><para>To make fetching files over the internet easier, install
     <ulink url='&blfs-book;basicnet/wget.html'>wget</ulink>.
+    </para></listitem>
+
+    <listitem><para>To connect to a wireless access point for networking,
+    install
+    <ulink url='&blfs-book;basicnet/wpa_supplicant.html'>wpa_supplicant</ulink>.
     </para></listitem>