From 3608d06aa82917b9046ee315924876ce4903efc0 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Sun, 19 Feb 2023 14:30:57 +0800 Subject: [PATCH 1/6] grub: Add upstream fixes patch for unrecognized ext2/3/4 features (#5219) --- chapter01/changelog.xml | 11 +++++++++++ chapter01/whatsnew.xml | 6 +++--- chapter03/patches.xml | 8 ++++++++ chapter08/grub.xml | 9 +++++++++ patches.ent | 8 +++----- 5 files changed, 34 insertions(+), 8 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 49f6ec827..dc62bed38 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -39,6 +39,17 @@ or as appropriate for the entry or if needed the entire day's listitem. --> + + 2023-02-19 + + + [xry111] - Apply a patch for GRUB for an issue triggered + with e2fsprogs-1.47.0. Fixes + #5219. + + + + 2023-02-13 diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index cd9d32d26..559828720 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -291,11 +291,11 @@ Added: - + &readline-fixes-patch; diff --git a/chapter03/patches.xml b/chapter03/patches.xml index ae39a70bb..44367898f 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -85,6 +85,14 @@ + + GRUB Upstream Fixes Patch - &grub-upstream-fixes-patch-size;: + + Download: + MD5 sum: &grub-upstream-fixes-patch-md5; + + + Kbd Backspace/Delete Fix Patch - &kbd-backspace-patch-size;: diff --git a/chapter08/grub.xml b/chapter08/grub.xml index 04fbef91b..357036c34 100644 --- a/chapter08/grub.xml +++ b/chapter08/grub.xml @@ -61,6 +61,15 @@ aggressive optimization. + + Fix an issue causing grub-install to fail when the + /boot partition (or the root + partition if /boot is not a + separate partition) is created by e2fsprogs-1.47.0 or later: + + +patch -Np1 -i ../grub-&grub-version;-upstream_fixes-1.patch + Prepare GRUB for compilation: ./configure --prefix=/usr \ diff --git a/patches.ent b/patches.ent index 6e66a4b59..c381cd0a8 100644 --- a/patches.ent +++ b/patches.ent @@ -50,11 +50,9 @@ - + + + From dd8293bfa99afb982601eb1f5401c59167347e33 Mon Sep 17 00:00:00 2001 From: Pierre Labastie Date: Sun, 19 Feb 2023 11:37:49 +0100 Subject: [PATCH 2/6] Popt is not a dependency of Pkg-config It was removed eleven years ago from the book. Pkg-config itself removed it at version 0.27. Prompted by "__mint" on #lfs-support. --- appendices/dependencies.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml index 6717160ba..d5ee5909e 100644 --- a/appendices/dependencies.xml +++ b/appendices/dependencies.xml @@ -2437,7 +2437,7 @@ &dependencies; - Bash, Binutils, Coreutils, Gawk, GCC, Glibc, Grep, Make, Popt, + Bash, Binutils, Coreutils, Gawk, GCC, Glibc, Grep, Make, and Sed From 4049a4b6c81d03fe7369473db85f36aa09712076 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Sun, 19 Feb 2023 20:42:33 +0800 Subject: [PATCH 3/6] e2fsprogs: Add configuration section about mke2fs.conf --- chapter08/e2fsprogs.xml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/chapter08/e2fsprogs.xml b/chapter08/e2fsprogs.xml index bccf33227..68cfffd69 100644 --- a/chapter08/e2fsprogs.xml +++ b/chapter08/e2fsprogs.xml @@ -134,6 +134,33 @@ install -v -m644 doc/com_err.info /usr/share/info install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.info + + Configuring E2fsprogs + + + /etc/mke2fs.conf + + + + /etc/mke2fs.conf contains the default value of + various command line options of mke2fs. You may + edit the file to make the default values suitable for your need. + For example, some utilities (not in LFS or BLFS) cannot recognize a + ext4 file system with + metadata_csum_seed feature enabled. + If you need such an utility, you may + remove the feature from the default + ext4 feature list with the + command: + + + sed 's/metadata_csum_seed,//' -i /etc/mke2fs.conf + + + Read the man page mke2fs.conf(5) for details. + + + Contents of E2fsprogs From c68d57a81a082bd5a93dc444a2058f1be99aa770 Mon Sep 17 00:00:00 2001 From: Pierre Labastie Date: Sun, 19 Feb 2023 14:37:28 +0100 Subject: [PATCH 4/6] Finish adding revision attributes in dependencies This was half done. Furthermore, dbus had completely disappeared. Also fix an url to sphinx, that is now in BLFS. --- appendices/dependencies.xml | 75 +++++++++++++++++++++---------------- 1 file changed, 43 insertions(+), 32 deletions(-) diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml index d5ee5909e..71ceac7e2 100644 --- a/appendices/dependencies.xml +++ b/appendices/dependencies.xml @@ -464,7 +464,9 @@ &before; - Bash, Diffutils, Eudev, Findutils, and Man-DB + Bash, Diffutils, Eudev, + Findutils, and Man-DB, and Systemd @@ -480,42 +482,45 @@ - + DejaGNU @@ -634,9 +639,9 @@ - Eudev + Eudev - + &dependencies; Bash, Binutils, Coreutils, Gawk, GCC, Glibc, Grep, Gperf, Make, @@ -644,28 +649,28 @@ - + &runtime; Glibc, Kmod, Xz, Util-linux, and Zlib. - + &testsuites; None - + &before; None - + &external; None @@ -1579,7 +1584,8 @@ &before; - Eudev + Eudev + Systemd @@ -2716,37 +2722,37 @@ - Sysklogd + Sysklogd - + &dependencies; Binutils, Coreutils, GCC, Glibc, Make, and Patch - + &runtime; Glibc - + &testsuites; No test suite available - + &before; None - + &external; None @@ -2830,7 +2836,8 @@ quota-tools, rsync, - Sphinx, + + Sphinx, tpm2-tss, Valgrind, @@ -3002,8 +3009,10 @@ &dependencies; - Bash, Binutils, Coreutils, Diffutils, Eudev, Findutils, Gawk, - GCC, Gettext, Glibc, Grep, Make, Ncurses, Sed, and Zlib + Bash, Binutils, Coreutils, Diffutils, + Eudev, Findutils, Gawk, + GCC, Gettext, Glibc, Grep, Make, Ncurses, Sed, + Systemd, and Zlib @@ -3194,7 +3203,9 @@ &before; - Eudev, File, GRUB, Kmod, and Man-DB + Eudev, File, GRUB, Kmod, + and Man-DB, and Systemd From b9173ee06f45e34a9ca756c9823ca0b9916ccce1 Mon Sep 17 00:00:00 2001 From: Pierre Labastie Date: Sun, 19 Feb 2023 15:12:26 +0100 Subject: [PATCH 5/6] Less can use pcre2 --- appendices/dependencies.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml index 71ceac7e2..697d0d1d7 100644 --- a/appendices/dependencies.xml +++ b/appendices/dependencies.xml @@ -1632,6 +1632,7 @@ &external; + PCRE2 or PCRE From ea601535b80f1a45314c60b5ce14028b39e6c27a Mon Sep 17 00:00:00 2001 From: Bruce Dubbs Date: Sun, 19 Feb 2023 12:48:20 -0600 Subject: [PATCH 6/6] Uncomment glibc in whatsnew. --- chapter01/whatsnew.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 559828720..bf69cb08f 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -109,9 +109,9 @@ Gettext-&gettext-version; - +