Changeset 89c61e5

Timestamp:

01/04/2024 11:30:09 PM (5 months ago)

Author:

Thomas Trepl <thomas@…>

Branches:

multilib

Children:

5605ef38

Parents:

6c474a7 (diff), 164e0dd (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Automatic merge of trunk into multilib

Files:

• chapter05/binutils-pass1.xml (modified) (1 diff)
• chapter08/udev.xml (modified) (2 diffs)

chapter05/binutils-pass1.xml

@@ -151 +151 @@
           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

chapter08/udev.xml

@@ -127 +127 @@
 
     <para>Get the list of the shipped udev helpers and save it into an
-    environment variable:</para>
-
-    <screen><userinput remap="make">udev_helpers=$(grep "'name' :" ../src/udev/meson.build | \
+    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">export udev_helpers=$(grep "'name' :" ../src/udev/meson.build | \
                awk '{print $3}' | tr -d ",'" | grep -v 'udevadm')</userinput></screen>
 
@@ -187 +188 @@
 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>