dependencies: Update for Udev

The Udev build dependencies are directly copied from systemd.  Though
they might be unneeded for a Udev-only build, meson will check them
anyway.  And I'm sure Jinja2 is really used.

In systemd dependencies Attr is dropped because Attr is not used
directly, it's just Acl needs Attr.  OpenSSL is added because udevadm
links to libcrypto.

As "S" and "U" are closer, create a "systemd-udev" entity to simplify
the <phrase> choices.

In Util-linux, lsblk and findmnt links to libudev so it depends on
&systemd-udev;.

1 files changed, 59 insertions, 66 deletions

diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml
index 1d693e064..8038ee943 100644
--- a/appendices/dependencies.xml
+++ b/appendices/dependencies.xml
@@ -3,6 +3,9 @@
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
+  <!-- Convenient entity for "Systemd" or "Udev" -->
+  <!ENTITY systemd-udev "<phrase revision='systemd'>Systemd</phrase>
+                         <phrase revision='sysv'>Udev</phrase>">
 ]>
 
 <appendix id="appendixc" xreflabel="Appendix C">
@@ -466,9 +469,7 @@
       <segmentedlist id="coreutils-before">
         <segtitle>&before;</segtitle>
         <seglistitem>
-          <seg>Bash, Diffutils, <phrase revision="sysv">Eudev, </phrase>
-          Findutils, <phrase revision="sysv">and </phrase>Man-DB<phrase
-          revision="systemd">, and Systemd</phrase></seg>
+          <seg>Bash, Diffutils, Findutils, Man-DB, and &systemd-udev;</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -642,45 +643,6 @@
         </seglistitem>
       </segmentedlist>
 
-<!-- Begin Eudev dependency info -->
-  <bridgehead renderas="sect2" id="eudev-dep" revision="sysv">Eudev</bridgehead>
-
-      <segmentedlist id="eudev-depends" revision="sysv">
-        <segtitle>&dependencies;</segtitle>
-        <seglistitem>
-          <seg>Bash, Binutils, Coreutils, Gawk, GCC, Glibc, Grep, Gperf, Make,
-          Sed, and Util-linux</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist id="eudev-rundeps" revision="sysv">
-        <segtitle>&runtime;</segtitle>
-        <seglistitem>
-          <seg>Glibc, Kmod, Xz, Util-linux, and Zlib.</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist id="eudev-testdeps" revision="sysv">
-        <segtitle>&testsuites;</segtitle>
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist id="eudev-before" revision="sysv">
-        <segtitle>&before;</segtitle>
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist id="eudev-optdeps" revision="sysv">
-        <segtitle>&external;</segtitle>
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
 <!-- Begin Expat dependency info -->
   <bridgehead renderas="sect2" id="expat-dep">Expat</bridgehead>
 
@@ -1555,7 +1517,7 @@
       <segmentedlist id="jinja2-before" revision='systemd'>
         <segtitle>&before;</segtitle>
         <seglistitem>
-          <seg>Systemd</seg>
+          <seg>&systemd-udev;</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1633,8 +1595,7 @@
       <segmentedlist id="kmod-before">
         <segtitle>&before;</segtitle>
         <seglistitem>
-          <seg><phrase revision="sysv">Eudev</phrase>
-          <phrase revision="systemd">Systemd</phrase></seg>
+          <seg>&systemd-udev;</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1913,9 +1874,7 @@
       <segmentedlist id="libxcrypt-before">
         <segtitle>&before;</segtitle>
         <seglistitem>
-          <seg>GCC, Perl, Python,
-          <phrase revision='sysv'>and </phrase>Shadow<phrase
-          revision='systemd'>, and Systemd</phrase></seg>
+          <seg>GCC, Perl, Python, Shadow, and &systemd-udev;</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -2236,10 +2195,7 @@
       <segmentedlist id="meson-before">
         <segtitle>&before;</segtitle>
         <seglistitem>
-          <seg>
-            <phrase revision='sysv'>None</phrase>
-            <phrase revision='systemd'>Systemd</phrase>
-          </seg>
+          <seg>&systemd-udev;</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -2438,7 +2394,7 @@
       <segmentedlist id="openssl-before">
         <segtitle>&before;</segtitle>
         <seglistitem>
-          <seg>Coreutils, Kmod, and Linux</seg>
+          <seg>Coreutils, Kmod, Linux, and &systemd-udev;</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -2560,7 +2516,7 @@
         <seglistitem>
           <seg><phrase revision='systemd'>D-Bus, </phrase>E2fsprogs,
           IProute2, Kmod, Man-DB, Procps-ng, Python,
-		  <phrase revision='systemd'>Systemd, </phrase>and Util-linux</seg>
+		  &systemd-udev;, and Util-linux</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -2866,16 +2822,17 @@
       <segmentedlist id="systemd-depends" revision='systemd'>
         <segtitle>&dependencies;</segtitle>
         <seglistitem>
-         <seg>Acl, Attr, Bash, Binutils, Coreutils, Diffutils, Expat, Gawk,
+         <seg>Acl, Bash, Binutils, Coreutils, Diffutils, Gawk,
          GCC, Glibc, Gperf, Grep, Jinja2, Libcap, Libxcrypt, Meson,
-         Pkgconf, Sed, Util-linux, and Zstd</seg>
+         OpenSSL, Pkgconf, Sed, Util-linux, and Zstd</seg>
         </seglistitem>
       </segmentedlist>
 
       <segmentedlist id="systemd-rundeps" revision='systemd'>
         <segtitle>&runtime;</segtitle>
         <seglistitem>
-          <seg>Acl, Attr, Glibc, Libcap, Libxcrypt, and Util-linux</seg>
+          <seg>Acl, Glibc, Libcap, Libxcrypt, OpenSSL, Util-linux, Xz,
+          Zlib, and Zstd</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -3104,23 +3061,62 @@
         </seglistitem>
       </segmentedlist>
 
+<!-- Begin Udev dependency info -->
+  <bridgehead renderas="sect2" id="udev-dep" revision="sysv">Udev</bridgehead>
+
+      <segmentedlist id="udev-depends" revision="sysv">
+        <segtitle>&dependencies;</segtitle>
+        <seglistitem>
+         <seg>Acl, Bash, Binutils, Coreutils, Diffutils, Gawk,
+         GCC, Glibc, Gperf, Grep, Jinja2, Libcap, Libxcrypt, Meson,
+         OpenSSL, Pkgconf, Sed, Util-linux, and Zstd</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist id="udev-rundeps" revision="sysv">
+        <segtitle>&runtime;</segtitle>
+        <seglistitem>
+          <seg>Acl, Glibc, Libcap, OpenSSL, and Util-linux</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist id="udev-testdeps" revision="sysv">
+        <segtitle>&testsuites;</segtitle>
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist id="udev-before" revision="sysv">
+        <segtitle>&before;</segtitle>
+        <seglistitem>
+          <seg>Util-linux</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist id="udev-optdeps" revision="sysv">
+        <segtitle>&external;</segtitle>
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
 <!-- Begin Util-linux dependency info -->
   <bridgehead renderas="sect2" id="util-linux-dep">Util-linux</bridgehead>
 
       <segmentedlist id="util-linux-depends">
         <segtitle>&dependencies;</segtitle>
         <seglistitem>
-          <seg>Bash, Binutils, Coreutils, Diffutils,
-          <phrase revision="sysv">Eudev, </phrase>File, Findutils, Gawk,
+          <seg>Bash, Binutils, Coreutils, Diffutils, File, Findutils, Gawk,
           GCC, Gettext, Glibc, Grep, Make, Ncurses, Pkgconf, Sed,
-          <phrase revision="systemd">Systemd, </phrase>and Zlib</seg>
+          &systemd-udev;, and Zlib</seg>
         </seglistitem>
       </segmentedlist>
 
       <segmentedlist id="util-linux-rundeps">
         <segtitle>&runtime;</segtitle>
         <seglistitem>
-          <seg>Glibc, Ncurses, Readline, and Zlib</seg>
+          <seg>Glibc, Ncurses, Readline, &systemd-udev;, and Zlib</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -3308,9 +3304,7 @@
       <segmentedlist id="xz-before">
         <segtitle>&before;</segtitle>
         <seglistitem>
-          <seg><phrase revision="sysv">Eudev, </phrase>File, GRUB, Kmod,
-          Libelf, <phrase revision="sysv">and </phrase>Man-DB<phrase
-          revision="systemd">, and Systemd</phrase></seg>
+          <seg>File, GRUB, Kmod, Libelf, Man-DB, and &systemd-udev;</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -3386,8 +3380,7 @@
       <segmentedlist id="zstd-before">
         <segtitle>&before;</segtitle>
         <seglistitem>
-          <seg><phrase revision='sysv'>GCC and Libelf</phrase>
-          <phrase revision='systemd'>GCC, Libelf, and Systemd</phrase></seg>
+          <seg>GCC, Libelf, and &systemd-udev;</seg>
         </seglistitem>
       </segmentedlist>