From 3608d06aa82917b9046ee315924876ce4903efc0 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Sun, 19 Feb 2023 14:30:57 +0800
Subject: 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 @@
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     appropriate for the entry or if needed the entire day's listitem.
     -->
+    <listitem>
+      <para>2023-02-19</para>
+      <itemizedlist>
+        <listitem>
+          <para>[xry111] - Apply a patch for GRUB for an issue triggered
+          with e2fsprogs-1.47.0.  Fixes
+          <ulink url="&lfs-ticket-root;5219">#5219</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2023-02-13</para>
       <itemizedlist>
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 @@
   <itemizedlist>
     <title>Added:</title>
     <listitem><para></para></listitem>  <!-- satisfy build -->
-<!--
+
     <listitem>
-      <para>&bash-fixes-patch;</para>
+      <para>&grub-upstream-fixes-patch;</para>
     </listitem>
--->
+
     <listitem>
       <para>&readline-fixes-patch;</para>
     </listitem>
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 @@
       </listitem>
     </varlistentry>
 
+    <varlistentry>
+      <term>GRUB Upstream Fixes Patch - <token>&grub-upstream-fixes-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&grub-upstream-fixes-patch;"/></para>
+        <para>MD5 sum: <literal>&grub-upstream-fixes-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
     <varlistentry>
       <term>Kbd Backspace/Delete Fix Patch - <token>&kbd-backspace-patch-size;</token>:</term>
       <listitem>
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.</para>
     </warning>
 
+    <para>
+      Fix an issue causing <command>grub-install</command> to fail when the
+      <filename class='directory'>/boot</filename> partition (or the root
+      partition if <filename class='directory'>/boot</filename> is not a
+      separate partition) is created by e2fsprogs-1.47.0 or later:
+    </para>
+
+<screen><userinput remap='pre'>patch -Np1 -i ../grub-&grub-version;-upstream_fixes-1.patch</userinput></screen>
+
     <para>Prepare GRUB for compilation:</para>
 
 <screen><userinput remap="configure">./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 @@
 <!ENTITY glibc-fhs-patch-md5 "9a5997c3452909b1769918c759eff8a2">
 <!ENTITY glibc-fhs-patch-size "2.8 KB">
 
-<!--
-<!ENTITY glibc-upstream-patch "glibc-&glibc-version;-upstream_fixes-1.patch">
-<!ENTITY glibc-upstream-patch-md5 "e602b6c3a332f4a06e2914e02ae2b295">
-<!ENTITY glibc-upstream-patch-size "16 KB">
--->
+<!ENTITY grub-upstream-fixes-patch "grub-&grub-version;-upstream_fixes-1.patch">
+<!ENTITY grub-upstream-fixes-patch-md5 "da388905710bb4cbfbc7bd7346ff9174">
+<!ENTITY grub-upstream-fixes-patch-size "8 KB">
 
 <!ENTITY kbd-backspace-patch "kbd-&kbd-version;-backspace-1.patch">
 <!ENTITY kbd-backspace-patch-md5 "f75cca16a38da6caa7d52151f7136895">
-- 
cgit v1.2.3-54-g00ecf