Changeset 42ff691

Timestamp:

Mar 16, 2014, 10:03:13 PM (11 years ago)

Author:

William Harrington <kb0iic@…>

Branches:

clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

49da1d5

Parents:

466dec4b

Message:

Remvoe libdbus referernces and adjust commands for library installs.

Location:

BOOK/final-system

Files:

• common/dbus.xml (modified) (1 diff)
• multilib/dbus-64bit.xml (modified) (2 diffs)
• multilib/dbus-n32.xml (modified) (2 diffs)
• multilib/dbus.xml (modified) (1 diff)

BOOK/final-system/common/dbus.xml

@@ -45 +45 @@
 <screen os="g"><userinput>make install</userinput></screen>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="libdbus.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
+    <para os="h">Move the shared library to <filename class="directory">/lib
+    </filename> and recreate the symbolic link.</para>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="libdbus.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
+<screen os="i"><userinput>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 os="j">Create a symlink so that D-Bus and Systemd can use the same

BOOK/final-system/multilib/dbus-64bit.xml

@@ -28 +28 @@
 <screen os="b"><userinput>CC="gcc ${BUILD64}" USE_ARCH=64 \
   ./configure --prefix=/usr --sysconfdir=/etc \
-    --libdir=/usr/lib64 --libexecdir=/usr/lib/dbus-1.0 \
+    --libdir=/usr/lib64 --libexecdir=/usr/lib64/dbus-1.0 \
     --localstatedir=/var --with-systemdsystemunitdir=/lib/systemd/system</userinput></screen>
 
@@ -51 +51 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/libdbus-64bit.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
+    <para os="h">Move the shared library to <filename class="directory">/lib64
+    </filename> and recreate the symbolic link.</para>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/libdbus-64bit.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
+<screen os="i"><userinput>mv -v /usr/lib64/libdbus-1.so.* /lib64
+ln -sfv ../../lib64/$(readlink /usr/lib64/libdbus-1.so) /usr/lib64/libdbus-1.so
+</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/final-system/multilib/dbus-n32.xml

@@ -28 +28 @@
 <screen os="b"><userinput>CC="gcc ${BUILDN32}" USE_ARCH=n32 \
   ./configure --prefix=/usr --sysconfdir=/etc \
-    --libdir=/usr/lib32 --libexecdir=/usr/lib/dbus-1.0 \
+    --libdir=/usr/lib32 --libexecdir=/usr/lib32/dbus-1.0 \
     --localstatedir=/var --with-systemdsystemunitdir=/lib/systemd/system</userinput></screen>
 
@@ -51 +51 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/libdbus-n32.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
+    <para os="h">Move the shared library to <filename class="directory">/lib32
+    </filename> and recreate the symbolic link.</para>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/libdbus-n32.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
+<screen os="i"><userinput>mv -v /usr/lib32/libdbus-1.so.* /lib32
+ln -sfv ../../lib32/$(readlink /usr/lib32/libdbus-1.so) /usr/lib32/libdbus-1.so
+</userinput></screen>
 
   </sect2>

BOOK/final-system/multilib/dbus.xml

@@ -52 +52 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libdbus.xml"
+    href="../common/dbus.xml"
     xpointer="xpointer(//*[@os='h'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libdbus.xml"
+    href="../common/dbus.xml"
     xpointer="xpointer(//*[@os='i'])"/>