From 258e50e86f11d4ec2064fcdb403c5a7dc992a891 Mon Sep 17 00:00:00 2001 From: David Bryant Date: Mon, 12 Dec 2022 11:48:42 -0600 Subject: [PATCH 01/10] Modified list of tc subcommands to match the man page. Note that the help screen doesn't match the man page. Also, there's an action ("tc chain") in the synopsis section that is not further explained in the body of man tc. Documentation may be inaccurate. --- chapter08/iproute2.xml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/chapter08/iproute2.xml b/chapter08/iproute2.xml index 878ae22ed..bfc25331a 100644 --- a/chapter08/iproute2.xml +++ b/chapter08/iproute2.xml @@ -271,7 +271,6 @@ cp -v COPYING README* /usr/share/doc/iproute2-&iproute2-version; - tc @@ -284,14 +283,12 @@ cp -v COPYING README* /usr/share/doc/iproute2-&iproute2-version;tc class allows users to set up classes based on the queuing discipline scheduling - tc estimator allows users to estimate the - data flow through a network - tc filter allows users to set up the QoS/CoS packet filtering - - tc policy allows users to set up the QoS/CoS - policies + + tc monitor can be used to view changes + made to Traffic Control in the kernel. + tc From 4ecb5ada8e1cde0bb88abb95437b37161aa43832 Mon Sep 17 00:00:00 2001 From: David Bryant Date: Mon, 12 Dec 2022 14:44:57 -0600 Subject: [PATCH 02/10] Changed "behaviour" to "behavior" throughout the LFS book. --- bootscripts/ChangeLog | 2 +- chapter08/kbd.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bootscripts/ChangeLog b/bootscripts/ChangeLog index 1fca16a65..c7a3d9a7b 100644 --- a/bootscripts/ChangeLog +++ b/bootscripts/ChangeLog @@ -1135,7 +1135,7 @@ n/a - January 30, 2004: * Changed the loadkeys script to run "loadkeys -d" and removed the need for the /etc/sysconfig/keyboard file. The kbd patch fixes the - "loadkeys -d" behaviour. + "loadkeys -d" behavior. 1.6 - February 26th, 2002: diff --git a/chapter08/kbd.xml b/chapter08/kbd.xml index 25b0a8726..522ddbd72 100644 --- a/chapter08/kbd.xml +++ b/chapter08/kbd.xml @@ -41,7 +41,7 @@ Installation of Kbd - The behaviour of the backspace and delete keys is not consistent + The behavior of the backspace and delete keys is not consistent across the keymaps in the Kbd package. The following patch fixes this issue for i386 keymaps: From 769977307109e0d138077ee573a29b7b12952a08 Mon Sep 17 00:00:00 2001 From: David Bryant Date: Tue, 13 Dec 2022 10:50:11 -0600 Subject: [PATCH 03/10] Test suite is two words. Added the definite article where idiomatic. --- chapter08/binutils.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/chapter08/binutils.xml b/chapter08/binutils.xml index 28d44a9a0..f2061d5b8 100644 --- a/chapter08/binutils.xml +++ b/chapter08/binutils.xml @@ -175,10 +175,10 @@ cd build The test named ar with versioned solib is also known to fail. - Because of a race between the gas testsuite and the gprofng testsuite, + Because of a race between the gas test suite and the gprofng test suite, some gas tests may fail if parallel jobs are used. If you are not assured of the correctness of gas, invoke - make check-gas to run gas testsuite separately and + make check-gas to run the gas test suite separately and all tests should pass. Three gprofng tests yield the ERROR result, and they are counted as UNRESOLVED in the summary. From 3c5ecc9121193ac734a9220e0962c5e2ba1c67c4 Mon Sep 17 00:00:00 2001 From: David Bryant Date: Wed, 14 Dec 2022 08:47:53 -0600 Subject: [PATCH 04/10] "Test suite" is two words. --- chapter08/glibc.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/chapter08/glibc.xml b/chapter08/glibc.xml index 0295e0aab..340eb0861 100644 --- a/chapter08/glibc.xml +++ b/chapter08/glibc.xml @@ -387,10 +387,10 @@ unset ZONEINFO zoneinfo/posix. It is necessary to put the POSIX time zones in zoneinfo, otherwise various - test-suites will report errors. On an embedded system, where space is + test suites will report errors. On an embedded system, where space is tight and you do not intend to ever update the time zones, you could save 1.9 MB by not using the posix - directory, but some applications or test-suites might produce some + directory, but some applications or test suites might produce some failures. From 0c4501b5b186b116b90aa19fd7fb6087b3d70a69 Mon Sep 17 00:00:00 2001 From: David Bryant Date: Wed, 14 Dec 2022 17:36:16 -0600 Subject: [PATCH 05/10] Patch capitalization. Substitute "spell-checking" for "spell": "Spell" can be a noun or a verb, but it's never an adjective. Clarify the description of "xxd". --- chapter08/vim.xml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/chapter08/vim.xml b/chapter08/vim.xml index 948650e34..8672ad818 100644 --- a/chapter08/vim.xml +++ b/chapter08/vim.xml @@ -54,7 +54,7 @@ echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h - Prepare vim for compilation: + Prepare Vim for compilation: ./configure --prefix=/usr @@ -83,7 +83,7 @@ make install - Many users are used to using vi instead of + Many users reflexively type vi instead of vim. To allow execution of vim when users habitually enter vi, create a symlink for both the binary and the man page in the provided @@ -94,7 +94,7 @@ for L in /usr/share/man/{,*/}man1/vim.1; do ln -sv vim.1 $(dirname $L)/vi.1 done - By default, vim's documentation is installed in By default, Vim's documentation is installed in /usr/share/vim. The following symlink allows the documentation to be accessed via /usr/share/doc/vim-&vim-version;, making @@ -103,10 +103,10 @@ done ln -sv ../&vim-docdir;/doc /usr/share/doc/vim-&vim-version; If an X Window System is going to be installed on the LFS - system, it may be necessary to recompile vim after installing X. Vim + system, it may be necessary to recompile Vim after installing X. Vim comes with a GUI version of the editor that requires X and some additional libraries to be installed. For more information on this - process, refer to the vim documentation and the vim installation page + process, refer to the Vim documentation and the Vim installation page in the BLFS book at . @@ -166,8 +166,8 @@ EOF vim -c ':options' - By default, vim only installs spell files for the English language. - To install spell files for your preferred language, copy the + By default, vim only installs spell-checking files for the English language. + To install spell-checking files for your preferred language, copy the .spl and optionally, the .sug files for your language and character encoding from @@ -175,7 +175,7 @@ EOF /usr/share/&vim-docdir;/spell/. - To use these spell files, some configuration in + To use these spell-checking files, some configuration in /etc/vimrc is needed, e.g.: set spelllang=en,ru @@ -297,7 +297,8 @@ set spell xxd Creates a hex dump of the given file; it can - also do the reverse, so it can be used for binary patching + also perform the inverse operation, so it can be used for binary + patching xxd From c9aabf13a1e8e1fb57688a7dea2f2ca2f1a9e1ab Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Thu, 15 Dec 2022 10:23:03 -0600 Subject: [PATCH 06/10] Package updates and a minor fix. Ensure a gawk hard link is updated in Chapter 8. Update to iana-etc-20221209. Update to vim-9.0.1060. Update to iproute2-6.1.0. Update to xz-5.4.0. Update to bash-5.2.15. Update to psmisc-23.6. Update to mpc-1.3.0. Update to python3-3.11.1. Update to procps-ng-4.0.2. --- chapter01/changelog.xml | 47 +++++++++++++++++++++++++++++++++++ chapter01/whatsnew.xml | 8 +++--- chapter08/bash.xml | 8 +++--- chapter08/gawk.xml | 14 ++++++++++- chapter08/mpc.xml | 12 +++++++++ packages.ent | 54 ++++++++++++++++++++--------------------- 6 files changed, 107 insertions(+), 36 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index acaf6a359..b3f9f5c5a 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -39,6 +39,53 @@ or as appropriate for the entry or if needed the entire day's listitem. --> + + 2022-12-15 + + + [bdubbs] - Ensure a gawk hard link is updated in + Chapter 8. Fixes + #5180. + + + [bdubbs] - Update to iana-etc-20221209. Addresses + #5006. + + + [bdubbs] - Update to vim-9.0.1060. Addresses + #5006. + + + [bdubbs] - Update to iproute2-6.1.0. Fixes + #5184. + + + [bdubbs] - Update to xz-5.4.0. Fixes + #5183. + + + [bdubbs] - Update to bash-5.2.15. Fixes + #5182. + + + [bdubbs] - Update to psmisc-23.6. Fixes + #5181. + + + [bdubbs] - Update to mpc-1.3.0. Fixes + #5178. + + + [bdubbs] - Update to python3-3.11.1. Fixes + #5177. + + + [bdubbs] - Update to procps-ng-4.0.2. Fixes + #5176. + + + + 2022-12-01 diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 637fafa44..207240036 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -193,9 +193,9 @@ Meson-&meson-version; - + @@ -220,9 +220,9 @@ Procps-ng-&procps-ng-version; - + Python-&python-version; diff --git a/chapter08/bash.xml b/chapter08/bash.xml index 4ea981d5b..60154f6fd 100644 --- a/chapter08/bash.xml +++ b/chapter08/bash.xml @@ -42,10 +42,10 @@ Prepare Bash for compilation: -./configure --prefix=/usr \ - --docdir=/usr/share/doc/bash-&bash-version; \ - --without-bash-malloc \ - --with-installed-readline + ./configure --prefix=/usr \ + --without-bash-malloc \ + --with-installed-readline \ + --docdir=/usr/share/doc/bash-&bash-version; The meaning of the new configure option: diff --git a/chapter08/gawk.xml b/chapter08/gawk.xml index 4c8ecc265..45a7444bf 100644 --- a/chapter08/gawk.xml +++ b/chapter08/gawk.xml @@ -58,7 +58,19 @@ Install the package: -make install +make LN='ln -f' install + + + The meaning of the make environment variable: + + + LN='ln -f' + + This variable ensures that the previous hard link installed + in is updated here. + + + If desired, install the documentation: diff --git a/chapter08/mpc.xml b/chapter08/mpc.xml index ad46b7e43..5bcfd0292 100644 --- a/chapter08/mpc.xml +++ b/chapter08/mpc.xml @@ -42,6 +42,18 @@ Installation of MPC + First, make a fix identified upstream: + +sed -i '273{ h; d; }; 274,286 { H; d; }; 287 G' src/mpc.h + + + This sed is a little complex and needs some explanation. It holds + the line 273 in a buffer, adds lines 274-286 to it. It then writes the + buffer out after line 287 is read. The result is that the line 287 is + moved upwards from an incorrect location to its correct location in an + #ifdef block. + + Prepare MPC for compilation: ./configure --prefix=/usr \ diff --git a/packages.ent b/packages.ent index 70f5da111..e4dca15f2 100644 --- a/packages.ent +++ b/packages.ent @@ -48,10 +48,10 @@ - + - + @@ -317,10 +317,10 @@ - + - + @@ -342,10 +342,10 @@ - - + + - + @@ -495,10 +495,10 @@ - - + + - + @@ -569,18 +569,18 @@ - - + + - + - - + + - + @@ -588,19 +588,19 @@ - + - + - + - - + + @@ -717,13 +717,13 @@ - + - + - + @@ -744,10 +744,10 @@ - - + + - + From 26954aad8d430e7be853ba568c743315b8cb4fbe Mon Sep 17 00:00:00 2001 From: David Bryant Date: Thu, 15 Dec 2022 11:07:56 -0600 Subject: [PATCH 07/10] Correct inconsistency in list of installed programs (awk --> gawk). --- chapter08/gawk.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chapter08/gawk.xml b/chapter08/gawk.xml index 45a7444bf..b0e7cc43c 100644 --- a/chapter08/gawk.xml +++ b/chapter08/gawk.xml @@ -88,7 +88,7 @@ cp -v doc/{awkforai.txt,*.{eps,pdf,jpg}} /usr/share/doc/gawk-&gawk-version;Installed directories - awk (link to gawk), gawk, and awk-&gawk-version; + awk (link to gawk), gawk, and gawk-&gawk-version; filefuncs.so, fnmatch.so, fork.so, inplace.so, intdiv.so, ordchr.so, readdir.so, readfile.so, revoutput.so, revtwoway.so, rwarray.so, and time.so (all in /usr/lib/gawk) From 59109ad71417440e65f13e659756eaa5281a83e9 Mon Sep 17 00:00:00 2001 From: David Bryant Date: Thu, 15 Dec 2022 12:24:46 -0600 Subject: [PATCH 08/10] Reordered a clumsy sentence. --- chapter08/man-db.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chapter08/man-db.xml b/chapter08/man-db.xml index 523962c9a..55559b1fa 100644 --- a/chapter08/man-db.xml +++ b/chapter08/man-db.xml @@ -77,7 +77,7 @@ --enable-cache-owner=bin - This makes the system-wide cache files be owned by user + This changes ownership of the system-wide cache files to user bin. From baf93f520fa8378454cfc313dd6e256c6167c875 Mon Sep 17 00:00:00 2001 From: David Bryant Date: Thu, 15 Dec 2022 12:44:44 -0600 Subject: [PATCH 09/10] Capitalized the name of the package. Removed "pwait" from the Short Descriptions list; it has already beeen dropped from the Installed Programs list. --- chapter08/procps.xml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/chapter08/procps.xml b/chapter08/procps.xml index dbc78213c..e17d199ca 100644 --- a/chapter08/procps.xml +++ b/chapter08/procps.xml @@ -40,7 +40,7 @@ Installation of Procps-ng - Prepare procps-ng for compilation: + Prepare Procps-ng for compilation: ./configure --prefix=/usr \ --docdir=/usr/share/doc/procps-ng-&procps-ng-version; \ @@ -60,7 +60,7 @@ --disable-kill This switch disables building the kill - command that will be installed by the Util-linux package. + command; it will be installed from the Util-linux package. @@ -181,7 +181,7 @@ make check - + pwdx From c8e374b510336132931a766bc07dc535cd9e775a Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Fri, 16 Dec 2022 15:51:50 +0800 Subject: [PATCH 10/10] gawk: LN='ln -f' is an overridden make variable, not environment variable `LN='ln -f' make install` won't work. The terminlogy "override" is from section 9.5 of "info make". --- chapter08/gawk.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chapter08/gawk.xml b/chapter08/gawk.xml index b0e7cc43c..192cc9f32 100644 --- a/chapter08/gawk.xml +++ b/chapter08/gawk.xml @@ -61,7 +61,7 @@ make LN='ln -f' install - The meaning of the make environment variable: + The meaning of the overridden make variable: LN='ln -f'