diff --git a/Makefile b/Makefile index 71b82d0c6..1f1de8d23 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,4 @@ +# vim:ts=3 #BASEDIR = ~/lfs-book #SYSDDIR = ~/lfs-systemd #DUMPDIR = ~/lfs-commands @@ -23,12 +24,12 @@ ifneq ($(REV), sysv) endif ifeq ($(REV), sysv) - BASEDIR ?= ~/lfs-book + BASEDIR ?= ~/public_html/lfs-book PDF_OUTPUT ?= LFS-BOOK.pdf NOCHUNKS_OUTPUT ?= LFS-BOOK.html DUMPDIR ?= ~/lfs-commands else - BASEDIR ?= ~/lfs-systemd + BASEDIR ?= ~/public_html/lfs-systemd PDF_OUTPUT ?= LFS-SYSD-BOOK.pdf NOCHUNKS_OUTPUT ?= LFS-SYSD-BOOK.html DUMPDIR ?= ~/lfs-sysd-commands @@ -107,7 +108,6 @@ nochunks: validate profile-html $(Q)sed -i -e "s@text/html@application/xhtml+xml@g" $(BASEDIR)/$(NOCHUNKS_OUTPUT) $(Q)sed -i -e "s@../wget-list@wget-list@" $(BASEDIR)/$(NOCHUNKS_OUTPUT) $(Q)sed -i -e "s@../md5sums@md5sums@" $(BASEDIR)/$(NOCHUNKS_OUTPUT) - $(Q)sed -i -e "s@\xa9@\©@" $(BASEDIR)/$(NOCHUNKS_OUTPUT) @echo "Output at $(BASEDIR)/$(NOCHUNKS_OUTPUT)" @@ -150,9 +150,11 @@ profile-html: stylesheets/lfs-xsl/profile.xsl \ $(RENDERTMP)/lfs-full.xml +DOWNLOADS_DEP = chapter03/packages.xml chapter03/patches.xml \ + packages.ent patches.ent general.ent + wget-list: $(BASEDIR)/wget-list $(BASEDIR)/wget-list-$(REV) -$(BASEDIR)/wget-list: stylesheets/wget-list.xsl chapter03/chapter03.xml \ - packages.ent patches.ent general.ent +$(BASEDIR)/wget-list: stylesheets/wget-list.xsl $(DOWNLOADS_DEP) @echo "Generating consolidated wget list at $(BASEDIR)/wget-list ..." $(Q)mkdir -p $(BASEDIR) $(Q)xsltproc --xinclude --nonet \ @@ -160,9 +162,7 @@ $(BASEDIR)/wget-list: stylesheets/wget-list.xsl chapter03/chapter03.xml \ stylesheets/wget-list.xsl \ chapter03/chapter03.xml -$(BASEDIR)/wget-list-$(REV): stylesheets/wget-list.xsl \ - chapter03/chapter03.xml \ - packages.ent patches.ent general.ent +$(BASEDIR)/wget-list-$(REV): stylesheets/wget-list.xsl $(DOWNLOADS_DEP) $(Q)xsltproc --nonet --xinclude \ --stringparam profile.revision $(REV) \ --output $(RENDERTMP)/wget-list.xml \ @@ -174,8 +174,7 @@ $(BASEDIR)/wget-list-$(REV): stylesheets/wget-list.xsl \ $(RENDERTMP)/wget-list.xml md5sums: $(BASEDIR)/md5sums -$(BASEDIR)/md5sums: stylesheets/wget-list.xsl chapter03/chapter03.xml \ - packages.ent patches.ent +$(BASEDIR)/md5sums: stylesheets/wget-list.xsl $(DOWNLOADS_DEP) @echo "Generating consolidated md5sum file at $(BASEDIR)/md5sums ..." $(Q)mkdir -p $(BASEDIR) diff --git a/appendices/acknowledgments.xml b/appendices/acknowledgments.xml index 24cb88350..3d3f8bb69 100644 --- a/appendices/acknowledgments.xml +++ b/appendices/acknowledgments.xml @@ -1,4 +1,4 @@ - + diff --git a/appendices/acronymlist.xml b/appendices/acronymlist.xml index 9038da8f6..3ccfd3fb2 100644 --- a/appendices/acronymlist.xml +++ b/appendices/acronymlist.xml @@ -1,4 +1,4 @@ - + diff --git a/appendices/creat-comm.xml b/appendices/creat-comm.xml index 2ecc76097..be4e9ee7f 100644 --- a/appendices/creat-comm.xml +++ b/appendices/creat-comm.xml @@ -1,4 +1,4 @@ - + diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml index 3cbfe7b8b..1493d84f9 100644 --- a/appendices/dependencies.xml +++ b/appendices/dependencies.xml @@ -1,4 +1,4 @@ - + @@ -107,7 +107,7 @@ &before; - Acl and Libcap + Acl, Libcap, and Patch @@ -1239,7 +1239,7 @@ &before; - Man-DB and Perl + Man-DB @@ -2414,14 +2414,15 @@ &dependencies; - Bash, Binutils, Coreutils, GCC, Glibc, Grep, Make, and Sed + Attr, Bash, Binutils, Coreutils, GCC, Glibc, Grep, Make, and + Sed &runtime; - Glibc + Attr and Glibc @@ -2454,7 +2455,7 @@ &dependencies; - Bash, Binutils, Coreutils, Gawk, GCC, GDBM, Glibc, Grep, Groff, + Bash, Binutils, Coreutils, Gawk, GCC, GDBM, Glibc, Grep, Libxcrypt, Make, Sed, and Zlib diff --git a/appendices/license.xml b/appendices/license.xml index ebcb5c0be..75eb24257 100644 --- a/appendices/license.xml +++ b/appendices/license.xml @@ -1,4 +1,4 @@ - + diff --git a/appendices/mit-lic.xml b/appendices/mit-lic.xml index 1e8ed4d03..6715d2a48 100644 --- a/appendices/mit-lic.xml +++ b/appendices/mit-lic.xml @@ -1,4 +1,4 @@ - + diff --git a/appendices/scripts.xml b/appendices/scripts.xml index 69d653bdc..980b90961 100644 --- a/appendices/scripts.xml +++ b/appendices/scripts.xml @@ -1,4 +1,4 @@ - + diff --git a/appendices/udev-rules.xml b/appendices/udev-rules.xml index 189f55f41..25f41033e 100644 --- a/appendices/udev-rules.xml +++ b/appendices/udev-rules.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter01/askforhelp.xml b/chapter01/askforhelp.xml index 5eb1d939f..dd36b30fa 100644 --- a/chapter01/askforhelp.xml +++ b/chapter01/askforhelp.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index de94d85d9..aba69a0de 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -1,4 +1,4 @@ - + @@ -40,6 +40,82 @@ appropriate for the entry or if needed the entire day's listitem. --> + + 2024-01-21 + + + [xry111] - Apply upstream fix for pkgconf-2.1.0 regression. + Fixes #5414. + + + [xry111] - Update to jinja2-3.1.3 (security fix). Fixes + #5411. + + + [xry111] - Update to bc-6.7.5. Fixes + #5408. + + + [xry111] - Update to attr-2.5.2. Fixes + #5412. + + + [xry111] - Update to ncurses-6.4-20230520 (security fix). + Fixes #5416. + + + [xry111] - Update to markupsafe-2.1.4. Fixes + #5418. + + + [xry111] - Update to linux-6.7.1. Fixes + #5406. + + + [xry111] - Update to iproute2-6.7.0. Fixes + #5410. + + + [xry111] - Update to vim-9.1.0041. Addresses + #4500. + + + [xry111] - Update to iana-etc-20240117. Addresses + #5006. + + + [xry111] - Update to shadow-4.14.3. Fixes + #5413. + + + [xry111] - Fix CVE-2024-0684 for coreutils-9.4. Fixes + #5417. + + + + + + 2024-01-18 + + + [xry111] - Edit a ncurses header to always use the + wide-character ABI compatible with libncursesw.so because we + are faking the 8-bit libncurses.so with it. Fixes + #5415. + + + + + + 2024-01-09 + + + [renodr] - Fix the definition of the C.UTF-8 locale. Fixes + #5409. + + + + 2023-12-31 diff --git a/chapter01/chapter01.xml b/chapter01/chapter01.xml index 6af8ca1c6..d54b7adcd 100644 --- a/chapter01/chapter01.xml +++ b/chapter01/chapter01.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter01/how.xml b/chapter01/how.xml index 107c415aa..36dd88851 100644 --- a/chapter01/how.xml +++ b/chapter01/how.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter01/resources.xml b/chapter01/resources.xml index d3bc7860e..47a568626 100644 --- a/chapter01/resources.xml +++ b/chapter01/resources.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 4222d3f4f..16256ccda 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -1,4 +1,4 @@ - + Acl-&acl-version; --> - + Autoconf-&autoconf-version; @@ -134,9 +134,9 @@ IPRoute2-&iproute2-version; - + Kbd-&kbd-version; @@ -179,9 +179,9 @@ - + Meson-&meson-version; @@ -191,9 +191,9 @@ MPFR-&mpfr-version; - + @@ -298,6 +298,10 @@ &glibc-upstream-fixes-patch; + + &pkgconf-upstream-fix-patch; + + &readline-fixes-patch; diff --git a/chapter02/aboutlfs.xml b/chapter02/aboutlfs.xml index 85ffd5b57..4f3f6ba46 100644 --- a/chapter02/aboutlfs.xml +++ b/chapter02/aboutlfs.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter02/chapter02.xml b/chapter02/chapter02.xml index c228ef2d8..9a9f2c720 100644 --- a/chapter02/chapter02.xml +++ b/chapter02/chapter02.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter02/creatingfilesystem.xml b/chapter02/creatingfilesystem.xml index 5eedf456e..9b1a08b2a 100644 --- a/chapter02/creatingfilesystem.xml +++ b/chapter02/creatingfilesystem.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter02/creatingpartition.xml b/chapter02/creatingpartition.xml index 35279cb75..ef16c8b92 100644 --- a/chapter02/creatingpartition.xml +++ b/chapter02/creatingpartition.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter02/hostreqs.xml b/chapter02/hostreqs.xml index d069e9d7b..0c7de897c 100644 --- a/chapter02/hostreqs.xml +++ b/chapter02/hostreqs.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter02/introduction.xml b/chapter02/introduction.xml index bddcfec61..f739613ff 100644 --- a/chapter02/introduction.xml +++ b/chapter02/introduction.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter02/mounting.xml b/chapter02/mounting.xml index 1c2e7205e..6c279ac78 100644 --- a/chapter02/mounting.xml +++ b/chapter02/mounting.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter02/stages.xml b/chapter02/stages.xml index 04f6373c9..710ff6585 100644 --- a/chapter02/stages.xml +++ b/chapter02/stages.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter03/chapter03.xml b/chapter03/chapter03.xml index f9b36e2e2..ca3bc32ec 100644 --- a/chapter03/chapter03.xml +++ b/chapter03/chapter03.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter03/introduction.xml b/chapter03/introduction.xml index 0e90508ae..05488ecbc 100644 --- a/chapter03/introduction.xml +++ b/chapter03/introduction.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter03/packages.xml b/chapter03/packages.xml index deae31301..1f5b55427 100644 --- a/chapter03/packages.xml +++ b/chapter03/packages.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter03/patches.xml b/chapter03/patches.xml index 2073638fc..50ff56a6f 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -1,4 +1,4 @@ - + @@ -117,15 +117,14 @@ --> - Readline Upstream Fix Patch - &readline-fixes-patch-size;: diff --git a/chapter04/aboutsbus.xml b/chapter04/aboutsbus.xml index 42a523fa1..dccf59fe7 100644 --- a/chapter04/aboutsbus.xml +++ b/chapter04/aboutsbus.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter04/abouttestsuites.xml b/chapter04/abouttestsuites.xml index 459472be0..734e1c378 100644 --- a/chapter04/abouttestsuites.xml +++ b/chapter04/abouttestsuites.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter04/addinguser.xml b/chapter04/addinguser.xml index 3a32fb987..a25c8b835 100644 --- a/chapter04/addinguser.xml +++ b/chapter04/addinguser.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter04/chapter04.xml b/chapter04/chapter04.xml index 5ad2d22db..fdb847efe 100644 --- a/chapter04/chapter04.xml +++ b/chapter04/chapter04.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter04/creatingminlayout.xml b/chapter04/creatingminlayout.xml index 19919d5c7..0657381f5 100644 --- a/chapter04/creatingminlayout.xml +++ b/chapter04/creatingminlayout.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter04/introduction.xml b/chapter04/introduction.xml index e2ef6f0ba..069df4008 100644 --- a/chapter04/introduction.xml +++ b/chapter04/introduction.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter04/settingenviron.xml b/chapter04/settingenviron.xml index 61a655655..20988bd3f 100644 --- a/chapter04/settingenviron.xml +++ b/chapter04/settingenviron.xml @@ -1,4 +1,4 @@ - + @@ -79,8 +79,8 @@ EOF Setting the user file-creation mask (umask) to 022 ensures that newly created files and directories are only writable by their owner, but are readable and executable by anyone (assuming default modes are used by the - open(2) system call, new files will end up with permission - mode 644 and directories with mode 755). + open(2) system call, new files will end up with + permission mode 644 and directories with mode 755). diff --git a/chapter05/binutils-pass1.xml b/chapter05/binutils-pass1.xml index c3bf1f117..ef9f3948c 100644 --- a/chapter05/binutils-pass1.xml +++ b/chapter05/binutils-pass1.xml @@ -1,4 +1,4 @@ - + @@ -142,7 +142,7 @@ cd build for a dynamic linker to perform symbol lookup. On LFS the dynamic linker (provided by the Glibc package) will always use the GNU-style hash table which is faster to query. So the classic - ELF hash table is completely useless. This makes the the linker + ELF hash table is completely useless. This makes the linker only generate the GNU-style hash table by default, so we can avoid wasting time to generate the classic ELF hash table when we build the packages, or wasting disk space to store it. diff --git a/chapter05/chapter05.xml b/chapter05/chapter05.xml index 467a02a36..79d89a0a6 100644 --- a/chapter05/chapter05.xml +++ b/chapter05/chapter05.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml index f559f5aa3..47ca6d1b4 100644 --- a/chapter05/gcc-pass1.xml +++ b/chapter05/gcc-pass1.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml index b6f0da12b..fa4e5d849 100644 --- a/chapter05/glibc.xml +++ b/chapter05/glibc.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter05/introduction.xml b/chapter05/introduction.xml index 0318acf8b..3a602d29e 100644 --- a/chapter05/introduction.xml +++ b/chapter05/introduction.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter05/libstdc++.xml b/chapter05/libstdc++.xml index 1dc4277ee..e16efdea9 100644 --- a/chapter05/libstdc++.xml +++ b/chapter05/libstdc++.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter05/linux-headers.xml b/chapter05/linux-headers.xml index 09fedf835..2c01e944c 100644 --- a/chapter05/linux-headers.xml +++ b/chapter05/linux-headers.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter06/bash.xml b/chapter06/bash.xml index d00e685ca..54fa6f444 100644 --- a/chapter06/bash.xml +++ b/chapter06/bash.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter06/binutils-pass2.xml b/chapter06/binutils-pass2.xml index 15582f937..9832e154d 100644 --- a/chapter06/binutils-pass2.xml +++ b/chapter06/binutils-pass2.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml index 366e9a8ab..70de6ff3e 100644 --- a/chapter06/chapter06.xml +++ b/chapter06/chapter06.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml index f6b6c6310..9b246a5f4 100644 --- a/chapter06/coreutils.xml +++ b/chapter06/coreutils.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter06/diffutils.xml b/chapter06/diffutils.xml index d2b875a9d..92951604d 100644 --- a/chapter06/diffutils.xml +++ b/chapter06/diffutils.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter06/file.xml b/chapter06/file.xml index 425a9bf58..cb952d9bb 100644 --- a/chapter06/file.xml +++ b/chapter06/file.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter06/findutils.xml b/chapter06/findutils.xml index 7bb0c7219..db8eea40e 100644 --- a/chapter06/findutils.xml +++ b/chapter06/findutils.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter06/gawk.xml b/chapter06/gawk.xml index 40d69548d..d44428d0a 100644 --- a/chapter06/gawk.xml +++ b/chapter06/gawk.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter06/gcc-pass2.xml b/chapter06/gcc-pass2.xml index 0ed477c58..e8ed0d1c1 100644 --- a/chapter06/gcc-pass2.xml +++ b/chapter06/gcc-pass2.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter06/grep.xml b/chapter06/grep.xml index dd942c712..ac60ff8b3 100644 --- a/chapter06/grep.xml +++ b/chapter06/grep.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter06/gzip.xml b/chapter06/gzip.xml index d75f26928..9f5f170c4 100644 --- a/chapter06/gzip.xml +++ b/chapter06/gzip.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter06/introduction.xml b/chapter06/introduction.xml index a0ecb1ef1..bfa2dafd4 100644 --- a/chapter06/introduction.xml +++ b/chapter06/introduction.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter06/m4.xml b/chapter06/m4.xml index acdea4f32..9f422adac 100644 --- a/chapter06/m4.xml +++ b/chapter06/m4.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter06/make.xml b/chapter06/make.xml index cf0dbce18..eaf0db48f 100644 --- a/chapter06/make.xml +++ b/chapter06/make.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter06/ncurses.xml b/chapter06/ncurses.xml index 8d7c8b1fe..0a8c7e166 100644 --- a/chapter06/ncurses.xml +++ b/chapter06/ncurses.xml @@ -1,4 +1,4 @@ - + @@ -156,7 +156,9 @@ popd Install the package: make DESTDIR=$LFS TIC_PATH=$(pwd)/build/progs/tic install -echo "INPUT(-lncursesw)" > $LFS/usr/lib/libncurses.so +ln -sv libncursesw.so $LFS/usr/lib/libncurses.so +sed -e 's/^#if.*XOPEN.*$/#if 1/' \ + -i $LFS/usr/include/curses.h - + Fix a security vulnerability in the split + utility: + +sed -e '/n_out += n_hold/,+4 s|.*bufsize.*|//&|' \ + -i src/split.c -sed '/if ( ! match/s/ed_checksums//' -i src/digest.c ---> Now prepare Coreutils for compilation: autoreconf -fiv diff --git a/chapter08/dbus.xml b/chapter08/dbus.xml index 309e5b2e9..36d5c55ca 100644 --- a/chapter08/dbus.xml +++ b/chapter08/dbus.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter08/dejagnu.xml b/chapter08/dejagnu.xml index 4dc422f3a..c9b537f0b 100644 --- a/chapter08/dejagnu.xml +++ b/chapter08/dejagnu.xml @@ -1,4 +1,4 @@ - + @@ -54,16 +54,16 @@ cd build makeinfo --html --no-split -o doc/dejagnu.html ../doc/dejagnu.texi makeinfo --plaintext -o doc/dejagnu.txt ../doc/dejagnu.texi - Build and install the package: + To test the results, issue: + +make check + + Install the package: make install install -v -dm755 /usr/share/doc/dejagnu-&dejagnu-version; install -v -m644 doc/dejagnu.{html,txt} /usr/share/doc/dejagnu-&dejagnu-version; - To test the results, issue: - -make check - diff --git a/chapter08/diffutils.xml b/chapter08/diffutils.xml index 2ffb9fa8c..b8cdf796f 100644 --- a/chapter08/diffutils.xml +++ b/chapter08/diffutils.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter08/e2fsprogs.xml b/chapter08/e2fsprogs.xml index 5d50508b5..6a4489dee 100644 --- a/chapter08/e2fsprogs.xml +++ b/chapter08/e2fsprogs.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter08/expat.xml b/chapter08/expat.xml index 86dd1d287..34595aa5f 100644 --- a/chapter08/expat.xml +++ b/chapter08/expat.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter08/expect.xml b/chapter08/expect.xml index 02848f7fc..e0d600fb8 100644 --- a/chapter08/expect.xml +++ b/chapter08/expect.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter08/file.xml b/chapter08/file.xml index eb9f41a2b..790d0d0ef 100644 --- a/chapter08/file.xml +++ b/chapter08/file.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter08/findutils.xml b/chapter08/findutils.xml index 5440490cf..7012c221a 100644 --- a/chapter08/findutils.xml +++ b/chapter08/findutils.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter08/flex.xml b/chapter08/flex.xml index d572edf22..9c8693a5e 100644 --- a/chapter08/flex.xml +++ b/chapter08/flex.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter08/flit-core.xml b/chapter08/flit-core.xml index 661a02684..419efc30f 100644 --- a/chapter08/flit-core.xml +++ b/chapter08/flit-core.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter08/gawk.xml b/chapter08/gawk.xml index d8984b58e..a7f74eb92 100644 --- a/chapter08/gawk.xml +++ b/chapter08/gawk.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter08/gcc.xml b/chapter08/gcc.xml index 10c80b277..72e59707b 100644 --- a/chapter08/gcc.xml +++ b/chapter08/gcc.xml @@ -1,4 +1,4 @@ - + @@ -528,7 +528,7 @@ mv -v /usr/lib/*gdb.py /usr/share/gdb/auto-load/usr/lib libcc1 - The C preprocessing library + A library that allows GDB to make use of GCC libcc1 diff --git a/chapter08/gdbm.xml b/chapter08/gdbm.xml index 7f7b4d855..cd0c837f3 100644 --- a/chapter08/gdbm.xml +++ b/chapter08/gdbm.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter08/gettext.xml b/chapter08/gettext.xml index bf5a97522..f26d15536 100644 --- a/chapter08/gettext.xml +++ b/chapter08/gettext.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter08/glibc.xml b/chapter08/glibc.xml index c00d56d30..1c365ccb1 100644 --- a/chapter08/glibc.xml +++ b/chapter08/glibc.xml @@ -1,4 +1,4 @@ - + @@ -245,7 +245,7 @@ install -v -Dm644 ../nscd/nscd.service /usr/lib/systemd/system/nscd.service mkdir -pv /usr/lib/locale -localedef -i POSIX -f UTF-8 C.UTF-8 2> /dev/null || true +localedef -i C -f UTF-8 C.UTF-8 localedef -i cs_CZ -f UTF-8 cs_CZ.UTF-8 localedef -i de_DE -f ISO-8859-1 de_DE localedef -i de_DE@euro -f ISO-8859-15 de_DE@euro @@ -297,7 +297,7 @@ localedef -i zh_TW -f UTF-8 zh_TW.UTF-8 when you need them. For instance, the following two locales are needed for some tests later in this chapter: -localedef -i POSIX -f UTF-8 C.UTF-8 2> /dev/null || true +localedef -i C -f UTF-8 C.UTF-8 localedef -i ja_JP -f SHIFT_JIS ja_JP.SJIS 2> /dev/null || true Glibc now uses libidn2 when resolving internationalized diff --git a/chapter08/gmp.xml b/chapter08/gmp.xml index c2fd316f8..2b8f0fa8c 100644 --- a/chapter08/gmp.xml +++ b/chapter08/gmp.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter08/gperf.xml b/chapter08/gperf.xml index aa42fe18b..bbfbbe735 100644 --- a/chapter08/gperf.xml +++ b/chapter08/gperf.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter08/grep.xml b/chapter08/grep.xml index 25d598dfe..b518de18b 100644 --- a/chapter08/grep.xml +++ b/chapter08/grep.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter08/groff.xml b/chapter08/groff.xml index 3a4dc2c56..7399bee21 100644 --- a/chapter08/groff.xml +++ b/chapter08/groff.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter08/grub.xml b/chapter08/grub.xml index 800a9c568..83ec4fa05 100644 --- a/chapter08/grub.xml +++ b/chapter08/grub.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter08/gzip.xml b/chapter08/gzip.xml index a20bcdd7a..c4130944c 100644 --- a/chapter08/gzip.xml +++ b/chapter08/gzip.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter08/iana-etc.xml b/chapter08/iana-etc.xml index 65530f9d8..752a27336 100644 --- a/chapter08/iana-etc.xml +++ b/chapter08/iana-etc.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter08/inetutils.xml b/chapter08/inetutils.xml index 8acb361d8..468ccb25e 100644 --- a/chapter08/inetutils.xml +++ b/chapter08/inetutils.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter08/intltool.xml b/chapter08/intltool.xml index d48c93015..9689afd6a 100644 --- a/chapter08/intltool.xml +++ b/chapter08/intltool.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter08/introduction.xml b/chapter08/introduction.xml index 93d4bd68d..ccfe6fa14 100644 --- a/chapter08/introduction.xml +++ b/chapter08/introduction.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter08/iproute2.xml b/chapter08/iproute2.xml index cd3e5a658..8a6755f3d 100644 --- a/chapter08/iproute2.xml +++ b/chapter08/iproute2.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter08/jinja2.xml b/chapter08/jinja2.xml index 59a01e26c..c06da9139 100644 --- a/chapter08/jinja2.xml +++ b/chapter08/jinja2.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter08/kbd.xml b/chapter08/kbd.xml index 28685015a..3239d6a21 100644 --- a/chapter08/kbd.xml +++ b/chapter08/kbd.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter08/kmod.xml b/chapter08/kmod.xml index 728f59bc7..9a16da3f0 100644 --- a/chapter08/kmod.xml +++ b/chapter08/kmod.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter08/less.xml b/chapter08/less.xml index 99f4e62ee..e9b6a6c67 100644 --- a/chapter08/less.xml +++ b/chapter08/less.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter08/libcap.xml b/chapter08/libcap.xml index f5d142210..d2e4a641c 100644 --- a/chapter08/libcap.xml +++ b/chapter08/libcap.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter08/libelf.xml b/chapter08/libelf.xml index a17818274..68ccf2b42 100644 --- a/chapter08/libelf.xml +++ b/chapter08/libelf.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter08/libffi.xml b/chapter08/libffi.xml index 411beba5c..1a07e4e76 100644 --- a/chapter08/libffi.xml +++ b/chapter08/libffi.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter08/libpipeline.xml b/chapter08/libpipeline.xml index 5d275d381..a1be58923 100644 --- a/chapter08/libpipeline.xml +++ b/chapter08/libpipeline.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter08/libtool.xml b/chapter08/libtool.xml index d73bd6efb..89b7786aa 100644 --- a/chapter08/libtool.xml +++ b/chapter08/libtool.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter08/libxcrypt.xml b/chapter08/libxcrypt.xml index 1838a55b6..7c6cc15ba 100644 --- a/chapter08/libxcrypt.xml +++ b/chapter08/libxcrypt.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter08/m4.xml b/chapter08/m4.xml index 14ce93291..2af3fd283 100644 --- a/chapter08/m4.xml +++ b/chapter08/m4.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter08/make.xml b/chapter08/make.xml index 80abcd128..186698a58 100644 --- a/chapter08/make.xml +++ b/chapter08/make.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter08/man-db.xml b/chapter08/man-db.xml index 229111131..e6d141987 100644 --- a/chapter08/man-db.xml +++ b/chapter08/man-db.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter08/man-pages.xml b/chapter08/man-pages.xml index 19772f414..54029fd2d 100644 --- a/chapter08/man-pages.xml +++ b/chapter08/man-pages.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter08/markupsafe.xml b/chapter08/markupsafe.xml index c09b9a64c..685b7b520 100644 --- a/chapter08/markupsafe.xml +++ b/chapter08/markupsafe.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter08/meson.xml b/chapter08/meson.xml index 8cf308237..89e3a5bdc 100644 --- a/chapter08/meson.xml +++ b/chapter08/meson.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter08/mpc.xml b/chapter08/mpc.xml index 941ee041c..f35378359 100644 --- a/chapter08/mpc.xml +++ b/chapter08/mpc.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter08/mpfr.xml b/chapter08/mpfr.xml index cba4a64aa..9e7f75825 100644 --- a/chapter08/mpfr.xml +++ b/chapter08/mpfr.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter08/ncurses.xml b/chapter08/ncurses.xml index b51099001..83ce508d6 100644 --- a/chapter08/ncurses.xml +++ b/chapter08/ncurses.xml @@ -1,4 +1,4 @@ - + @@ -99,9 +99,9 @@ --enable-widec This switch causes wide-character libraries (e.g., libncursesw.so.&ncurses-version;) + class="libraryfile">libncursesw.so.&ncurses-release;) to be built instead of normal ones (e.g., libncurses.so.&ncurses-version;). + class="libraryfile">libncurses.so.&ncurses-release;). These wide-character libraries are usable in both multibyte and traditional 8-bit locales, while normal libraries work properly only in 8-bit locales. Wide-character and normal libraries are @@ -127,34 +127,39 @@ make will spawn new shell processes during "make install". --> The installation of this package will overwrite - libncursesw.so.&ncurses-version; + libncursesw.so.&ncurses-release; in-place. It may crash the shell process which is using code and data from the library file. Install the package with DESTDIR, and replace the library file correctly using - install command: + install command (the header + curses.h is also edited to ensure the + wide-character ABI to be used as what we've done in + ): make DESTDIR=$PWD/dest install -install -vm755 dest/usr/lib/libncursesw.so.&ncurses-version; /usr/lib -rm -v dest/usr/lib/libncursesw.so.&ncurses-version; +install -vm755 dest/usr/lib/libncursesw.so.&ncurses-release; /usr/lib +rm -v dest/usr/lib/libncursesw.so.&ncurses-release; +sed -e 's/^#if.*XOPEN.*$/#if 1/' \ + -i dest/usr/include/curses.h cp -av dest/* / Many applications still expect the linker to be able to find - non-wide-character Ncurses libraries. Trick such applications into linking with - wide-character libraries by means of symlinks and linker scripts: + non-wide-character Ncurses libraries. Trick such applications into + linking with wide-character libraries by means of symlinks + (note that the .so links are + only safe with curses.h edited to always use the + wide-character ABI): for lib in ncurses form panel menu ; do - rm -vf /usr/lib/lib${lib}.so - echo "INPUT(-l${lib}w)" > /usr/lib/lib${lib}.so - ln -sfv ${lib}w.pc /usr/lib/pkgconfig/${lib}.pc + ln -sfv lib${lib}w.so /usr/lib/lib${lib}.so + ln -sfv ${lib}w.pc /usr/lib/pkgconfig/${lib}.pc done Finally, make sure that old applications that look for -lcurses at build time are still buildable: -rm -vf /usr/lib/libcursesw.so -echo "INPUT(-lncursesw)" > /usr/lib/libcursesw.so -ln -sfv libncurses.so /usr/lib/libcurses.so +ln -sfv libncursesw.so /usr/lib/libcurses.so If desired, install the Ncurses documentation: @@ -206,13 +211,17 @@ cp -av lib/lib*.so.5* /usr/lib tset - libcursesw.so (symlink and linker script to libncursesw.so), + libcurses.so (symlink), + libform.so (symlink), libformw.so, + libmenu.so (symlink), libmenuw.so, + libncurses.so (symlink), libncursesw.so, libncurses++w.so, - libpanelw.so, and their non-wide-character counterparts without "w" - in the library names. + libpanel.so (symlink), + and libpanelw.so, + /usr/share/tabset, /usr/share/terminfo, and diff --git a/chapter08/ninja.xml b/chapter08/ninja.xml index 4aca7b8c7..106e63970 100644 --- a/chapter08/ninja.xml +++ b/chapter08/ninja.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter08/openssl.xml b/chapter08/openssl.xml index 1ecdca92a..60492b14d 100644 --- a/chapter08/openssl.xml +++ b/chapter08/openssl.xml @@ -1,4 +1,4 @@ - + @@ -164,7 +164,7 @@ make MANSUFFIX=ssl install is a command-line tool for using the various cryptography functions of OpenSSL's crypto library from the shell. It can be used for various functions which are documented in - man 1 openssl + openssl(1) openssl @@ -196,7 +196,7 @@ make MANSUFFIX=ssl install implements the Transport Layer Security (TLS v1) protocol. It provides a rich API, documentation - on which can be found by running man 7 ssl + on which can be found in ssl(7) libssl.so diff --git a/chapter08/patch.xml b/chapter08/patch.xml index 631803321..fbe2daea1 100644 --- a/chapter08/patch.xml +++ b/chapter08/patch.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter08/perl.xml b/chapter08/perl.xml index 2bb849645..34c6ed32a 100644 --- a/chapter08/perl.xml +++ b/chapter08/perl.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter08/pkgconf.xml b/chapter08/pkgconf.xml index b95d7ab2c..139e0c810 100644 --- a/chapter08/pkgconf.xml +++ b/chapter08/pkgconf.xml @@ -1,4 +1,4 @@ - + @@ -45,9 +45,9 @@ Installation of Pkgconf - Fix a regression in pkgconf-2.0.3 breaking BLFS packages: + Fix a regression in pkgconf-2.1.0 breaking BLFS packages: - sed -i 's/str\(cmp.*package\)/strn\1, strlen(pkg->why)/' cli/main.c + patch -Np1 -i ../&pkgconf-upstream-fix-patch; Prepare Pkgconf for compilation: diff --git a/chapter08/pkgmgt.xml b/chapter08/pkgmgt.xml index 185538796..42a6ff945 100644 --- a/chapter08/pkgmgt.xml +++ b/chapter08/pkgmgt.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter08/procps.xml b/chapter08/procps.xml index 7fc74f587..0d2537054 100644 --- a/chapter08/procps.xml +++ b/chapter08/procps.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter08/psmisc.xml b/chapter08/psmisc.xml index cbf7609f3..b1aa31d0c 100644 --- a/chapter08/psmisc.xml +++ b/chapter08/psmisc.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter08/python.xml b/chapter08/python.xml index 62279880d..7ac618c09 100644 --- a/chapter08/python.xml +++ b/chapter08/python.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter08/readline.xml b/chapter08/readline.xml index ea073308d..1fb7474c1 100644 --- a/chapter08/readline.xml +++ b/chapter08/readline.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter08/sed.xml b/chapter08/sed.xml index 629b83465..4a524c751 100644 --- a/chapter08/sed.xml +++ b/chapter08/sed.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter08/setuptools.xml b/chapter08/setuptools.xml index 257a50328..dfb31c5b8 100644 --- a/chapter08/setuptools.xml +++ b/chapter08/setuptools.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter08/shadow.xml b/chapter08/shadow.xml index 315234c7f..49bcae6de 100644 --- a/chapter08/shadow.xml +++ b/chapter08/shadow.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter08/stripping.xml b/chapter08/stripping.xml index e067318fd..96d510172 100644 --- a/chapter08/stripping.xml +++ b/chapter08/stripping.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter08/sysklogd.xml b/chapter08/sysklogd.xml index 89fc314ed..131b7e7fc 100644 --- a/chapter08/sysklogd.xml +++ b/chapter08/sysklogd.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter08/systemd.xml b/chapter08/systemd.xml index 8af4c2c86..141a4b927 100644 --- a/chapter08/systemd.xml +++ b/chapter08/systemd.xml @@ -1,4 +1,4 @@ - + @@ -72,7 +72,7 @@ meson setup \ -Drpmmacrosdir=no \ -Dhomed=disabled \ -Duserdb=false \ - -Dman=false \ + -Dman=disabled \ -Dmode=release \ -Dpamconfdir=no \ -Ddev-kvm-mode=0660 \ @@ -158,7 +158,7 @@ meson setup \ - -Dman=false + -Dman=disabled Prevent the generation of man pages to avoid extra dependencies. We will install pre-generated man pages for systemd diff --git a/chapter08/sysvinit.xml b/chapter08/sysvinit.xml index 7b31ec007..97bb9113c 100644 --- a/chapter08/sysvinit.xml +++ b/chapter08/sysvinit.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter08/tar.xml b/chapter08/tar.xml index 802f04d2e..1d51203ba 100644 --- a/chapter08/tar.xml +++ b/chapter08/tar.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter08/tcl.xml b/chapter08/tcl.xml index 5cf4e0d13..8a7884804 100644 --- a/chapter08/tcl.xml +++ b/chapter08/tcl.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter08/texinfo.xml b/chapter08/texinfo.xml index 5eebeb0e3..0269bbe88 100644 --- a/chapter08/texinfo.xml +++ b/chapter08/texinfo.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter08/udev.xml b/chapter08/udev.xml index 6ec0ed458..e0584ffd8 100644 --- a/chapter08/udev.xml +++ b/chapter08/udev.xml @@ -1,4 +1,4 @@ - + @@ -127,17 +127,18 @@ meson setup \ Get the list of the shipped udev helpers and save it into an - environment variable: + environment variable (exporting it is not strictly necessary, but it makes + building as a regular user or using a package manager easier): - udev_helpers=$(grep "'name' :" ../src/udev/meson.build | \ - awk '{print $3}' | tr -d ",'" | grep -v 'udevadm') + export udev_helpers=$(grep "'name' :" ../src/udev/meson.build | \ + awk '{print $3}' | tr -d ",'" | grep -v 'udevadm') Only build the components needed for udev: ninja udevadm systemd-hwdb \ $(ninja -n | grep -Eo '(src/(lib)?udev|rules.d|hwdb.d)/[^ ]*') \ $(realpath libudev.so --relative-to .) \ - $udev_helpers udevadm + $udev_helpers Install the package: @@ -187,6 +188,12 @@ sed 's|lib.*udevd|sbin/udevd|' \ rm /usr/share/man/man*/systemd* + Finally, unset the udev_helpers variable: + + + unset udev_helpers + diff --git a/chapter08/util-linux.xml b/chapter08/util-linux.xml index bb24f1e59..894bd3432 100644 --- a/chapter08/util-linux.xml +++ b/chapter08/util-linux.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter08/vim.xml b/chapter08/vim.xml index 8672ad818..9dd3b4b74 100644 --- a/chapter08/vim.xml +++ b/chapter08/vim.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter08/wheel.xml b/chapter08/wheel.xml index 0f3a1c99e..605cda1be 100644 --- a/chapter08/wheel.xml +++ b/chapter08/wheel.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter08/xml-parser.xml b/chapter08/xml-parser.xml index 62053d566..8b3dd434d 100644 --- a/chapter08/xml-parser.xml +++ b/chapter08/xml-parser.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter08/xz.xml b/chapter08/xz.xml index 362c667dc..316b8558e 100644 --- a/chapter08/xz.xml +++ b/chapter08/xz.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter08/zlib.xml b/chapter08/zlib.xml index 604d5d503..6208a6172 100644 --- a/chapter08/zlib.xml +++ b/chapter08/zlib.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter08/zstd.xml b/chapter08/zstd.xml index ae793a34b..1a76103e5 100644 --- a/chapter08/zstd.xml +++ b/chapter08/zstd.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter09/bootscripts.xml b/chapter09/bootscripts.xml index fbffa76df..b4113728f 100644 --- a/chapter09/bootscripts.xml +++ b/chapter09/bootscripts.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter09/chapter09.xml b/chapter09/chapter09.xml index 499e66a6f..1f6dda19c 100644 --- a/chapter09/chapter09.xml +++ b/chapter09/chapter09.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter09/clock.xml b/chapter09/clock.xml index 01f0efef9..be60684fb 100644 --- a/chapter09/clock.xml +++ b/chapter09/clock.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter09/consoled.xml b/chapter09/consoled.xml index c7e4ab9ad..94e99ce8d 100644 --- a/chapter09/consoled.xml +++ b/chapter09/consoled.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter09/etcshells.xml b/chapter09/etcshells.xml index 3703d507f..7e095b530 100644 --- a/chapter09/etcshells.xml +++ b/chapter09/etcshells.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter09/inputrc.xml b/chapter09/inputrc.xml index cf501c393..0c647bc93 100644 --- a/chapter09/inputrc.xml +++ b/chapter09/inputrc.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter09/introduction.xml b/chapter09/introduction.xml index 745ca3165..cad7be2a5 100644 --- a/chapter09/introduction.xml +++ b/chapter09/introduction.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter09/introductiond.xml b/chapter09/introductiond.xml index f0be70cec..19648c3ba 100644 --- a/chapter09/introductiond.xml +++ b/chapter09/introductiond.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter09/locale.xml b/chapter09/locale.xml index 9c0cecb2b..8b6d2c4b2 100644 --- a/chapter09/locale.xml +++ b/chapter09/locale.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter09/network.xml b/chapter09/network.xml index 541ece699..f8b549eff 100644 --- a/chapter09/network.xml +++ b/chapter09/network.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter09/networkd.xml b/chapter09/networkd.xml index 27f15e815..19a1f7c01 100644 --- a/chapter09/networkd.xml +++ b/chapter09/networkd.xml @@ -1,4 +1,4 @@ - + @@ -113,14 +113,14 @@ Name=ether0 EOF - See the man page systemd.link(5) for more information. + See systemd.link(5) for more information. - In /boot/grub/grub.cfg, pass the option net.ifnames=0 on the - kernel command line. + In /boot/grub/grub.cfg, pass the option + on the kernel command line. diff --git a/chapter09/profile.xml b/chapter09/profile.xml index 1b87632f7..8f0f59d1f 100644 --- a/chapter09/profile.xml +++ b/chapter09/profile.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter09/symlinks.xml b/chapter09/symlinks.xml index b2479f053..71e35f231 100644 --- a/chapter09/symlinks.xml +++ b/chapter09/symlinks.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter09/systemd-custom.xml b/chapter09/systemd-custom.xml index 0218b0f23..81a94a148 100644 --- a/chapter09/systemd-custom.xml +++ b/chapter09/systemd-custom.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter09/udev.xml b/chapter09/udev.xml index aa7e067e6..0fba5a8b4 100644 --- a/chapter09/udev.xml +++ b/chapter09/udev.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter09/usage.xml b/chapter09/usage.xml index b14f3635c..1fc7189d6 100644 --- a/chapter09/usage.xml +++ b/chapter09/usage.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter10/chapter10.xml b/chapter10/chapter10.xml index d7236b21c..28b30f55e 100644 --- a/chapter10/chapter10.xml +++ b/chapter10/chapter10.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter10/fstab.xml b/chapter10/fstab.xml index ccf767ab6..c20f806dd 100644 --- a/chapter10/fstab.xml +++ b/chapter10/fstab.xml @@ -1,4 +1,4 @@ - + @@ -56,7 +56,7 @@ EOF class="partition">sda2, sda5, and ext4. For details on the six - fields in this file, see man 5 fstab. + fields in this file, see fstab(5). Filesystems with MS-DOS or Windows origin (i.e. vfat, ntfs, smbfs, cifs, iso9660, udf) need a special option, utf8, in order for non-ASCII diff --git a/chapter10/grub.xml b/chapter10/grub.xml index 334d086b8..a021dd7b3 100644 --- a/chapter10/grub.xml +++ b/chapter10/grub.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter10/introduction.xml b/chapter10/introduction.xml index 2b233ec08..3e4cb85d4 100644 --- a/chapter10/introduction.xml +++ b/chapter10/introduction.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter10/kernel.xml b/chapter10/kernel.xml index 9b418f067..38cd96a74 100644 --- a/chapter10/kernel.xml +++ b/chapter10/kernel.xml @@ -1,4 +1,4 @@ - + diff --git a/chapter10/kernel/kernel-config.py b/chapter10/kernel/kernel-config.py index 5decb4cf3..7541e8104 100755 --- a/chapter10/kernel/kernel-config.py +++ b/chapter10/kernel/kernel-config.py @@ -296,7 +296,7 @@ for i0, val, i1, title, arrow, key, menu, comment in r: from jinja2 import Template -t = Template(''' +t = Template(''' - + - + + + + @@ -636,10 +639,10 @@ - - + + - + @@ -735,13 +738,13 @@ - + - - + + - + diff --git a/part3intro/generalinstructions.xml b/part3intro/generalinstructions.xml index fe368d8d8..624771c2d 100644 --- a/part3intro/generalinstructions.xml +++ b/part3intro/generalinstructions.xml @@ -1,4 +1,4 @@ - + diff --git a/part3intro/introduction.xml b/part3intro/introduction.xml index 03ac66a87..07cc1043d 100644 --- a/part3intro/introduction.xml +++ b/part3intro/introduction.xml @@ -1,4 +1,4 @@ - + diff --git a/part3intro/part3intro.xml b/part3intro/part3intro.xml index a4d8eecda..3f97b4a7f 100644 --- a/part3intro/part3intro.xml +++ b/part3intro/part3intro.xml @@ -1,4 +1,4 @@ - + diff --git a/part3intro/toolchaintechnotes.xml b/part3intro/toolchaintechnotes.xml index f044322e6..c220d24d8 100644 --- a/part3intro/toolchaintechnotes.xml +++ b/part3intro/toolchaintechnotes.xml @@ -1,4 +1,4 @@ - + diff --git a/patches.ent b/patches.ent index 6c03b9728..d27c717de 100644 --- a/patches.ent +++ b/patches.ent @@ -1,4 +1,4 @@ - + @@ -22,6 +22,10 @@ + + + + diff --git a/prologue/architecture.xml b/prologue/architecture.xml index b0d87d260..edf19ab43 100644 --- a/prologue/architecture.xml +++ b/prologue/architecture.xml @@ -1,4 +1,4 @@ - + diff --git a/prologue/audience.xml b/prologue/audience.xml index 81a4b9112..b0c8f6276 100644 --- a/prologue/audience.xml +++ b/prologue/audience.xml @@ -1,4 +1,4 @@ - + diff --git a/prologue/bookinfo.xml b/prologue/bookinfo.xml index 40aac7b42..6cd9aa2bf 100644 --- a/prologue/bookinfo.xml +++ b/prologue/bookinfo.xml @@ -1,4 +1,4 @@ - + diff --git a/prologue/dedication.xml b/prologue/dedication.xml index b8f0b2d1c..17d00b35e 100644 --- a/prologue/dedication.xml +++ b/prologue/dedication.xml @@ -1,4 +1,4 @@ - + diff --git a/prologue/errata.xml b/prologue/errata.xml index bfb6bc01b..1631751e1 100644 --- a/prologue/errata.xml +++ b/prologue/errata.xml @@ -1,4 +1,4 @@ - + diff --git a/prologue/foreword.xml b/prologue/foreword.xml index 33a33ec40..0c4ffb61b 100644 --- a/prologue/foreword.xml +++ b/prologue/foreword.xml @@ -1,4 +1,4 @@ - + diff --git a/prologue/organization.xml b/prologue/organization.xml index 81bfca47a..53d2719aa 100644 --- a/prologue/organization.xml +++ b/prologue/organization.xml @@ -1,4 +1,4 @@ - + diff --git a/prologue/preface.xml b/prologue/preface.xml index e940116e1..f2e6284ed 100644 --- a/prologue/preface.xml +++ b/prologue/preface.xml @@ -1,4 +1,4 @@ - + diff --git a/prologue/prerequisites.xml b/prologue/prerequisites.xml index 745ed788d..2e9609dce 100644 --- a/prologue/prerequisites.xml +++ b/prologue/prerequisites.xml @@ -1,4 +1,4 @@ - + diff --git a/prologue/standards.xml b/prologue/standards.xml index 6ab757a07..05fe22745 100644 --- a/prologue/standards.xml +++ b/prologue/standards.xml @@ -1,4 +1,4 @@ - + diff --git a/prologue/typography.xml b/prologue/typography.xml index 6b7d6437d..303a107c5 100644 --- a/prologue/typography.xml +++ b/prologue/typography.xml @@ -1,4 +1,4 @@ - + diff --git a/prologue/why.xml b/prologue/why.xml index b5ac050eb..e8fac1af4 100644 --- a/prologue/why.xml +++ b/prologue/why.xml @@ -1,4 +1,4 @@ - + diff --git a/stylesheets/dump-commands.xsl b/stylesheets/dump-commands.xsl index 9e2af96e4..48af34c20 100644 --- a/stylesheets/dump-commands.xsl +++ b/stylesheets/dump-commands.xsl @@ -7,7 +7,8 @@ - + + diff --git a/stylesheets/lfs-chunked.xsl b/stylesheets/lfs-chunked.xsl index 5691f2a50..2c7287765 100644 --- a/stylesheets/lfs-chunked.xsl +++ b/stylesheets/lfs-chunked.xsl @@ -1,4 +1,4 @@ - + + + + + + + + + @@ -71,11 +72,11 @@ - + - - - + + + diff --git a/stylesheets/lfs-xsl/nochunks.xsl b/stylesheets/lfs-xsl/nochunks.xsl index 3ff0ebc72..5a5ad36f5 100644 --- a/stylesheets/lfs-xsl/nochunks.xsl +++ b/stylesheets/lfs-xsl/nochunks.xsl @@ -1,4 +1,4 @@ - + - - - diff --git a/stylesheets/lfs-xsl/pdf.xsl b/stylesheets/lfs-xsl/pdf.xsl index 4028a19ea..679f73b84 100644 --- a/stylesheets/lfs-xsl/pdf.xsl +++ b/stylesheets/lfs-xsl/pdf.xsl @@ -1,4 +1,4 @@ - + - + See pdf/lfs-mixed.xsl. + Note: the argument in select= is a zero-width space + (unicode 200b, encoded in utf-8)--> + + Added role variable and use it when calling mode xref-to. + Also remove code for xlink:href attribute in xref elements, + since we don't use it.--> - - - - - - - - - - - + @@ -89,7 +77,7 @@ ERROR: xref linking to - + has no generated link text. ??? diff --git a/stylesheets/lfs-xsl/profile.xsl b/stylesheets/lfs-xsl/profile.xsl index b89b86cb1..a19d924e9 100644 --- a/stylesheets/lfs-xsl/profile.xsl +++ b/stylesheets/lfs-xsl/profile.xsl @@ -1,4 +1,4 @@ - + diff --git a/stylesheets/lfs-xsl/xhtml/lfs-admon.xsl b/stylesheets/lfs-xsl/xhtml/lfs-admon.xsl index 99c2fd70c..3726baeb9 100644 --- a/stylesheets/lfs-xsl/xhtml/lfs-admon.xsl +++ b/stylesheets/lfs-xsl/xhtml/lfs-admon.xsl @@ -1,4 +1,4 @@ - + + + @@ -24,6 +24,30 @@ longindex.html + + + + + + +
+ + + + + +
+ + +   diff --git a/stylesheets/lfs-xsl/xhtml/lfs-navigational.xsl b/stylesheets/lfs-xsl/xhtml/lfs-navigational.xsl index 2e4787633..1e8f17cb0 100644 --- a/stylesheets/lfs-xsl/xhtml/lfs-navigational.xsl +++ b/stylesheets/lfs-xsl/xhtml/lfs-navigational.xsl @@ -1,4 +1,4 @@ - + + + + + + Added role variable and use it when calling mode xref-to. + Also remove code for xlink:href attributes in xref elements + since we don't use it.--> - - - - - - - - - - - + @@ -85,7 +74,7 @@ ERROR: xref linking to - + has no generated link text. ??? diff --git a/stylesheets/md5sum.xsl b/stylesheets/md5sum.xsl index 617bd4aa9..bb7268276 100644 --- a/stylesheets/md5sum.xsl +++ b/stylesheets/md5sum.xsl @@ -1,6 +1,6 @@ - + - + @@ -31,7 +31,8 @@ - + + @@ -55,4 +56,3 @@ - diff --git a/stylesheets/patcheslist.xsl b/stylesheets/patcheslist.xsl index d86d1814d..f863edc1f 100644 --- a/stylesheets/patcheslist.xsl +++ b/stylesheets/patcheslist.xsl @@ -1,4 +1,4 @@ - + %general-entities; @@ -22,26 +22,30 @@ function copy cp $1 $2 >>copyerrs 2>&1 } -umask 002 +umask 002 - - install -d -m 775 -g lfswww +# Create dest.dir if it doesn't exist +# Remove old patches +# Copy the patches +# Ensure correct ownership +install -d -m 775 -g lfswww - && - cd + && +cd - && - - rm -f *.patch copyerrs && + && +rm -f *.patch copyerrs && + + - - chgrp lfswww *.patch && +chgrp lfswww *.patch && if [ `wc -l copyerrs | sed 's/ *//' | cut -f1 -d' '` -gt 0 ]; then mail -s "Missing LFS patches" lfs-book@lists.linuxfromscratch.org < copyerrs -fi +fi - exit +exit + @@ -59,10 +63,11 @@ fi copy /srv/www/www.linuxfromscratch.org/patches/downloads/ - + / - . + . + diff --git a/stylesheets/wget-list.xsl b/stylesheets/wget-list.xsl index 62a518d38..aa8d263c4 100644 --- a/stylesheets/wget-list.xsl +++ b/stylesheets/wget-list.xsl @@ -1,4 +1,4 @@ - + @@ -28,7 +28,8 @@ - + +