From bca4876ac555fd2d93e9e962831120e53e3e1081 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Thu, 3 Feb 2022 18:01:59 +0800 Subject: [PATCH 1/3] Revert "binutils: use -j1 for make install" This reverts commit 03a41fd0cd6635843d313c02150692a05d6b8bd2. It's no longer needed after binutils-gdb commit "install dependencies for ld -> bfd and libctf -> bfd" (755ba58e). --- chapter05/binutils-pass1.xml | 15 +-------------- chapter06/binutils-pass2.xml | 2 +- chapter08/binutils.xml | 2 +- 3 files changed, 3 insertions(+), 16 deletions(-) diff --git a/chapter05/binutils-pass1.xml b/chapter05/binutils-pass1.xml index a0410f9f3..debe5c63f 100644 --- a/chapter05/binutils-pass1.xml +++ b/chapter05/binutils-pass1.xml @@ -131,20 +131,7 @@ cd build Install the package: -make install -j1 - - - The meaning of the make parameter: - - - -j1 - - An issue in the building system may cause the installation - to fail with in MAKEFLAGS. - Override it to workaround this issue. - - - +make install diff --git a/chapter06/binutils-pass2.xml b/chapter06/binutils-pass2.xml index 182e06df0..414d782b3 100644 --- a/chapter06/binutils-pass2.xml +++ b/chapter06/binutils-pass2.xml @@ -90,7 +90,7 @@ cd build libctf.so to link against zlib from the host distribution: -make DESTDIR=$LFS install -j1 +make DESTDIR=$LFS install install -vm755 libctf/.libs/libctf.so.0.0.0 $LFS/usr/lib diff --git a/chapter08/binutils.xml b/chapter08/binutils.xml index 113236674..c2153b6cd 100644 --- a/chapter08/binutils.xml +++ b/chapter08/binutils.xml @@ -178,7 +178,7 @@ cd build --> Install the package: -make tooldir=/usr install -j1 +make tooldir=/usr install Remove useless static libraries: From 1f8c0b947ef4cbba2afcf77f903a808faae9a992 Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Fri, 4 Feb 2022 13:29:55 -0600 Subject: [PATCH 2/3] Fix currency for tcl --- lfs-latest-git.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lfs-latest-git.php b/lfs-latest-git.php index fc318e021..df0ddcccc 100644 --- a/lfs-latest-git.php +++ b/lfs-latest-git.php @@ -133,7 +133,8 @@ if ( $package == "shadow" ) $dirpath = "https://github.com/shadow-maint/shad if ( $package == "MarkupSafe" ) $dirpath = "https://pypi.python.org/pypi/MarkupSafe/"; if ( $package == "Jinja" ) $dirpath = "https://pypi.python.org/pypi/Jinja2/"; if ( $package == "systemd" ) $dirpath = "https://github.com/systemd/systemd/releases"; -if ( $package == "tcl" ) $dirpath = "https://sourceforge.net/projects/tcl/files"; +//if ( $package == "tcl" ) $dirpath = "https://sourceforge.net/projects/tcl/files"; +if ( $package == "tcl" ) $dirpath = "https://www.tcl.tk/software/tcltk/download.html"; if ( $package == "util-linux" ) $dirpath = max_parent( $dirpath, "v." ); if ( $package == "vim" ) $dirpath = "https://github.com/vim/vim/tags"; if ( $package == "zstd" ) $dirpath = "https://github.com/facebook/zstd/releases"; @@ -264,7 +265,7 @@ if ( $package == "zstd" ) $dirpath = "https://github.com/facebook/zstd/rel } if ( $package == "tcl" ) - return find_max( $lines, "/tcl/", "/^.*tcl(\d[\d\.]*\d)-src.*$/" ); + return find_max( $lines, "/tcl\d/", "/^.*tcl(\d\.[\d\.]*\d)-src.*$/" ); if ( $package == "ninja" ) return find_max( $lines, "/v\d/", "/^.*v(\d[\d\.]*\d).*$/" ); From 0a75d626580d57ee3bf31bba07769886c015e9f7 Mon Sep 17 00:00:00 2001 From: "Douglas R. Reno" Date: Fri, 4 Feb 2022 19:54:13 -0600 Subject: [PATCH 3/3] Minor tweaks to systemd --- chapter07/createfiles.xml | 1 - chapter08/systemd.xml | 3 ++- chapter09/networkd.xml | 12 +++++++++--- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/chapter07/createfiles.xml b/chapter07/createfiles.xml index e7e3c7868..9c4f6ac54 100644 --- a/chapter07/createfiles.xml +++ b/chapter07/createfiles.xml @@ -74,7 +74,6 @@ EOF bin:x:1:1:bin:/dev/null:/usr/bin/false daemon:x:6:6:Daemon User:/dev/null:/usr/bin/false messagebus:x:18:18:D-Bus Message Daemon User:/run/dbus:/usr/bin/false -systemd-bus-proxy:x:72:72:systemd Bus Proxy:/:/usr/bin/false systemd-journal-gateway:x:73:73:systemd Journal Gateway:/:/usr/bin/false systemd-journal-remote:x:74:74:systemd Journal Remote:/:/usr/bin/false systemd-journal-upload:x:75:75:systemd Journal Upload:/:/usr/bin/false diff --git a/chapter08/systemd.xml b/chapter08/systemd.xml index 40c2a0df6..be7cb4e8b 100644 --- a/chapter08/systemd.xml +++ b/chapter08/systemd.xml @@ -131,7 +131,8 @@ meson --prefix=/usr \ services responsible for setting up the /etc/group and /etc/passwd files. Both files - were created earlier in this chapter. + were created earlier in this chapter. This daemon is not useful + on an LFS system since user accounts are manually created. diff --git a/chapter09/networkd.xml b/chapter09/networkd.xml index 82a0740ad..42c7dc730 100644 --- a/chapter09/networkd.xml +++ b/chapter09/networkd.xml @@ -184,15 +184,21 @@ EOF or any other software that generates an /etc/resolv.conf (ex: a resolvconf program other than the one provided by systemd), the systemd-resolved service - should not be used. + should not be used. + + To disable systemd-resolved, issue the following command: + +systemctl disable systemd-resolved When using systemd-resolved for DNS configuration, it creates the file - /run/systemd/resolve/resolv.conf. Create a + /run/systemd/resolve/resolv.conf. +