Changes in chapter08/udev.xml [7152faa:4bc51b9]

File:

• chapter08/udev.xml (modified) (5 diffs)

chapter08/udev.xml

@@ -1 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
@@ -55 +55 @@
 
  <screen><userinput remap="pre">sed '/systemd-sysctl/s/^/#/' -i rules.d/99-systemd.rules.in</userinput></screen>
-
-    <para>Adjust the hardcoded paths to network configuration files for the
-    standalone udev installation:</para>
-
- <screen><userinput remap="pre">sed '/NETWORK_DIRS/s/systemd/udev/' -i src/basic/path-lookup.h</userinput></screen>
 
     <para>Prepare Udev for compilation:</para>
@@ -126 +121 @@
     </variablelist>
 
-    <para>Get the list of the shipped udev helpers and save it into an
-    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>
-
     <para>Only build the components needed for udev:</para>
 
     <screen><userinput remap="make">ninja udevadm systemd-hwdb                                           \
       $(ninja -n | grep -Eo '(src/(lib)?udev|rules.d|hwdb.d)/[^ ]*') \
-      $(realpath libudev.so --relative-to .)                         \
-      $udev_helpers</userinput></screen>
+      $(realpath libudev.so --relative-to .)</userinput></screen>
 
     <para>Install the package:</para>
 
-    <screen><userinput remap="install">install -vm755 -d {/usr/lib,/etc}/udev/{hwdb.d,rules.d,network}
+    <screen><userinput remap="install">install -vm755 -d {/usr/lib,/etc}/udev/{hwdb,rules}.d
 install -vm755 -d /usr/{lib,share}/pkgconfig
 install -vm755 udevadm                             /usr/bin/
@@ -156 +143 @@
                       -not -name '*power-switch*') /usr/lib/udev/rules.d/
 install -vm644 hwdb.d/*  ../hwdb.d/{*.hwdb,README} /usr/lib/udev/hwdb.d/
-install -vm755 $udev_helpers                       /usr/lib/udev
-install -vm644 ../network/99-default.link          /usr/lib/udev/network</userinput></screen>
+install -vm755 $(find src/udev \
+                      -type f -not -name '*.*')    /usr/lib/udev</userinput></screen>
 
     <para>Install some custom rules and support files useful in an LFS
@@ -172 +159 @@
     --no-same-owner --strip-components=1                              \
     -C /usr/share/man --wildcards '*/udev*' '*/libudev*'              \
-                                  '*/systemd.link.5'                  \
                                   '*/systemd-'{hwdb,udevd.service}.8
-
-sed 's|systemd/network|udev/network|'                                 \
-    /usr/share/man/man5/systemd.link.5                                \
-  > /usr/share/man/man5/udev.link.5
-
 sed 's/systemd\(\\\?-\)/udev\1/' /usr/share/man/man8/systemd-hwdb.8   \
                                > /usr/share/man/man8/udev-hwdb.8
-
 sed 's|lib.*udevd|sbin/udevd|'                                        \
     /usr/share/man/man8/systemd-udevd.service.8                       \
   > /usr/share/man/man8/udevd.8
-
-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="install">unset udev_helpers</userinput></screen>
+rm  /usr/share/man/man8/systemd-*.8</userinput></screen>
 
   </sect2>