Changeset 539f011

Timestamp:

08/08/2023 09:07:30 PM (10 months ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

12.0, 12.0-rc1, 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:

45708d8, 91f9a17, da584239, f7d3b6e

Parents:

45f40e8 (diff), 9cca53d (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:

• chapter01/changelog.xml (modified) (2 diffs)
• chapter01/whatsnew.xml (modified) (1 diff)
• chapter08/pkgconf.xml (modified) (1 diff)
• chapter10/kernel/Makefile (modified) (1 diff)
• chapter10/kernel/kernel.version (modified) (1 diff)

chapter01/changelog.xml

@@ -64 +64 @@
         </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>
@@ -254 +254 @@
         </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>

chapter01/whatsnew.xml

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

chapter08/pkgconf.xml

@@ -45 +45 @@
     <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,1336s|^|//|' cli/main.c</userinput></screen>

chapter10/kernel/Makefile

@@ -9 +9 @@
 
 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 @@
-6.4.7
+6.4.8