From 3f4304998a76ef3bd6141cf7a32cb6740bf032a6 Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Mon, 31 Oct 2022 18:42:52 -0500 Subject: [PATCH 1/2] Package updates. Update to iana-etc-20221025. Update to tzdata-2022f. Update to Python3-3.11.0. Update to procps-ng-4.0.1. Update to man-pages-6.01. Update to man-db-2.11.0. Update to make-4.4. Update to linux-6.0.6. Update to libffi-3.4.4. Update to inetutils-2.4. Update to expat-2.5.0. Note: I had to run glibc in Chapter 8 at -j1 to avoid an apparant race condition. With a little more investigation I may be able to find a better solution. --- chapter01/changelog.xml | 50 +++++++++++++++++++++++++++++ chapter01/whatsnew.xml | 16 +++++----- chapter08/glibc.xml | 5 ++- packages.ent | 70 ++++++++++++++++++++--------------------- 4 files changed, 97 insertions(+), 44 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 6ff784e08..0a80ffbcc 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -39,6 +39,56 @@ or as appropriate for the entry or if needed the entire day's listitem. --> + + 2022-11-01 + + + [bdubbs] - Update to iana-etc-20221025. Addresses + #5006. + + + [bdubbs] - Update to tzdata-2022f. Fixes + #5148. + + + [bdubbs] - Update to Python3-3.11.0. Fixes + #5145. + + + [bdubbs] - Update to procps-ng-4.0.1. Fixes + #5141. + + + [bdubbs] - Update to man-pages-6.01. Fixes + #5140. + + + [bdubbs] - Update to man-db-2.11.0. Fixes + #5139. + + + [bdubbs] - Update to make-4.4. Fixes + #5149. + + + [bdubbs] - Update to linux-6.0.6. Fixes + #5142. + + + [bdubbs] - Update to libffi-3.4.4. Fixes + #5144. + + + [bdubbs] - Update to inetutils-2.4. Fixes + #5147. + + + [bdubbs] - Update to expat-2.5.0. Fixes + #5132. + + + + 2022-10-17 diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 5d246c861..cfd5b9fe1 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -133,9 +133,9 @@ IANA-Etc-&iana-etc-version; - + @@ -178,12 +178,12 @@ - - + Man-pages-&man-pages-version; @@ -217,9 +217,9 @@ - + diff --git a/chapter08/glibc.xml b/chapter08/glibc.xml index f4f553bc3..fc7b96dfe 100644 --- a/chapter08/glibc.xml +++ b/chapter08/glibc.xml @@ -127,7 +127,10 @@ cd build Compile the package: -make + +make -j1 In this section, the test suite for Glibc is considered critical. diff --git a/packages.ent b/packages.ent index 96d1e3ae9..2eff3138b 100644 --- a/packages.ent +++ b/packages.ent @@ -163,10 +163,10 @@ - - + + - + @@ -317,18 +317,18 @@ - + - + - - + + - + @@ -398,10 +398,10 @@ - - + + - + @@ -424,12 +424,12 @@ - + - + - + - - - + + + - + - - + + @@ -694,10 +694,10 @@ - - + + - + From d45f50d26d9d0861d96f46d9cb5261f5a731d498 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Tue, 1 Nov 2022 10:47:28 +0800 Subject: [PATCH 2/2] glibc: fix parallel build issue with make-4.4 We only need a one-line change in upstream fix (because we don't use "make --shuffle"). Add it as a sed for both Chapter 5 and Chapter 8. Note that the "minimal" sed would be '/MAEKFLAGS :=/s/r/ -r/'. I included an additional ')' so it won't modify "-r" again to "- -r". Tested "make" and "make check" on a x86_64 with -j8 and an arm64 with -j24. Link: https://sourceware.org/git/?p=glibc.git;a=commit;h=2d7ed98add14 --- chapter05/glibc.xml | 5 +++++ chapter08/glibc.xml | 14 +++++--------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml index 6b78031bc..a8834cc19 100644 --- a/chapter05/glibc.xml +++ b/chapter05/glibc.xml @@ -64,6 +64,11 @@ esac + Fix an issue building Glibc with parallel jobs and make-4.4 + or later: + +sed '/MAKEFLAGS :=/s/)r/) -r/' -i Makerules + Some of the Glibc programs use the non-FHS-compliant /var/db directory to store their runtime data. Apply the following patch to make such programs store their diff --git a/chapter08/glibc.xml b/chapter08/glibc.xml index fc7b96dfe..0bc9a5dcf 100644 --- a/chapter08/glibc.xml +++ b/chapter08/glibc.xml @@ -43,12 +43,11 @@ Installation of Glibc - Some of the Glibc programs use the non-FHS compliant /var/db directory to store their runtime data. Apply the following patch to make such programs @@ -127,10 +126,7 @@ cd build Compile the package: - -make -j1 +make In this section, the test suite for Glibc is considered critical.