gronod/lfs
1
0
Fork 0
mirror of https://git.linuxfromscratch.org/lfs.git synced 2025-06-19 03:39:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Automatic merge of trunk into multilib

Browse Source
This commit is contained in:
Thomas Trepl 2023-08-08 15:22:00 +02:00
commit 5a1f88329c
5 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
chapter01/changelog.xml
View File

@ -63,7 +63,7 @@
<ulink url='&lfs-ticket-root;5006'>#5006</ulink>.</para> <ulink url='&lfs-ticket-root;5006'>#5006</ulink>.</para>
</listitem> </listitem>
<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> <ulink url='&lfs-ticket-root;5310'>#5310</ulink>.</para>
</listitem> </listitem>
</itemizedlist> </itemizedlist>
@ -253,7 +253,7 @@
<ulink url='&lfs-ticket-root;5273'>#5273</ulink>.</para> <ulink url='&lfs-ticket-root;5273'>#5273</ulink>.</para>
</listitem> </listitem>
<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> <ulink url='&lfs-ticket-root;5274'>#5274</ulink>.</para>
</listitem> </listitem>
</itemizedlist> </itemizedlist>

6
chapter01/whatsnew.xml
View File

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

7
chapter08/pkgconf.xml
View File

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

8
chapter10/kernel/Makefile
View File

@ -8,10 +8,14 @@ endif
all: $(OUTPUT) all: $(OUTPUT)
kernel.version: s-kernel-version; @true 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 ./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; \ mv tmp-kernel.version kernel.version; \
else \
rm tmp-kernel.version; \
fi fi
touch s-kernel-version touch s-kernel-version

2
chapter10/kernel/kernel.version
View File

@ -1 +1 @@
6.4.7 6.4.8