From f8ea68bfff629a327b8b40054a6b544d4dc8e35f Mon Sep 17 00:00:00 2001 From: Thomas Trepl Date: Sun, 12 Jan 2020 08:06:52 +0000 Subject: [PATCH] MultiLib: Merge changes from trunk git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/multilib@11724 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- appendices/dependencies.xml | 4 +-- chapter01/changelog.xml | 60 +++++++++++++++++++++++++++++++++++++ chapter01/whatsnew.xml | 8 ++--- chapter06/libcap.xml | 53 +++++++++++++++----------------- chapter06/meson.xml | 4 +-- chapter06/systemd.xml | 2 +- general.ent | 8 ++--- packages.ent | 46 ++++++++++++++-------------- 8 files changed, 120 insertions(+), 65 deletions(-) diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml index 486df8e83..d3f99a9e7 100644 --- a/appendices/dependencies.xml +++ b/appendices/dependencies.xml @@ -403,8 +403,8 @@ &dependencies; - Bash, Binutils, Coreutils, GCC, Gettext, Glibc, GMP, Grep, Make, - Patch, Perl, Sed, and Texinfo + Bash, Binutils, Coreutils, GCC, Gettext, Glibc, GMP, Grep, Libcap, + Make, Patch, Perl, Sed, and Texinfo diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 1e2aef8f1..61c7b011b 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -45,6 +45,66 @@ appropriate for the entry or if needed the entire day's listitem. --> + 2020-01-09 + + + [bdubbs] - Update to meson-0.53.0. Fixes + #4571. + + + [bdubbs] - Update to e2fsprogs-1.45.5. Fixes + #4570. + + + [bdubbs] - Update to grep-3.4. Fixes + #4568. + + + [bdubbs] - Update to libpipeline-1.5.2. Fixes + #4567. + + + [bdubbs] - Update to linux-5.4.8. Fixes + #4566. + + + [pierre] - Add /etc/os-release to + the sysV version, as it is required by some packages in BLFS. + + + + + + 2020-01-06 + + + [pierre] - Update to libcap-2.30. Fixes + #4569. + + + + + + 2020-01-04 + + + [pierre] - Fix various issues in libcap-2.29, and + update dependencies. + + + + + + 2020-01-01 + + + [bdubbs] - Update to libcap-2.29. Fixes + #4564. + + + + + 2019-12-22 diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index cb77cba39..a2d0befeb 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -110,9 +110,9 @@ - + @@ -155,9 +155,9 @@ Libffi-&libffi-version; - + diff --git a/chapter06/libcap.xml b/chapter06/libcap.xml index 8ca0c6b33..1b0f69ea8 100644 --- a/chapter06/libcap.xml +++ b/chapter06/libcap.xml @@ -45,50 +45,34 @@ Prevent a static library from being installed: -sed -i '/install.*STALIBNAME/d' libcap/Makefile +sed -i '/install.*STACAPLIBNAME/d' libcap/Makefile Compile the package: -make - - This package does not come with a test suite. - - Install the package: - -make RAISE_SETFCAP=no lib=lib prefix=/usr install -chmod -v 755 /usr/lib/libcap.so.&libcap-version; +make lib=lib The meaning of the make option: - - RAISE_SETFCAP=no - - This parameter skips trying to use setcap - on itself. This avoids an installation error if the kernel or file - system does not support extended capabilities. - - - lib=lib - This parameter installs the library in - $prefix/lib rather than - $prefix/lib64 on x86_64. It has no effect on + This parameter sets the library directory to + /lib rather than + /lib64 on x86_64. It has no effect on x86. - - The shared library needs to be moved to - /lib, and as a result the - .so file in - /usr/lib will need to be recreated: + To test the results, issue: -mv -v /usr/lib/libcap.so.* /lib -ln -sfv ../../lib/$(readlink /usr/lib/libcap.so) /usr/lib/libcap.so +make test + + Install the package: + +make lib=lib install +chmod -v 755 /lib/libcap.so.&libcap-version; @@ -139,7 +123,7 @@ rm -rf DESTDIR capsh, getcap, getpcaps, and setcap - libcap.so + libcap.so and libpsx.a @@ -199,6 +183,17 @@ rm -rf DESTDIR + + libpsx + + Contains functions to support POSIX semantics for syscalls + associated with the pthread library + + libpsx + + + + diff --git a/chapter06/meson.xml b/chapter06/meson.xml index 5a8779a91..0b49c5441 100644 --- a/chapter06/meson.xml +++ b/chapter06/meson.xml @@ -39,11 +39,11 @@ Installation of Meson - + Compile Meson with the following command: python3 setup.py build diff --git a/chapter06/systemd.xml b/chapter06/systemd.xml index 64e4e242c..41fe03cee 100644 --- a/chapter06/systemd.xml +++ b/chapter06/systemd.xml @@ -51,7 +51,7 @@ ln -sf /tools/bin/true /usr/bin/xsltproc Because we have not yet installed the final version of Util-Linux, - create links to the libraries in the approprite location: + create links to the libraries in the appropriate location: for file in /tools/lib/lib{blkid,mount,uuid}.so*; do ln -sf $file /usr/lib/ diff --git a/general.ent b/general.ent index e9224d0ab..233da37ab 100644 --- a/general.ent +++ b/general.ent @@ -1,15 +1,15 @@ - + - + - + - + diff --git a/packages.ent b/packages.ent index 4efecf885..1ab9ca2ef 100644 --- a/packages.ent +++ b/packages.ent @@ -10,7 +10,7 @@ - + @@ -144,10 +144,10 @@ - - + + - + @@ -289,10 +289,10 @@ - - + + - + @@ -397,12 +397,12 @@ - - + + - + - + @@ -413,10 +413,10 @@ - - + + - + @@ -431,12 +431,12 @@ - + - + - +