Changeset d5e4de79

Timestamp:

07/01/2023 08:16:35 PM (12 months ago)

Author:

Xi Ruoyao <xry111@…>

Branches:

12.0, 12.1, kea, ken/TL2024, ken/tuningfonts, lazarus, lxqt, plabs/newcss, python3.11, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, xry111/llvm18, xry111/xf86-video-removal

Children:

6af6704, 8b1a8b6

Parents:

cedbb469

git-author:

Xi Ruoyao <xry111@…> (07/01/2023 08:15:20 PM)

git-committer:

Xi Ruoyao <xry111@…> (07/01/2023 08:16:35 PM)

Message:

Udisks2 dependency chain clean up

Location:

general

Files:

• genlib/libblockdev.xml (modified) (7 diffs)
• genlib/libnvme.xml (modified) (2 diffs)
• sysutils/udisks2.xml (modified) (2 diffs)

general/genlib/libblockdev.xml

@@ -75 +75 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="gobject-introspection"/>,
-      <xref linkend="libbytesize"/>,
-      <xref linkend="libyaml"/>,
-      <xref linkend="parted"/>, and
-      <xref linkend="volume_key"/>
+      <xref linkend="glib2"/>
     </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="libnvme"/>
+      <xref linkend="cryptsetup"/>,
+      <xref linkend="gobject-introspection"/> (required for GNOME),
+      <xref linkend="keyutils"/>,
+      <xref linkend="libbytesize"/>,
+      <xref linkend="libnvme"/>, and
+      <xref linkend="lvm2"/>
     </para>
 
@@ -92 +93 @@
       <xref linkend="gtk-doc"/>,
       <xref linkend="mdadm"/>,
+      <xref linkend="parted"/>,
+      <xref linkend="volume_key"/>,
       <ulink url="https://people.redhat.com/~heinzm/sw/dmraid/">dmraid</ulink>,
       <ulink url="https://bcachefs.org/">bcachefs</ulink>, and
@@ -115 +118 @@
     </para>
 
-<screen><userinput>./configure --prefix=/usr     \
-            --sysconfdir=/etc \
-            --with-python3    \
-            --without-gtk-doc \
-            --without-nvdimm  \
-            --without-dm      &amp;&amp;
+<screen><userinput>./configure --prefix=/usr      \
+            --sysconfdir=/etc  \
+            --with-python3     \
+            --without-escrow   \
+            --without-gtk-doc  \
+            --without-lvm      \
+            --without-lvm_dbus \
+            --without-nvdimm   \
+            --without-tools    &amp;&amp;
 make</userinput></screen>
 
@@ -134 +140 @@
 
   </sect2>
-<!--
+
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-
-  </sect2>
--->
+    <para>
+      <parameter>--without-escrow</parameter>: This switch allows building
+      <application>libblockdev</application> without
+      <xref linkend="volume_key"/> installed.  Remove it if you've installed
+      <xref linkend="volume_key"/>.
+    </para>
+
+    <para>
+      <parameter>--without-lvm --without-lvm_dbus
+      --without-tools</parameter>: The combination of these switches allows
+      building <application>libblockdev</application> without
+      <xref linkend="parted"/> installed.  Remove it if you've installed
+      <xref linkend="parted"/> and wish to build the
+      <command>lvm-cache-stats</command> or <command>vfat-resize</command>
+      utilities, or wish <application>libblockdev</application> to support
+      logical volumes.
+    </para>
+
+    <para>
+      <option>--without-btrfs --without-mdraid --without-tools</option>:
+      The combination of these switches allows building
+      <application>libblockdev</application> without
+      <xref linkend="libbytesize"/> installed.  The
+      <option>--without-mdraid</option> option will break
+      <xref linkend="udisks2"/>, so don't use it unless you really know what
+      you are doing.
+    </para>
+
+    <para>
+      <option>--without-crypto</option>: This switch allows building
+      <application>libblockdev</application> without
+      <xref linkend="cryptsetup"/> or <xref linkend="keyutils"/> installed.
+      This switch will break <xref linkend="udisks2"/>, so don't use it
+      unless you really know what you are doing.
+    </para>
+
+    <para>
+      <option>--without-dm --without-lvm --without-lvm_dbus
+      --without-mpath</option>: The combination of these switches allows
+      building <application>libblockdev</application> without
+      <xref linkend="lvm2"/> installed.  The <option>--without-dm</option>
+      and <option>--without-mpath</option> options are not in the
+      instruction in the instruction provided by the book because
+      <xref linkend="lvm2"/> is required for <xref linkend="cryptsetup"/>
+      and <xref linkend="cryptsetup"/> is a recommended dependency of
+      <application>libblockdev</application> anyway.
+    </para>
+
+    <para>
+      <option>--without-nvme</option>: This switch allows building
+      <application>libblockdev</application> without
+      <xref linkend="libnvme"/> installed.  This switch will break
+      <xref linkend="udisks2"/>, so don't use it unless you really know what
+      you are doing.
+    </para>
+
+  </sect2>
+
   <sect2 role="content">
     <title>Contents</title>
@@ -151 +212 @@
       <seglistitem>
         <seg>
-          lvm-cache-stats
+          lvm-cache-stats and vfat-resize (both optional)
         </seg>
         <seg>
           libbd_btrfs.so,
           libbd_crypto.so,
+          libbd_dm.so,
           libbd_fs.so,
-          libbd_kbd.so,
           libbd_loop.so,
-          libbd_lvm.so,
-          libbd_lvm-dbus.so,
+          libbd_lvm.so (optional),
+          libbd_lvm-dbus.so (optional),
           libbd_mdraid.so,
           libbd_mpath.so,
+          libbd_nvme.so,
           libbd_part.so,
-          libbd_part_err.so,
           libbd_swap.so,
-          libbd_utils.so,
-          libbd_vdo.so, and
+          libbd_utils.so, and
           libblockdev.so
         </seg>
@@ -173 +233 @@
           /etc/libblockdev,
           /usr/include/blockdev, and
-          /usr/share/gtk-doc/html/libblockdev
+          /usr/share/gtk-doc/html/libblockdev (optional)
         </seg>
       </seglistitem>
@@ -195 +255 @@
       </varlistentry>
 
+      <varlistentry id="vfat-resize">
+        <term><command>vfat-resize</command></term>
+        <listitem>
+          <para>
+            resizes <systemitem class="filesystem">vfat</systemitem>
+            file systems
+          </para>
+          <indexterm zone="libblockdev vfat-resize">
+            <primary sortas="b-vfat-resize">vfat-resize</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
     </variablelist>
 

general/genlib/libnvme.xml

@@ -76 +76 @@
     </para>
 -->
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-
-    <para role="recommended">
-      <xref linkend="keyutils"/>
-    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="json-c"/> and 
+      <phrase revision="sysv"><xref linkend="dbus"/>,</phrase>
+      <xref linkend="json-c"/>,
+      <xref linkend="keyutils"/>, and
       <xref linkend="swig"/>
     </para>
@@ -102 +99 @@
 cd    build &amp;&amp;
 
-meson setup --prefix=/usr --buildtype=release .. &amp;&amp;
+meson setup --prefix=/usr --buildtype=release -Dlibdbus=auto .. &amp;&amp;
 ninja</userinput></screen>
 

general/sysutils/udisks2.xml

@@ -134 +134 @@
             --sysconfdir=/etc    \
             --localstatedir=/var \
-            --disable-static     &&
+            --disable-static     \
+            --enable-available-modules &&
 make</userinput></screen>
 
@@ -161 +162 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/gtk-doc-rebuild.xml"/>
+
+    <para>
+      <parameter>--enable-available-modules</parameter>: This switch enables
+      additional <application>UDisks2</application> functionalities if
+      <xref linkend='libblockdev'/> has been built with optional
+      dependencies.
+    </para>
 
   </sect2>