Create branches/merge in svn repo fo rtesting of merged LFS books

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/merge@11073 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

1 files changed, 42 insertions, 21 deletions

diff --git a/chapter06/dbus.xml b/chapter06/dbus.xml
index 46f0439e4..ee5390137 100644
--- a/chapter06/dbus.xml
+++ b/chapter06/dbus.xml
@@ -48,11 +48,14 @@
 
     <para>Prepare D-Bus for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr                       \
-            --sysconfdir=/etc                   \
-            --localstatedir=/var                \
-            --docdir=/usr/share/doc/dbus-&dbus-version;  \
-            --with-console-auth-dir=/run/console</userinput></screen>
+<screen><userinput remap="configure">  ./configure --prefix=/usr                       \
+              --sysconfdir=/etc                   \
+              --localstatedir=/var                \
+              --disable-static                    \
+              --disable-doxygen-docs              \
+              --disable-xml-docs                  \
+              --docdir=/usr/share/doc/dbus-&dbus-version; \
+              --with-console-auth-dir=/run/console</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure options:</title>
@@ -74,7 +77,7 @@
     <para>This package does come with a test suite, but it requires several
     packages that are not included in LFS. Instructions for running the
     test suite can be found in the BLFS book at
-    <ulink url="&blfs-root;/view/&short-version;/general/dbus.html"/>.</para>
+    <ulink url="&blfs-book;general/dbus.html"/>.</para>
 
     <para>Install the package:</para>
 
@@ -88,15 +91,10 @@
 <screen><userinput remap="install">mv -v /usr/lib/libdbus-1.so.* /lib
 ln -sfv ../../lib/$(readlink /usr/lib/libdbus-1.so) /usr/lib/libdbus-1.so</userinput></screen>
 
-    <para>Create a symlink, so that D-Bus and Systemd can use the same
+    <para>Create a symlink, so that D-Bus and systemd can use the same
     <filename>machine-id</filename> file:</para>
 
-<screen><userinput remap="install">ln -sv /etc/machine-id /var/lib/dbus</userinput></screen>
-
-    <para>Finally, generate a D-Bus UUID to avoid possible warnings 
-    when building some packages in BLFS:</para>
-
-<screen><userinput remap="install">dbus-uuidgen --ensure</userinput></screen>
+<screen><userinput remap="install">ln -sfv /etc/machine-id /var/lib/dbus</userinput></screen>
 
   </sect2>
 
@@ -110,11 +108,11 @@ ln -sfv ../../lib/$(readlink /usr/lib/libdbus-1.so) /usr/lib/libdbus-1.so</useri
 
       <seglistitem>
         <seg>dbus-cleanup-sockets, dbus-daemon, dbus-launch, dbus-monitor,
-        dbus-send, and dbus-uuidgen</seg>
+        dbus-run-session, dbus-send, and dbus-uuidgen</seg>
         <seg>libdbus-1.{a,so}</seg>
         <seg>/etc/dbus-1, /usr/include/dbus-1.0, /usr/lib/dbus-1.0,
         /usr/share/dbus-1, /usr/share/doc/dbus-&dbus-version;,
-        /var/lib/dbus</seg>
+        and /var/lib/dbus</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -126,7 +124,7 @@ ln -sfv ../../lib/$(readlink /usr/lib/libdbus-1.so) /usr/lib/libdbus-1.so</useri
       <varlistentry id="dbus-cleanup-sockets">
         <term><command>dbus-cleanup-sockets</command></term>
         <listitem>
-          <para>Used to clean up leftover sockets in a directory.</para>
+          <para>Used to clean up leftover sockets in a directory</para>
           <indexterm zone="ch-system-dbus dbus-cleanup-sockets">
             <primary sortas="b-dbus-cleanup-sockets">dbus-cleanup-sockets</primary>
           </indexterm>
@@ -136,7 +134,7 @@ ln -sfv ../../lib/$(readlink /usr/lib/libdbus-1.so) /usr/lib/libdbus-1.so</useri
       <varlistentry id="dbus-daemon">
         <term><command>dbus-daemon</command></term>
         <listitem>
-          <para>The D-Bus message bus daemon.</para>
+          <para>The D-Bus message bus daemon</para>
           <indexterm zone="ch-system-dbus dbus-daemon">
             <primary sortas="b-dbus-daemon">dbus-daemon</primary>
           </indexterm>
@@ -147,7 +145,7 @@ ln -sfv ../../lib/$(readlink /usr/lib/libdbus-1.so) /usr/lib/libdbus-1.so</useri
         <term><command>dbus-launch</command></term>
         <listitem>
           <para>Starts <command>dbus-daemon</command> from a shell
-          script.</para>
+          script</para>
           <indexterm zone="ch-system-dbus dbus-launch">
             <primary sortas="b-dbus-launch">dbus-launch</primary>
           </indexterm>
@@ -157,17 +155,29 @@ ln -sfv ../../lib/$(readlink /usr/lib/libdbus-1.so) /usr/lib/libdbus-1.so</useri
       <varlistentry id="dbus-monitor">
         <term><command>dbus-monitor</command></term>
         <listitem>
-          <para>Monitors messages passing through a D-Bus message bus.</para>
+          <para>Monitors messages passing through a D-Bus message bus</para>
           <indexterm zone="ch-system-dbus dbus-monitor">
             <primary sortas="b-dbus-monitor">dbus-monitor</primary>
           </indexterm>
         </listitem>
       </varlistentry>
 
+      <varlistentry id="dbus-run-session">
+        <term><command>dbus-run-session</command></term>
+        <listitem>
+          <para>Starts a session bus instance of <command>dbus-daemon</command>
+          from a shell script and starts a specified program in that
+          session</para>
+          <indexterm zone="ch-system-dbus dbus-run-session">
+            <primary sortas="b-dbus-run-session">dbus-run-session</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="dbus-send">
         <term><command>dbus-send</command></term>
         <listitem>
-          <para>Sends a message to a D-Bus message bus.</para>
+          <para>Sends a message to a D-Bus message bus</para>
           <indexterm zone="ch-system-dbus dbus-send">
             <primary sortas="b-dbus-send">dbus-send</primary>
           </indexterm>
@@ -177,13 +187,24 @@ ln -sfv ../../lib/$(readlink /usr/lib/libdbus-1.so) /usr/lib/libdbus-1.so</useri
       <varlistentry id="dbus-uuidgen">
         <term><command>dbus-uuidgen</command></term>
         <listitem>
-          <para>Generates a universally unique ID.</para>
+          <para>Generates a universally unique ID</para>
           <indexterm zone="ch-system-dbus dbus-uuidgen">
             <primary sortas="b-dbus-uuidgen">dbus-uuidgen</primary>
           </indexterm>
         </listitem>
       </varlistentry>
 
+      <varlistentry id="libdbus-1">
+        <term><filename class="libraryfile">libdbus-1</filename></term>
+        <listitem>
+          <para>Contains API functions used to communicate with the D-Bus
+          message bus</para>
+          <indexterm zone="ch-system-dbus libdbus-1">
+            <primary sortas="c-libdbus-1">libdbus-1</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
 
   </sect2>