From acde0a383a3346a7c5a365b1fd59189509535887 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Thu, 4 Jan 2024 09:44:21 -0600
Subject: [PATCH 1/3] Typo

---
 chapter05/binutils-pass1.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chapter05/binutils-pass1.xml b/chapter05/binutils-pass1.xml
index c3bf1f117..03e9e2498 100644
--- a/chapter05/binutils-pass1.xml
+++ b/chapter05/binutils-pass1.xml
@@ -142,7 +142,7 @@ cd       build</userinput></screen>
           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.</para>

From 53ed17c75265ab1c2ac6638a6dd57d8e93d788f2 Mon Sep 17 00:00:00 2001
From: Pierre Labastie <pierre.labastie@neuf.fr>
Date: Thu, 4 Jan 2024 19:22:44 +0100
Subject: [PATCH 2/3] export the udev_helpers variable

Since it is needed for both building and installing, exporting it
allows to have it defined even if building as a regular user (so that
sudo is run for installing) or using a package manager (which usually
runs in a new shell and forgets unexported variables)
---
 chapter08/udev.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/chapter08/udev.xml b/chapter08/udev.xml
index 967b3dd84..b4ecbe656 100644
--- a/chapter08/udev.xml
+++ b/chapter08/udev.xml
@@ -126,9 +126,10 @@ meson setup \
     </variablelist>
 
     <para>Get the list of the shipped udev helpers and save it into an
-    environment variable:</para>
+    environment variable (exporting it is not strictly necessary, but it makes
+    building as a regular user or using a package manager easier):</para>
 
-    <screen><userinput remap="make">udev_helpers=$(grep "'name' :" ../src/udev/meson.build | \
+    <screen><userinput remap="make">export udev_helpers=$(grep "'name' :" ../src/udev/meson.build | \
                awk '{print $3}' | tr -d ",'" | grep -v 'udevadm')</userinput></screen>
 
     <para>Only build the components needed for udev:</para>

From 164e0ddbce14b4df88bda8de0bd12fb3d1e7428f Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Fri, 5 Jan 2024 03:05:01 +0800
Subject: [PATCH 3/3] udev: Unset udev_helpers after installation

Now this variable is exported, thus it might potentially cause unwanted
side effects building other packages.  So unset it after installation.
---
 chapter08/udev.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/chapter08/udev.xml b/chapter08/udev.xml
index b4ecbe656..6b3b00b94 100644
--- a/chapter08/udev.xml
+++ b/chapter08/udev.xml
@@ -187,6 +187,12 @@ sed 's|lib.*udevd|sbin/udevd|'                                        \
 
 rm /usr/share/man/man*/systemd*</userinput></screen>
 
+    <para>Finally, unset the <envar>udev_helpers</envar> variable:</para>
+
+    <!-- remap="make" seems confusing but we don't have sth. like
+         remap="clean".  -->
+    <screen><userinput remap="make">unset udev_helpers</userinput></screen>
+
   </sect2>
 
   <sect2 id="conf-udev" role="configuration">