From 0aaf6a318ade51c641e420ebd1483cb1f66ebf3b Mon Sep 17 00:00:00 2001 From: Thomas Trepl Date: Fri, 4 Oct 2019 19:22:53 +0000 Subject: [PATCH] MultiLib: Merge changes from trunk git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/multilib@11681 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- chapter01/changelog.xml | 59 ++++++++++++++++++++++++++++++++++++ chapter01/whatsnew.xml | 16 +++++----- chapter03/patches.xml | 8 ++--- chapter05/linux-headers.xml | 12 +++++--- chapter06/attr.xml | 3 +- chapter06/createfiles.xml | 17 ++++++----- chapter06/file.xml | 3 +- chapter06/libtool.xml | 3 +- chapter06/linux-headers.xml | 18 ++++++----- chapter06/python.xml | 2 +- chapter06/systemd.xml | 28 ++++++++++++----- chapter06/xz.xml | 3 +- chapter07/systemd-custom.xml | 4 +-- chapter08/kernel.xml | 3 +- general.ent | 6 ++-- packages.ent | 56 +++++++++++++++++----------------- patches.ent | 6 ++-- 17 files changed, 161 insertions(+), 86 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 2cdd0396e..dfce502ee 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -44,6 +44,65 @@ or as appropriate for the entry or if needed the entire day's listitem. --> + + 2019-10-03 + + + [renodr] - Add a consolidated patch to fix several + problems with the new version of systemd, including bugs + in udev, filesystem mounting (with Samba-4.11), hardware + database updates, timesync fixes with adjtime as is set + in LFS, and bugs with network management and domain + resolution. + + + + + + 2019-09-29 + + + [bdubbs] - Update to texinfo-6.7. Fixes + #4529. + + + [bdubbs] - Update to e2fsprogs-1.45.4. Fixes + #4530. + + + [bdubbs] - Update to XML-Parser-2.46. Fixes + #4531. + + + [bdubbs] - Update to expat-2.2.9. Fixes + #4532. + + + [bdubbs] - Update to iproute2-5.3.0. Fixes + #4533. + + + + + + 2019-09-27 + + + [renodr] - Update to systemd-243. Fixes + #4456. + + + + + + 2019-09-24 + + + [pierre] - Update to linux-5.3.1. Fixes + #4528. + + + 2019-09-14 diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 301c1182e..0f5ffafb5 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -68,9 +68,9 @@ - + @@ -131,9 +131,9 @@ - + @@ -224,9 +224,9 @@ - + SysVinit-&sysvinit-version; @@ -236,9 +236,9 @@ - + Tzdata-&tzdata-version; diff --git a/chapter03/patches.xml b/chapter03/patches.xml index 105b4139e..949b032ab 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -118,10 +118,10 @@ - Systemd networkd and rdrand patch - &systemd-networkd-patch-size;: - - Download: - MD5 sum: &systemd-networkd-patch-md5; + Systemd Consolidated Patch - &systemd-consolidated-patch-size;: + + Download: + MD5 sum: &systemd-consolidated-patch-md5; diff --git a/chapter05/linux-headers.xml b/chapter05/linux-headers.xml index b5f134ee3..7a92b466f 100644 --- a/chapter05/linux-headers.xml +++ b/chapter05/linux-headers.xml @@ -53,12 +53,14 @@ make mrproper Now extract the user-visible kernel headers from the source. - They are placed in an intermediate local directory and copied to the needed - location because the extraction process removes any existing files in - the target directory. + The recommended make target headers_install cannot be + used, because it requires rsync, which may not + be available. The headers are first placed in + ./usr, then copied to the needed + location. -make INSTALL_HDR_PATH=dest headers_install -cp -rv dest/include/* /tools/include +make headers +cp -rv usr/include/* /tools/include diff --git a/chapter06/attr.xml b/chapter06/attr.xml index 82ec8825c..69b62bde9 100644 --- a/chapter06/attr.xml +++ b/chapter06/attr.xml @@ -118,8 +118,7 @@ rm -rf DESTDIR Prepare Attr for compilation: - -CC="gcc -mx32" ./configure \ +CC="gcc -mx32" ./configure \ --prefix=/usr \ --disable-static \ --libdir=/usr/libx32 \ diff --git a/chapter06/createfiles.xml b/chapter06/createfiles.xml index 26dd32542..5c3705095 100644 --- a/chapter06/createfiles.xml +++ b/chapter06/createfiles.xml @@ -46,15 +46,16 @@ ln -sv /tools/lib/libstdc++.{a,so{,.6}} /usr/lib ln -sv bash /bin/sh - -ln -sv /tools/lib32/libgcc_s.so{,.1} /usr/lib32 -ln -sv /tools/lib32/libstdc++.{a,so{,.6}} /usr/lib32 - - -ln -sv /tools/libx32/libgcc_s.so{,.1} /usr/libx32 + 32-bit builds also require these links: + +ln -sv /tools/lib32/libgcc_s.so{,.1} /usr/lib32 +ln -sv /tools/lib32/libstdc++.{a,so{,.6}} /usr/lib32 + + x32-bit builds also require these links: + +ln -sv /tools/libx32/libgcc_s.so{,.1} /usr/libx32 ln -sv /tools/libx32/libstdc++.{a,so{,.6}} /usr/libx32 -ln -sv /usr/libx32 / - +ln -sv /usr/libx32 / - Prepare systemd for compilation: mkdir -p build @@ -79,7 +77,6 @@ cd build PKG_CONFIG_PATH="/usr/lib/pkgconfig:/tools/lib/pkgconfig" \ LANG=en_US.UTF-8 \ -CFLAGS+="-Wno-format-overflow" \ meson --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ @@ -207,7 +204,24 @@ meson --prefix=/usr \ systemd-machine-id-setup - Remove symbolic links to Util-Linux libraries: + Setup the basic target structure: + +systemctl preset-all + + Disable a service that is known to cause problems with systems that + use a network configuration other than what is provided by + systemd-networkd: + + +systemctl disable systemd-time-wait-sync.service + + Prevent systemd from resetting the maximum PID value which causes + some problems with packages and units in BLFS: + + +rm -f /etc/sysctl.d/50-pid-max.conf + + Cleanup symbolic links to Util-Linux libraries: rm -fv /usr/lib/lib{blkid,uuid,mount}.so* diff --git a/chapter06/xz.xml b/chapter06/xz.xml index 66f0676de..79081bbb1 100644 --- a/chapter06/xz.xml +++ b/chapter06/xz.xml @@ -108,8 +108,7 @@ rm -rf DESTDIR Prepare Xz for compilation: - -CC="gcc -mx32" ./configure \ +CC="gcc -mx32" ./configure \ --prefix=/usr \ --disable-static \ --libdir=/usr/libx32 \ diff --git a/chapter07/systemd-custom.xml b/chapter07/systemd-custom.xml index 7849c7816..0f05cca6d 100644 --- a/chapter07/systemd-custom.xml +++ b/chapter07/systemd-custom.xml @@ -245,7 +245,7 @@ EOF Enable system-wide process lingering: You can set KillUserProcesses=no in - /etc/logind.conf to enable process lingering + /etc/systemd/logind.conf to enable process lingering globally for all users. This has the benefit of leaving the old method available to all users at the expense of explicit control. @@ -254,7 +254,7 @@ EOF Disable at build-time: You can enable lingering by default while building systemd by adding the switch - -Ddefault-kill-user-processes=no to the + -Ddefault-kill-user-processes=false to the meson command for systemd. This completely disables the ability of systemd to kill user processes at session end. diff --git a/chapter08/kernel.xml b/chapter08/kernel.xml index 20c1e8b96..1b42a89a1 100644 --- a/chapter08/kernel.xml +++ b/chapter08/kernel.xml @@ -234,7 +234,8 @@ Kernel hacking ---> class="directory">linux-&linux-version;/Documentation directory. Also, modprobe.d(5) may be of interest. - Install the modules, if the kernel configuration uses them: + Unless module support has been disabled in the kernel configuration, + install the modules with: make modules_install diff --git a/general.ent b/general.ent index c597e7369..061a92e02 100644 --- a/general.ent +++ b/general.ent @@ -1,13 +1,13 @@ - + - + - + diff --git a/packages.ent b/packages.ent index 0ec68fb37..8322c4612 100644 --- a/packages.ent +++ b/packages.ent @@ -143,10 +143,10 @@ - - + + - + @@ -166,10 +166,10 @@ - + - + @@ -348,10 +348,10 @@ - - + + - + @@ -429,13 +429,13 @@ - - + + - + - + - + - + - + - - - + + + @@ -680,10 +680,10 @@ - - + + - + @@ -723,10 +723,10 @@ - - + + - + diff --git a/patches.ent b/patches.ent index ea376aa2f..26ec12446 100644 --- a/patches.ent +++ b/patches.ent @@ -57,7 +57,7 @@ - - - + + +