Changeset 03e6a40 for BOOK/final-system/multilib/dbus.xml

Timestamp:

Apr 20, 2014, 8:57:39 AM (12 years ago)

Author:

Chris Staub <chris@…>

Children:

0be79ea

Parents:

88ef769 (diff), 578ca586 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'systemd' into simp

Conflicts:

BOOK/final-system/common/bash.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/bash.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/general.ent
BOOK/packages.ent
BOOK/temp-system/common/bash.xml
BOOK/temp-system/mips64-64-chapter.xml
BOOK/temp-system/mips64-chapter.xml
BOOK/temp-system/multilib/bash.xml
BOOK/temp-system/ppc64-64-chapter.xml
BOOK/temp-system/ppc64-chapter.xml
BOOK/temp-system/sparc64-64-chapter.xml
BOOK/temp-system/sparc64-chapter.xml
BOOK/temp-system/x86_64-64-chapter.xml
BOOK/temp-system/x86_64-chapter.xml

File:

• BOOK/final-system/multilib/dbus.xml (moved) (moved from BOOK/final-system/multilib/eudev.xml ) (2 diffs)

BOOK/final-system/multilib/dbus.xml

@@ -6 +6 @@
 ]>
 
-<sect1 id="ch-system-eudev-32" role="wrap">
-  <?dbhtml filename="eudev.html"?>
+<sect1 id="ch-system-dbus-32" role="wrap">
+  <?dbhtml filename="dbus.html"?>
 
-  <title>Eudev-&eudev-version; 32 Bit Libraries</title>
+  <title>D-Bus-&dbus-version; 32 Bit Libraries</title>
 
-  <indexterm zone="ch-system-eudev-32">
-    <primary sortas="a-Eudev">Eudev 32 Bit Libraries</primary>
-    <secondary>32 Bit</secondary>
+  <indexterm zone="ch-system-dbus-32">
+    <primary sortas="a-D-Bus">D-Bus 32 Bit Libraries</primary>
   </indexterm>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/eudev.xml"
+  href="../common/dbus.xml"
   xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
-    <title>Installation of Eudev</title>
+    <title>Installation of D-Bus</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eudev.xml"
+    href="../common/dbus.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>PKG_CONFIG_PATH=${PKG_CONFIG_PATH32} \
-CC="gcc ${BUILD32}" ./configure --prefix=/usr --sysconfdir=/etc \
-    --with-rootprefix="" --libexecdir=/lib --enable-split-usr \
-    --libdir=/usr/lib --with-rootlibdir=/lib --sbindir=/sbin --bindir=/sbin \
-    --enable-rule_generator --disable-introspection --disable-keymap \
-    --disable-gudev --disable-gtk-doc-html --enable-libkmod</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD32}" USE_ARCH=32 PKG_CONFIG_PATH=${PKG_CONFIG_PATH32} \
+  ./configure --prefix=/usr --sysconfdir=/etc \
+    --libdir=/usr/lib --libexecdir=/usr/lib/dbus-1.0 \
+    --localstatedir=/var --with-systemdsystemunitdir=/lib/systemd/system \
+    --docdir=/usr/share/doc/dbus-&dbus-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eudev.xml"
+    href="../common/dbus.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eudev.xml"
+    href="../common/dbus.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eudev.xml"
+    href="../common/dbus.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eudev.xml"
-    xpointer="xpointer(//*[@os='e2'])"/>
+    href="../common/dbus.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eudev.xml"
+    href="../common/dbus.xml"
     xpointer="xpointer(//*[@os='g'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eudev.xml"
+    href="../common/dbus.xml"
     xpointer="xpointer(//*[@os='h'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/dbus.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
 
   </sect2>
@@ -64 +66 @@
 
     <para>Details on this package are located in <xref
-    linkend="contents-eudev" role="."/></para>
+    linkend="contents-dbus" role="."/></para>
 
   </sect2>