aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Trepl <thomas@linuxfromscratch.org>2023-11-27 00:30:18 +0100
committerThomas Trepl <thomas@linuxfromscratch.org>2023-11-27 00:30:18 +0100
commit0959b7b711499de8ae1bd0282172b5c3ce8364b4 (patch)
tree42483dad9c117ab5c521e85c5ef5989bef7b2ca9
parenta3947fc2473bc92d2521a4e92425f9780b7f91de (diff)
parent2f82ad1e163c228162a30d402bde64b7fa53ca45 (diff)
Automatic merge of trunk into multilib
-rw-r--r--appendices/dependencies.xml7
-rw-r--r--chapter08/iproute2.xml3
2 files changed, 4 insertions, 6 deletions
diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml
index 73194612c..55c6110ff 100644
--- a/appendices/dependencies.xml
+++ b/appendices/dependencies.xml
@@ -6,6 +6,7 @@
<!-- Convenient entity for "Systemd" or "Udev" -->
<!ENTITY systemd-udev "<phrase revision='systemd'>Systemd</phrase>
<phrase revision='sysv'>Udev</phrase>">
+ <!ENTITY bdb "<ulink url='https://www.oracle.com/database/technologies/related/berkeleydb.html'>Berkeley DB</ulink>">
]>
<appendix id="appendixc" xreflabel="Appendix C">
@@ -1486,7 +1487,7 @@
<segtitle>&external;</segtitle>
<seglistitem>
<seg>
- <ulink url="&blfs-book;server/db.html">Berkeley DB</ulink>,
+ &bdb;,
<ulink url="&blfs-book;postlfs/iptables.html">iptables</ulink>,
<ulink url="&github;/libbpf/libbpf">libbpf</ulink>,
<ulink url="&blfs-book;basicnet/libmnl.html">libmnl</ulink>, and
@@ -2486,7 +2487,7 @@
<segtitle>&external;</segtitle>
<seglistitem>
<seg>
- <ulink url="&blfs-book;server/db.html">Berkeley DB</ulink>
+ &bdb;
</seg>
</seglistitem>
</segmentedlist>
@@ -2655,7 +2656,7 @@
<segtitle>&external;</segtitle>
<seglistitem>
<seg>
- <ulink url="&blfs-book;server/db.html">Berkeley DB</ulink>,
+ &bdb;,
<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>
diff --git a/chapter08/iproute2.xml b/chapter08/iproute2.xml
index bfc25331a..cd3e5a658 100644
--- a/chapter08/iproute2.xml
+++ b/chapter08/iproute2.xml
@@ -45,9 +45,6 @@
be built since it depends on Berkeley DB, which is not installed in
LFS. However, a directory and a man page for <command>arpd</command> will still
be installed. Prevent this by running the commands shown below.
- (If the <command>arpd</command> program is needed,
- instructions for compiling Berkeley DB can be found in the BLFS book at
- <ulink url="&blfs-book;server/db.html"/>.)
</para>
<screen><userinput remap="pre">sed -i /ARPD/d Makefile