Changeset 42ff691


Ignore:
Timestamp:
Mar 17, 2014, 5:03:13 AM (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:
4 edited

Legend:

Unmodified
Added
Removed
  • BOOK/final-system/common/dbus.xml

    r466dec4b r42ff691  
    4545<screen os="g"><userinput>make install</userinput></screen>
    4646
    47     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    48     href="libdbus.xml"
    49     xpointer="xpointer(//*[@os='h'])"/>
     47    <para os="h">Move the shared library to <filename class="directory">/lib
     48    </filename> and recreate the symbolic link.</para>
    5049
    51     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    52     href="libdbus.xml"
    53     xpointer="xpointer(//*[@os='i'])"/>
     50<screen os="i"><userinput>mv -v /usr/lib/libdbus-1.so.* /lib
     51ln -sfv ../../lib/$(readlink /usr/lib/libdbus-1.so) /usr/lib/libdbus-1.so</userinput></screen>
    5452
    5553    <para os="j">Create a symlink so that D-Bus and Systemd can use the same
  • BOOK/final-system/multilib/dbus-64bit.xml

    r466dec4b r42ff691  
    2828<screen os="b"><userinput>CC="gcc ${BUILD64}" USE_ARCH=64 \
    2929  ./configure --prefix=/usr --sysconfdir=/etc \
    30     --libdir=/usr/lib64 --libexecdir=/usr/lib/dbus-1.0 \
     30    --libdir=/usr/lib64 --libexecdir=/usr/lib64/dbus-1.0 \
    3131    --localstatedir=/var --with-systemdsystemunitdir=/lib/systemd/system</userinput></screen>
    3232
     
    5151    xpointer="xpointer(//*[@os='g'])"/>
    5252
    53     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    54     href="../multilib/libdbus-64bit.xml"
    55     xpointer="xpointer(//*[@os='h'])"/>
     53    <para os="h">Move the shared library to <filename class="directory">/lib64
     54    </filename> and recreate the symbolic link.</para>
    5655
    57     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    58     href="../multilib/libdbus-64bit.xml"
    59     xpointer="xpointer(//*[@os='i'])"/>
     56<screen os="i"><userinput>mv -v /usr/lib64/libdbus-1.so.* /lib64
     57ln -sfv ../../lib64/$(readlink /usr/lib64/libdbus-1.so) /usr/lib64/libdbus-1.so
     58</userinput></screen>
    6059
    6160    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
  • BOOK/final-system/multilib/dbus-n32.xml

    r466dec4b r42ff691  
    2828<screen os="b"><userinput>CC="gcc ${BUILDN32}" USE_ARCH=n32 \
    2929  ./configure --prefix=/usr --sysconfdir=/etc \
    30     --libdir=/usr/lib32 --libexecdir=/usr/lib/dbus-1.0 \
     30    --libdir=/usr/lib32 --libexecdir=/usr/lib32/dbus-1.0 \
    3131    --localstatedir=/var --with-systemdsystemunitdir=/lib/systemd/system</userinput></screen>
    3232
     
    5151    xpointer="xpointer(//*[@os='g'])"/>
    5252
    53     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    54     href="../multilib/libdbus-n32.xml"
    55     xpointer="xpointer(//*[@os='h'])"/>
     53    <para os="h">Move the shared library to <filename class="directory">/lib32
     54    </filename> and recreate the symbolic link.</para>
    5655
    57     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    58     href="../multilib/libdbus-n32.xml"
    59     xpointer="xpointer(//*[@os='i'])"/>
     56<screen os="i"><userinput>mv -v /usr/lib32/libdbus-1.so.* /lib32
     57ln -sfv ../../lib32/$(readlink /usr/lib32/libdbus-1.so) /usr/lib32/libdbus-1.so
     58</userinput></screen>
    6059
    6160  </sect2>
  • BOOK/final-system/multilib/dbus.xml

    r466dec4b r42ff691  
    5252
    5353    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    54     href="../common/libdbus.xml"
     54    href="../common/dbus.xml"
    5555    xpointer="xpointer(//*[@os='h'])"/>
    5656
    5757    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    58     href="../common/libdbus.xml"
     58    href="../common/dbus.xml"
    5959    xpointer="xpointer(//*[@os='i'])"/>
    6060
Note: See TracChangeset for help on using the changeset viewer.