Changes in chapter08/udev.xml [823fbde:264a80d]

File:

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

chapter08/udev.xml

@@ -56 +56 @@
  <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>
 
@@ -72 +67 @@
       -Ddev-kvm-mode=0660           \
       -Dlink-udev-shared=false      \
-      -Dlogind=false                \
-      -Dvconsole=false              \
       ..</userinput></screen>
 
@@ -115 +108 @@
         </listitem>
       </varlistentry>
-
-      <varlistentry>
-        <term><parameter>-Dlogind=false -Dvconsole=false</parameter></term>
-        <listitem>
-          <para>These options prevent the generation of several udev rule
-          files belonging to the other Systemd components that we won't
-          install.</para>
-        </listitem>
-      </varlistentry>
     </variablelist>
 
     <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)/[^ ]*') \
+    <screen><userinput remap="make">ninja udevadm systemd-hwdb \
+      $(grep -o -E "^build (src/libudev|src/udev|rules.d|hwdb.d)[^:]*" \
+        build.ninja | awk '{ print $2 }')                              \
       $(realpath libudev.so --relative-to .)</userinput></screen>
 
+    <para>Remove one udev rule file requiring a full Systemd
+    installation:</para>
+
+<screen><userinput remap="make">rm rules.d/90-vconsole.rules</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/
-install -vm755 systemd-hwdb                        /usr/bin/udev-hwdb
-ln      -svfn  ../bin/udevadm                      /usr/sbin/udevd
-cp      -av    libudev.so{,*[0-9]}                 /usr/lib/
-install -vm644 ../src/libudev/libudev.h            /usr/include/
-install -vm644 src/libudev/*.pc                    /usr/lib/pkgconfig/
-install -vm644 src/udev/*.pc                       /usr/share/pkgconfig/
-install -vm644 ../src/udev/udev.conf               /etc/udev/
-install -vm644 rules.d/* ../rules.d/README         /usr/lib/udev/rules.d/
-install -vm644 $(find ../rules.d/*.rules \
-                      -not -name '*power-switch*') /usr/lib/udev/rules.d/
-install -vm644 hwdb.d/*  ../hwdb.d/{*.hwdb,README} /usr/lib/udev/hwdb.d/
-install -vm755 $(find src/udev \
-                      -type f -not -name '*.*')    /usr/lib/udev
-install -vm644 ../network/99-default.link          /usr/lib/udev/network</userinput></screen>
+install -vm755 udevadm                     /usr/bin/
+install -vm755 systemd-hwdb                /usr/bin/udev-hwdb
+ln      -svfn  ../bin/udevadm              /usr/sbin/udevd
+cp      -av    libudev.so{,*[0-9]}         /usr/lib/
+install -vm644 ../src/libudev/libudev.h    /usr/include/
+install -vm644 src/libudev/*.pc            /usr/lib/pkgconfig/
+install -vm644 src/udev/*.pc               /usr/share/pkgconfig/
+install -vm644 ../src/udev/udev.conf       /etc/udev/
+install -vm644 rules.d/* ../rules.d/{*.rules,README} /usr/lib/udev/rules.d/
+install -vm644 hwdb.d/*  ../hwdb.d/{*.hwdb,README}   /usr/lib/udev/hwdb.d/
+install -vm755 $(find src/udev -type f | grep -F -v ".") /usr/lib/udev</userinput></screen>
 
     <para>Install some custom rules and support files useful in an LFS
@@ -165 +151 @@
     --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>
+rm  /usr/share/man/man8/systemd-*.8</userinput></screen>
 
   </sect2>