From 16caca2b75f0ef7b86c1ea0c225be8401cfd0a3a Mon Sep 17 00:00:00 2001 From: Thomas Trepl Date: Sun, 22 Nov 2020 10:34:01 +0000 Subject: [PATCH] Merge changes from trunk to multilib git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/multilib@12062 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- chapter01/changelog.xml | 34 ++++++++++++++++++++++++++++++++++ chapter01/whatsnew.xml | 8 ++++---- chapter08/libcap.xml | 15 ++++++++------- chapter10/kernel.xml | 3 +-- general.ent | 6 +++--- packages.ent | 40 ++++++++++++++++++++-------------------- 6 files changed, 70 insertions(+), 36 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 44ba72f7b..b538c09b8 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -45,6 +45,40 @@ appropriate for the entry or if needed the entire day's listitem. --> + + + 2020-11-15 + + [bdubbs] - Update to gmp-6.2.1. Fixes + #4754. + + + [bdubbs] - Update to iana-etc-20201110. Addresses + #4722. + + + [bdubbs] - Update to man-pages-5.09. Fixes + #4750. + + + [bdubbs] - Update to linux-5.9.8. Fixes + #4749. + + + [bdubbs] - Update to libcap-2.45. Fixes + #4751. + + + [bdubbs] - Update to grep-3.6. Fixes + #4752. + + + [bdubbs] - Update to bison-3.7.4. Fixes + #4753. + + + + 2020-11-01 diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index d7de8c3ad..82f30baf5 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -108,9 +108,9 @@ - + @@ -177,9 +177,9 @@ - + Meson-&meson-version; diff --git a/chapter08/libcap.xml b/chapter08/libcap.xml index b5da9ca25..73b21e950 100644 --- a/chapter08/libcap.xml +++ b/chapter08/libcap.xml @@ -43,9 +43,9 @@ Installation of Libcap - Prevent a static library from being installed: + Prevent static libraries from being installed: -sed -i '/install -m.*STACAPLIBNAME/d' libcap/Makefile +sed -i '/install -m.*STA/d' libcap/Makefile Compile the package: @@ -72,10 +72,11 @@ Install the package and do some cleanup: make lib=lib PKGCONFIGDIR=/usr/lib/pkgconfig install -chmod -v 755 /lib/libcap.so.&libcap-version; -mv -v /lib/libpsx.a /usr/lib -rm -v /lib/libcap.so -ln -sfv ../../lib/libcap.so.2 /usr/lib/libcap.so +for libname in cap psx; do + chmod -v 755 /lib/lib${libname}.so.&libcap-version; + rm -v /lib/lib${libname}.so + ln -sfv ../../lib/lib${libname}.so.2 /usr/lib/lib${libname}.so +done @@ -138,7 +139,7 @@ rm -rf DESTDIR capsh, getcap, getpcaps, and setcap - libcap.so and libpsx.a + libcap.so and libpsx.so diff --git a/chapter10/kernel.xml b/chapter10/kernel.xml index 9882c9b9a..239d306d4 100644 --- a/chapter10/kernel.xml +++ b/chapter10/kernel.xml @@ -112,11 +112,11 @@ [*] Maintain a devtmpfs filesystem to mount at /dev [CONFIG_DEVTMPFS] General setup --> + [ ] Auditing Support [CONFIG_AUDIT] [*] Control Group support [CONFIG_CGROUPS] [ ] Enable deprecated sysfs features to support old userspace tools [CONFIG_SYSFS_DEPRECATED] [*] Configure standard kernel features (expert users) [CONFIG_EXPERT] ---> [*] open by fhandle syscalls [CONFIG_FHANDLE] - [ ] Auditing support [CONFIG_AUDIT] Processor type and features ---> [*] Enable seccomp to safely compute untrusted bytecode [CONFIG_SECCOMP] Firmware Drivers ---> @@ -132,7 +132,6 @@ Device Drivers ---> [ ] Enable the firmware sysfs fallback mechanism [CONFIG_FW_LOADER_USER_HELPER] File systems ---> [*] Inotify support for userspace [CONFIG_INOTIFY_USER] - <*> Kernel automounter support (supports v3, v4, and v5) [CONFIG_AUTOFS_FS] Pseudo filesystems ---> [*] Tmpfs POSIX Access Control Lists [CONFIG_TMPFS_POSIX_ACL] [*] Tmpfs extended attributes [CONFIG_TMPFS_XATTR] diff --git a/general.ent b/general.ent index e3137d289..ef7601bc2 100644 --- a/general.ent +++ b/general.ent @@ -1,13 +1,13 @@ - + - + - + diff --git a/packages.ent b/packages.ent index a637c8370..0d4869005 100644 --- a/packages.ent +++ b/packages.ent @@ -77,10 +77,10 @@ - - + + - + @@ -267,10 +267,10 @@ - - + + - + @@ -283,10 +283,10 @@ - - + + - + @@ -319,10 +319,10 @@ - + - + @@ -391,10 +391,10 @@ - - + + - + @@ -425,12 +425,12 @@ - + - + - +