diff options
| author | Bruce Dubbs <bdubbs@linuxfromscratch.org> | 2023-08-08 16:07:30 -0500 |
|---|---|---|
| committer | Bruce Dubbs <bdubbs@linuxfromscratch.org> | 2023-08-08 16:07:30 -0500 |
| commit | 539f0110b09ca953c289f914d4c7695ffd88f0af (patch) | |
| tree | 34c792301e333824a54ed022db56ceba8ab85fc1 | |
| parent | 45f40e899be8d017e94d7cd606a5015c8737dee7 (diff) | |
| parent | 9cca53dcac7a29b471491be27076cfcc06f21921 (diff) | |
Merge branch 'trunk' of git.linuxfromscratch.org:lfs into trunk
| -rw-r--r-- | chapter01/changelog.xml | 4 | ||||
| -rw-r--r-- | chapter01/whatsnew.xml | 6 | ||||
| -rw-r--r-- | chapter08/pkgconf.xml | 9 | ||||
| -rw-r--r-- | chapter10/kernel/Makefile | 8 | ||||
| -rw-r--r-- | chapter10/kernel/kernel.version | 2 |
5 files changed, 17 insertions, 12 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> 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> diff --git a/chapter08/pkgconf.xml b/chapter08/pkgconf.xml index 89226dbf0..3bbec0705 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,1336s|^|//|' cli/main.c</userinput></screen> 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 |