From d4a32f958ff99a1e408c156c83d694ac7b5ccd9d Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Sun, 4 Jun 2023 19:23:22 +0800 Subject: [PATCH 1/4] changelog: Fix the entry for MarkupSafe --- chapter01/changelog.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 481efe10a..713d7702a 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -47,8 +47,8 @@ #5006. - [bdubbs] - Update to MarkupSafe-2.1.3 (Python Module) - #5268. + [bdubbs] - Update to MarkupSafe-2.1.3 (Python Module). + Fixes #5268. [bdubbs] - Update to linux-6.3.5. Fixes From 5e7593e6f07b1ca8946e1da8d24952595d365046 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Sun, 4 Jun 2023 19:31:59 +0800 Subject: [PATCH 2/4] pkgmgmt: Revert some of reword for "dependency hell" from Bruce Use "library name" (instead of "library version") for SONAME (for now). And "conflicting locations" may not be a problem if the symbol is at two locations but they are exactly same (or ABI compatible). For the details see lfs-dev discussion. The current word is still not perfect (we've not defined "the name of a shared library" at all), so I guess we'll need to make a major revision for the entire "upgrading issue with shared libraries" thing in the future. --- chapter08/pkgmgt.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/chapter08/pkgmgt.xml b/chapter08/pkgmgt.xml index f5e50524b..7104d9cba 100644 --- a/chapter08/pkgmgt.xml +++ b/chapter08/pkgmgt.xml @@ -86,12 +86,12 @@ If a package is (directly or indirectly) linked to both - the old and new versions of a shared library (for example, the package + the old and new names of a shared library (for example, the package links to both libfoo.so.2 and libbar.so.1, while the latter links to libfoo.so.3), the package may malfunction because the different revisions of the shared - library present conflicting locations for some symbol names. This can be + library present incompatible definitions for some symbol names. This can be caused by recompiling some, but not all, of the packages linked to the old shared library after the package providing the shared library is upgraded. To avoid the issue, users will need to rebuild every package From 0f18f2b1214520b965525a93a03c421c8c5b9177 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Mon, 5 Jun 2023 23:20:48 +0800 Subject: [PATCH 3/4] housekeeping after min-kernel bump Update the rationale for min-kernel in hostreqs. Add a note in general.ent about the EOL of current min-kernel. Realign the backslashes in glibc instructions. --- chapter02/hostreqs.xml | 7 +++++-- chapter05/glibc.xml | 2 +- chapter08/glibc.xml | 2 +- general.ent | 4 ++++ 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/chapter02/hostreqs.xml b/chapter02/hostreqs.xml index 192eed8c1..862d2605c 100644 --- a/chapter02/hostreqs.xml +++ b/chapter02/hostreqs.xml @@ -93,8 +93,11 @@ The reason for the kernel version requirement is that we specify that version when building glibc in and - , - at the recommendation of the developers. + , so the workarounds for + older kernels are not enabled and the compiled + glibc is slightly faster and smaller. + As at June 2023, &min-kernel; is the oldest kernel release still + supported by the kernel developers. If the host kernel is earlier than &min-kernel; you will need to replace the kernel with a more up-to-date version. There are two ways diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml index 66526ba4c..14f1fac6c 100644 --- a/chapter05/glibc.xml +++ b/chapter05/glibc.xml @@ -89,7 +89,7 @@ cd build --prefix=/usr \ --host=$LFS_TGT \ --build=$(../scripts/config.guess) \ - --enable-kernel=&min-kernel; \ + --enable-kernel=&min-kernel; \ --with-headers=$LFS/usr/include \ libc_cv_slibdir=/usr/lib diff --git a/chapter08/glibc.xml b/chapter08/glibc.xml index d094aed7f..5b9b56840 100644 --- a/chapter08/glibc.xml +++ b/chapter08/glibc.xml @@ -76,7 +76,7 @@ cd build ../configure --prefix=/usr \ --disable-werror \ - --enable-kernel=&min-kernel; \ + --enable-kernel=&min-kernel; \ --enable-stack-protector=strong \ --with-headers=/usr/include \ libc_cv_slibdir=/usr/lib diff --git a/general.ent b/general.ent index 912a360d6..a222812e9 100644 --- a/general.ent +++ b/general.ent @@ -91,7 +91,11 @@ + + +