Automatic merge of trunk into multilib

chapter01/changelog.xml

@@ -63,7 +63,7 @@
           <ulink url='&lfs-ticket-root;5006'>#5006</ulink>.</para>
         </listitem>
         <listitem>
-          <para>[rahul] - Update to pkgconf 2.0.0. Fixes
+          <para>[rahul] - Update to pkgconf-2.0.0. Fixes
           <ulink url='&lfs-ticket-root;5310'>#5310</ulink>.</para>
         </listitem>
       </itemizedlist>
@@ -253,7 +253,7 @@
           <ulink url='&lfs-ticket-root;5273'>#5273</ulink>.</para>
         </listitem>
         <listitem>
-          <para>[rahul] - Changed from pkg-config to pkgconf 1.9.5.  Fixes
+          <para>[rahul] - Changed from pkg-config to pkgconf-1.9.5.  Fixes
           <ulink url='&lfs-ticket-root;5274'>#5274</ulink>.</para>
         </listitem>
       </itemizedlist>

chapter01/whatsnew.xml

@@ -226,9 +226,9 @@
     <!--<listitem>
       <para>Patch-&patch-version;</para>
     </listitem>-->
-    <listitem>
-      <para>pkgconf-&pkgconf-version;</para>
-    </listitem>
+    <!--<listitem>
+      <para>Pkgconf-&pkgconf-version;</para>
+    </listitem>-->
     <listitem>
       <para>Perl-&perl-version;</para>
     </listitem>

chapter08/pkgconf.xml

@@ -44,10 +44,11 @@
 
     <title>Installation of Pkgconf</title>
 
-    <para>Pkgconf 2.0.0 explicitly errors when attempting to run
-           --modversion with multiple packages. This breaks many
-           packages in BLFS. Run this sed to reinstate the old 
-           output for pkgconf.</para>
+    <para>Pkgconf-2.0.0 explicitly errors when attempting to run
+    <option>--modversion</option> with multiple arguments, even if these
+    arguments are constraints for the same package.  This breaks many
+    packages in BLFS. Run this sed to reinstate the old
+    output for pkgconf:</para>
 
      <screen><userinput remap="pre">sed -i '/1330,1336/s|^|//|' cli/main.c</userinput></screen>
 

chapter10/kernel/Makefile

@@ -8,10 +8,14 @@ endif
 all: $(OUTPUT)
 
 kernel.version: s-kernel-version; @true
-s-kernel-version: Makefile kernel_version.py
+
+.PHONY: s-kernel-version
+s-kernel-version:
 	./kernel_version.py $(KERNEL_TREE) > tmp-kernel.version
-	if ! diff tmp-kernel.version $@ 2>/dev/null >/dev/null; then \
+	if ! diff tmp-kernel.version kernel.version ; then           \
 		mv tmp-kernel.version kernel.version;                    \
+	else                                                         \
+		rm tmp-kernel.version;                                   \
 	fi
 	touch s-kernel-version
 

chapter10/kernel/kernel.version

@@ -1 +1 @@
-6.4.7
+6.4.8