aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Dubbs <bdubbs@linuxfromscratch.org>2023-08-25 11:46:41 -0500
committerBruce Dubbs <bdubbs@linuxfromscratch.org>2023-08-25 11:46:41 -0500
commitc179964257acc88d7728cceac3de6784c03c05d1 (patch)
tree6f15bda8f5c33b64bda117e60ac5809e1573ab32
parent1e9ad78f818044104de05888a80e513b30585063 (diff)
parent0f5e0b42aeb116836aa1bcd1c9d1f29c69468cd9 (diff)
Merge branch 'trunk' of git.linuxfromscratch.org:lfs into trunk
-rw-r--r--chapter08/libxcrypt.xml4
-rw-r--r--chapter10/grub.xml6
-rw-r--r--packages.ent2
3 files changed, 7 insertions, 5 deletions
diff --git a/chapter08/libxcrypt.xml b/chapter08/libxcrypt.xml
index 3fb59941d..1838a55b6 100644
--- a/chapter08/libxcrypt.xml
+++ b/chapter08/libxcrypt.xml
@@ -100,10 +100,10 @@
them at runtime. However, the only known binary-only applications
that link against these functions require ABI version 1. If you must
have such functions because of some binary-only application or to be
- to be compliant with LSB, build the package again with the following
+ compliant with LSB, build the package again with the following
commands:</para>
-<screen><userinput remap="nodump">make distclean
+<screen role="nodump"><userinput>make distclean
./configure --prefix=/usr \
--enable-hashes=strong,glibc \
--enable-obsolete-api=glibc \
diff --git a/chapter10/grub.xml b/chapter10/grub.xml
index f232a1675..1b2335623 100644
--- a/chapter10/grub.xml
+++ b/chapter10/grub.xml
@@ -19,8 +19,10 @@
<note>
<para>
If your system has UEFI support and you wish to boot LFS with UEFI,
- you should skip this page, and configure GRUB with UEFI support
- using the instructions provided in
+ you should skip the instructions in this page but still learn the
+ syntax of <filename>grub.cfg</filename> and the method to specify
+ a partition in the file from this page, and configure GRUB with UEFI
+ support using the instructions provided in
<ulink url="&blfs-book;postlfs/grub-setup.html">the BLFS page</ulink>.
</para>
</note>
diff --git a/packages.ent b/packages.ent
index 46122ee1b..67ad4012c 100644
--- a/packages.ent
+++ b/packages.ent
@@ -765,7 +765,7 @@
<!ENTITY zlib-version "1.2.13">
<!ENTITY zlib-size "1267 KB">
-<!ENTITY zlib-url "https://zlib.net/zlib-&zlib-version;.tar.xz">
+<!ENTITY zlib-url "&anduin-sources;/zlib-&zlib-version;.tar.xz">
<!ENTITY zlib-md5 "7d9fc1d78ae2fa3e84fe98b77d006c63">
<!ENTITY zlib-home "https://www.zlib.net/">
<!ENTITY zlib-fin-du "6.2 MB">