From 8002bc91b4dbd2c92059f2b5ed39ff762d049ae7 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Tue, 8 Aug 2023 08:28:23 +0800
Subject: [PATCH 1/4] whatsnew: Change "pkgconf" to "Pkgconf" and comment it
 out for now from Updated

In 12.0, pkgconf is a new package so it should be considered "Added"
since 11.3, and it's already in the Added section.

Also make the first letter captialized to be consistent with other
entries.
---
 chapter01/whatsnew.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 4b95515cc..50eb75507 100644
--- a/chapter01/whatsnew.xml
+++ b/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>

From 70b20e7c25088c5bc42bcb176f0dff4d9b1a552f Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Tue, 8 Aug 2023 08:31:33 +0800
Subject: [PATCH 2/4] changelog: Use a dash before pkgconf version number

To be consistent will all other entries.
---
 chapter01/changelog.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index df8af5973..5f0b0a98c 100644
--- a/chapter01/changelog.xml
+++ b/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>

From f4835ed6ad3d808c4f06cd109e657120e8f22fb5 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Tue, 8 Aug 2023 08:35:21 +0800
Subject: [PATCH 3/4] pkgconf: Reword the reason of sed

Specifying --modversion with multiple packages just does not make sense.
The real problem here is it's erroring out even if the multiple
arguments are for the same package.
---
 chapter08/pkgconf.xml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/chapter08/pkgconf.xml b/chapter08/pkgconf.xml
index 8c1031b14..7a9569178 100644
--- a/chapter08/pkgconf.xml
+++ b/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>
 

From 9cca53dcac7a29b471491be27076cfcc06f21921 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Tue, 8 Aug 2023 11:12:36 +0800
Subject: [PATCH 4/4] kernel: Fix move-if-changed logic and regenerate with
 6.4.8

---
 chapter10/kernel/Makefile       | 8 ++++++--
 chapter10/kernel/kernel.version | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/chapter10/kernel/Makefile b/chapter10/kernel/Makefile
index d02408dcc..e04d2d6b1 100644
--- a/chapter10/kernel/Makefile
+++ b/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
 
diff --git a/chapter10/kernel/kernel.version b/chapter10/kernel/kernel.version
index 3c43d7159..4b20d9700 100644
--- a/chapter10/kernel/kernel.version
+++ b/chapter10/kernel/kernel.version
@@ -1 +1 @@
-6.4.7
+6.4.8