diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index d443dfa4f..30259d89b 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -63,7 +63,7 @@ #5006. - [rahul] - Update to pkgconf 2.0.0. Fixes + [rahul] - Update to pkgconf-2.0.0. Fixes #5310. @@ -253,7 +253,7 @@ #5273. - [rahul] - Changed from pkg-config to pkgconf 1.9.5. Fixes + [rahul] - Changed from pkg-config to pkgconf-1.9.5. Fixes #5274. 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 @@ - - pkgconf-&pkgconf-version; - + Perl-&perl-version; 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 @@ Installation of Pkgconf - 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. + Pkgconf-2.0.0 explicitly errors when attempting to run + 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: sed -i '/1330,1336/s|^|//|' cli/main.c 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