Changeset c179964

Timestamp:

08/25/2023 04:46:41 PM (9 months ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

12.0, 12.1, 12.1-rc1, multilib, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/update-glibc

Children:

909f284, f83f864

Parents:

1e9ad78 (diff), 0f5e0b4 (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:

• chapter08/libxcrypt.xml (modified) (1 diff)
• chapter10/grub.xml (modified) (1 diff)
• packages.ent (modified) (1 diff)

chapter08/libxcrypt.xml

@@ -101 +101 @@
       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 \

chapter10/grub.xml

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

packages.ent

@@ -766 +766 @@
 <!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/">