From 997d961a84138ea8145f5a7f9f141bde72641752 Mon Sep 17 00:00:00 2001 From: Thomas Trepl Date: Thu, 19 Mar 2020 10:18:54 +0000 Subject: [PATCH] MultiLib: Merge changes from trunk git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/multilib@11792 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- appendices/dependencies.xml | 2 +- chapter01/changelog.xml | 13 ++++- chapter05/gcc-pass2.xml | 97 ++++++++++++++++--------------------- chapter08/grub.xml | 4 +- chapter08/kernel.xml | 9 ++-- general.ent | 6 +-- packages.ent | 8 +-- 7 files changed, 66 insertions(+), 73 deletions(-) diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml index 704e26125..6d4061bc7 100644 --- a/appendices/dependencies.xml +++ b/appendices/dependencies.xml @@ -2364,7 +2364,7 @@ &external; - Cracklib, and PAM + Cracklib and PAM diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 544fdf71f..dd08235a0 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -43,7 +43,18 @@ Note: If a change is only specific to sysv or systemd, then use or as appropriate for the entry or if needed the entire day's listitem. - --> + --> + + 2020-03-18 + + + [renodr] - Make minor modifications to the kernel configuration + in order to match the configuration options to there current positions + in Linux-5.5 + + + + 2020-03-15 diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml index 663944ae3..3b16674e3 100644 --- a/chapter05/gcc-pass2.xml +++ b/chapter05/gcc-pass2.xml @@ -43,29 +43,28 @@ Installation of GCC - Our first build of GCC has installed a couple of internal system - headers. Normally one of them, limits.h, will in turn - include the corresponding system limits.h header, in - this case, /tools/include/limits.h. However, at the - time of the first build of gcc /tools/include/limits.h - did not exist, so the internal header that GCC installed is a partial, - self-contained file and does not include the extended features of the - system header. This was adequate for building the temporary libc, but this - build of GCC now requires the full internal header. Create a full version - of the internal header using a command that is identical to what the GCC - build system does in normal circumstances: + As in the first build of GCC, the GMP, MPFR, and MPC packages are + required. Unpack the tarballs and move them into the required directory + names: + As in the first build of GCC, the GMP, MPFR, MPC and ISL packages are + required. Unpack the tarballs and move them into the required directory + names: -cat gcc/limitx.h gcc/glimits.h gcc/limity.h > \ - `dirname $($LFS_TGT-gcc -print-libgcc-file-name)`/include-fixed/limits.h - Once again, change the location of GCC's default dynamic linker to use the one installed in /tools. @@ -91,43 +90,29 @@ sed -e "/^#define[[:blank:]]*STANDARD_STARTFILE_PREFIX_1/ s;\".*\";\"/tools/lib/ ;; esac - Change the default directory name for 64-bit - libraries to lib: + Our first build of GCC has installed a couple of internal system + headers. Normally one of them, limits.h, will in turn + include the corresponding system limits.h header, in + this case, /tools/include/limits.h. However, at the + time of the first build of gcc /tools/include/limits.h + did not exist, so the internal header that GCC installed is a partial, + self-contained file and does not include the extended features of the + system header. This was adequate for building the temporary libc, but this + build of GCC now requires the full internal header. Create a full version + of the internal header using a command that is identical to what the GCC + build system does in normal circumstances: -sed -e '/m64=/s/lib64/lib/' \ - -e '/m32=/s/m32=.*/m32=..\/lib32$(call if_multiarch,:i386-linux-gnu)/' \ - -i.orig gcc/config/i386/t-linux64 - - As in the first build of GCC it requires the GMP, - MPFR, and MPC packages. Unpack the tarballs and move them into the - required directory names: - - As in the first build of GCC it requires the GMP, - ISL, MPFR, and MPC packages. Unpack the tarballs and move them into the - required directory names: - -tar -xf ../mpfr-&mpfr-version;.tar.xz -mv -v mpfr-&mpfr-version; mpfr -tar -xf ../gmp-&gmp-version;.tar.xz -mv -v gmp-&gmp-version; gmp -tar -xf ../mpc-&mpc-version;.tar.gz -mv -v mpc-&mpc-version; mpc -tar -xf ../mpfr-&mpfr-version;.tar.xz -mv -v mpfr-&mpfr-version; mpfr -tar -xf ../gmp-&gmp-version;.tar.xz -mv -v gmp-&gmp-version; gmp -tar -xf ../mpc-&mpc-version;.tar.gz -mv -v mpc-&mpc-version; mpc -tar -xf ../isl-&isl-version;.tar.xz -mv -v isl-&isl-version; isl - - - Now fix a problem introduced by Glibc-2.31: - - -sed -e '1161 s|^|//|' \ - -i libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc +cat gcc/limitx.h gcc/glimits.h gcc/limity.h > \ + `dirname $($LFS_TGT-gcc -print-libgcc-file-name)`/include-fixed/limits.h + Create a separate build directory again: mkdir -v build diff --git a/chapter08/grub.xml b/chapter08/grub.xml index fecf58603..b6485b94d 100644 --- a/chapter08/grub.xml +++ b/chapter08/grub.xml @@ -45,9 +45,9 @@ xorriso -as cdrecord -v dev=/dev/cdrw blank=as_needed grub-img.iso + url="&hints-root;lfs-uefi.txt"> the lfs-uefi.txt hint at - http://www.linuxfromscratch.org/hints/downloads/files/lfs-uefi.txt. + &hints-root;lfs-uefi.txt. diff --git a/chapter08/kernel.xml b/chapter08/kernel.xml index 21c2583d5..94f050b4e 100644 --- a/chapter08/kernel.xml +++ b/chapter08/kernel.xml @@ -86,11 +86,11 @@ Kernel hacking ---> General setup --> + [*] 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] - [*] Control Group support [CONFIG_CGROUPS] Processor type and features ---> [*] Enable seccomp to safely compute untrusted bytecode [CONFIG_SECCOMP] Firmware Drivers ---> @@ -109,10 +109,7 @@ File systems ---> <*> 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] -Kernel hacking ---> - x86 Debugging ---> - Choose kernel unwinder (Frame pointer unwinder) ---> [CONFIG_UNWINDER_FRAME_POINTER] + [*] Tmpfs extended attributes [CONFIG_TMPFS_XATTR] @@ -142,7 +139,7 @@ Kernel hacking ---> A fuller description of managing UEFI environments from within LFS is covered by the lfs-uefi.txt hint at . + url="&hints-root;lfs-uefi.txt"/>. diff --git a/general.ent b/general.ent index fe5def668..f6d4ad829 100644 --- a/general.ent +++ b/general.ent @@ -1,13 +1,13 @@ - + - + - + diff --git a/packages.ent b/packages.ent index 210c2d6a9..6bce75c77 100644 --- a/packages.ent +++ b/packages.ent @@ -51,9 +51,9 @@ - - - + + + @@ -234,7 +234,7 @@ - +