diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml index 99144fdd9..ddda9377c 100644 --- a/appendices/dependencies.xml +++ b/appendices/dependencies.xml @@ -780,7 +780,7 @@ &before; - None + Binutils, IProute2, Kbd, Kmod, and Man-DB @@ -837,7 +837,7 @@ Bash, Binutils, Coreutils, Diffutils, Findutils, Gawk, GCC, Gettext, Glibc, GMP, Grep, M4, Make, MPC, MPFR, Patch, Perl, Sed, Tar, - and Texinfo + Texinfo, and Zstd @@ -2786,7 +2786,7 @@ &before; - None + GCC diff --git a/chapter05/chapter05.xml b/chapter05/chapter05.xml index 6f5c9d115..105ce05a8 100644 --- a/chapter05/chapter05.xml +++ b/chapter05/chapter05.xml @@ -29,8 +29,6 @@ - - diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml index cb913042c..388e94ac2 100644 --- a/chapter06/chapter06.xml +++ b/chapter06/chapter06.xml @@ -28,10 +28,12 @@ + + @@ -49,7 +51,6 @@ - @@ -78,7 +79,6 @@ - diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml index e3ab4a679..78309ba32 100644 --- a/chapter06/coreutils.xml +++ b/chapter06/coreutils.xml @@ -116,7 +116,7 @@ FORCE_UNSAFE_CONFIGURE=1 ./configure \ these tests are not skipped we'll add a temporary group and make the user tester a part of it: -echo "tester:x:1000:nogroup" >> /etc/group +echo "dummy:x:1000:tester" >> /etc/group Fix some of the permissions so that the non-root user can compile and run the tests: @@ -132,11 +132,11 @@ FORCE_UNSAFE_CONFIGURE=1 ./configure \ partially built system environment like the chroot environment here, but passes if run at the end of this chapter. The test program tty.sh is also known to fail. +--> Remove the temporary group: sed -i '/dummy/d' /etc/group ---> Install the package: make install diff --git a/chapter06/createfiles.xml b/chapter06/createfiles.xml index 20278d6e8..157534511 100644 --- a/chapter06/createfiles.xml +++ b/chapter06/createfiles.xml @@ -368,7 +368,7 @@ EOF user here and delete this account at the end of the chapter. echo "tester:x:101:101::/home/tester:/bin/bash" >> /etc/passwd -echo "tester:x:101:dummy" >> /etc/group +echo "tester:x:101:" >> /etc/group install -o tester -d /home/tester To remove the I have no name! prompt, start a new diff --git a/chapter06/kbd.xml b/chapter06/kbd.xml index 2bf0853f7..a72ca29a8 100644 --- a/chapter06/kbd.xml +++ b/chapter06/kbd.xml @@ -60,7 +60,7 @@ sed -i 's/resizecons.8 //' docs/man/man8/Makefile.in Prepare Kbd for compilation: -PKG_CONFIG_PATH=/tools/lib/pkgconfig ./configure --prefix=/usr --disable-vlock +./configure --prefix=/usr --disable-vlock The meaning of the configure options: diff --git a/chapter06/make.xml b/chapter06/make.xml index 585f8eea3..9c649cdc5 100644 --- a/chapter06/make.xml +++ b/chapter06/make.xml @@ -56,7 +56,7 @@ We use an environment variable to accomplish this. To test the results, issue: -make PERL5LIB=$PWD/tests/ check +make check Install the package: diff --git a/chapter06/revisedchroot.xml b/chapter06/revisedchroot.xml index f4e12a804..b80e32115 100644 --- a/chapter06/revisedchroot.xml +++ b/chapter06/revisedchroot.xml @@ -51,6 +51,7 @@ chroot "$LFS" /usr/bin/env -i \ remove them now: rm -f /usr/lib/lib{bfd,opcodes}.a +rm -f /usr/lib/libctf{,-nobfd}.a rm -f /usr/lib/libbz2.a rm -f /usr/lib/lib{com_err,e2p,ext2fs,ss}.a rm -f /usr/lib/libltdl.a diff --git a/chapter06/sed.xml b/chapter06/sed.xml index 9dee31ed2..71bfc245f 100644 --- a/chapter06/sed.xml +++ b/chapter06/sed.xml @@ -56,7 +56,7 @@ make html To test the results, issue: chown -Rv tester . -su -c "PATH=$PATH make check" +su tester -c "PATH=$PATH make check" Install the package and its documentation: