Merge branch 'trunk' into multilib

chapter05/glibc.xml

@@ -93,9 +93,9 @@ cd       build</userinput></screen>
       --prefix=/usr                      \
       --host=$LFS_TGT                    \
       --build=$(../scripts/config.guess) \
-      --enable-kernel=&min-kernel;               \
       --disable-nscd                     \
-      libc_cv_slibdir=/usr/lib</userinput></screen>
+      libc_cv_slibdir=/usr/lib           \
+      --enable-kernel=&min-kernel;</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure options:</title>

chapter08/glibc.xml

@@ -68,12 +68,12 @@ cd       build</userinput></screen>
 
     <para>Prepare Glibc for compilation:</para>
 
-<screen><userinput remap="configure">../configure --prefix=/usr       \
-             --disable-werror    \
-             --disable-nscd      \
-             --enable-kernel=&min-kernel;\
-             libc_cv_slibdir=/usr/lib \
-             --enable-stack-protector=strong</userinput></screen>
+<screen><userinput remap="configure">../configure --prefix=/usr                   \
+             --disable-werror                \
+             --disable-nscd                  \
+             libc_cv_slibdir=/usr/lib        \
+             --enable-stack-protector=strong \
+             --enable-kernel=&min-kernel;</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure options:</title>

general.ent

@@ -96,10 +96,8 @@
 <!ENTITY secadv          "&lfs-root;lfs/advisories/">
 
 <!-- 5.4 EOL is Dec 2025
-     so for LFS 12.5 we may consider moving to 5.10.
-     Keep an extra whitespace here to align the trailing "\" in glibc
-     configure command if y < 10 in x.y.  -->
-<!ENTITY min-kernel      "5.4 ">
+	 so for LFS 12.5 we may consider moving to 5.10. -->
+<!ENTITY min-kernel      "5.4">
 
 <!--
 <!ENTITY patches-rootd   "&lfs-root;patches/lfs/&generic-versiond;/">