Changeset 49da1d5


Ignore:
Timestamp:
Mar 16, 2014, 10:04:18 PM (9 years ago)
Author:
William Harrington <kb0iic@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
6f5a7c3
Parents:
42ff691
Message:

Add systemd compat patch command, adjust test suite commands, adjust configure commands for dbus config files, update configure option description list.

Location:
BOOK/final-system
Files:
4 edited

Legend:

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

    r42ff691 r49da1d5  
    2525    <title>Installation of systemd</title>
    2626
     27    <para os="p1">Apply a patch so that compat <command>pkg-config</command>
     28    files get installed without installing compat libraries:</para>
     29
     30<screen os="p2"><userinput>patch -Np1 -i ../&systemd-compat-patch;</userinput></screen>
     31
    2732    <para os="a">Prepare Systemd for compilation:</para>
    2833
     
    3237    --with-rootprefix="" --with-rootlibdir=/lib \
    3338    --enable-split-usr --disable-gudev --with-kbd-loadkeys=/bin/loadkeys \
    34     --with-kbd-setfont=/bin/setfont</userinput></screen>
     39    --with-kbd-setfont=/bin/setfont --with-dbuspolicydir=/etc/dbus-1/system.d \
     40    --with-dbusinterfacedir=/usr/share/dbus-1/interfaces \
     41    --with-dbussessionservicedir=/usr/share/dbus-1/services \
     42    --with-dbussystemservicedir=/usr/share/dbus-1/system-services</userinput></screen>
    3543
    3644    <variablelist os="c">
     
    6371      </varlistentry>
    6472
     73      <varlistentry>
     74        <term><parameter>--with-dbus*</parameter></term>
     75        <listitem>
     76          <para>These switches ensure that D-Bus configuration files get
     77          installed to the correct locations.</para>
     78        </listitem>
     79      </varlistentry>
    6580    </variablelist>
    6681
     
    7186    <para os="f">Prevent a broken test case from running:</para>
    7287
    73 <screen os="g"><userinput remap="test">sed -i s:test/udev-test.pl::g Makefile</userinput></screen>
    74 
    75     <para os="h">Test test the results, issue:</para>
     88<screen os="g"><userinput remap="test">
     89sed -e "s:test/udev-test.pl::g Makefile" \
     90    -e "s:test-bus-cleanup\$(EXEEXT) ::g" \
     91    -e "s:test-bus-gvariant\$(EXEEXT) ::g" \
     92    -i Makefile</userinput></screen>
     93
     94    <para os="h">Test the results, issue:</para>
    7695
    7796<screen os="i"><userinput remap="test">make check</userinput></screen>
  • BOOK/final-system/multilib/systemd-64bit.xml

    r42ff691 r49da1d5  
    2323    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2424    href="../common/systemd.xml"
     25    xpointer="xpointer(//*[@os='p1'])"/>
     26
     27    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     28    href="../common/systemd.xml"
     29    xpointer="xpointer(//*[@os='p2'])"/>
     30
     31    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     32    href="../common/systemd.xml"
    2533    xpointer="xpointer(//*[@os='a'])"/>
    2634
     
    3139    --with-rootprefix="" -with-rootlibdir=/lib64 \
    3240    --enable-split-usr --disable-gudev --with-kbd-loadkeys=/bin/loadkeys \
    33     --with-kbd-setfont=/bin/setfont</userinput></screen>
     41    --with-kbd-setfont=/bin/setfont --with-dbuspolicydir=/etc/dbus-1/system.d \
     42    --with-dbusinterfacedir=/usr/share/dbus-1/interfaces \
     43    --with-dbussessionservicedir=/usr/share/dbus-1/services \
     44    --with-dbussystemservicedir=/usr/share/dbus-1/system-services</userinput></screen>
    3445
    3546    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     
    4455    href="../common/systemd.xml"
    4556    xpointer="xpointer(//*[@os='e'])"/>
     57
     58    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     59    href="../common/systemd.xml"
     60    xpointer="xpointer(//*[@os='f'])"/>
     61
     62    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     63    href="../common/systemd.xml"
     64    xpointer="xpointer(//*[@os='g'])"/>
     65
     66    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     67    href="../common/systemd.xml"
     68    xpointer="xpointer(//*[@os='h'])"/>
     69
     70    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     71    href="../common/systemd.xml"
     72    xpointer="xpointer(//*[@os='i'])"/>
    4673
    4774    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
  • BOOK/final-system/multilib/systemd-n32.xml

    r42ff691 r49da1d5  
    2727
    2828    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     29    href="../common/systemd.xml"
     30    xpointer="xpointer(//*[@os='p1'])"/>
     31
     32    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     33    href="../common/systemd.xml"
     34    xpointer="xpointer(//*[@os='p2'])"/>
     35
     36    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2937    href="systemd.xml"
    3038    xpointer="xpointer(//*[@os='a'])"/>
     
    3644    --with-rootprefix="" -with-rootlibdir=/lib32 \
    3745    --enable-split-usr --disable-gudev --with-kbd-loadkeys=/bin/loadkeys \
    38     --with-kbd-setfont=/bin/setfont</userinput></screen>
     46    --with-kbd-setfont=/bin/setfont --with-dbuspolicydir=/etc/dbus-1/system.d \
     47    --with-dbusinterfacedir=/usr/share/dbus-1/interfaces \
     48    --with-dbussessionservicedir=/usr/share/dbus-1/services \
     49    --with-dbussystemservicedir=/usr/share/dbus-1/system-services</userinput></screen>
    3950
    4051    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     
    4556    href="../common/systemd.xml"
    4657    xpointer="xpointer(//*[@os='e'])"/>
     58
     59    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     60    href="../common/systemd.xml"
     61    xpointer="xpointer(//*[@os='f'])"/>
     62
     63    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     64    href="../common/systemd.xml"
     65    xpointer="xpointer(//*[@os='g'])"/>
     66
     67    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     68    href="../common/systemd.xml"
     69    xpointer="xpointer(//*[@os='h'])"/>
     70
     71    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     72    href="../common/systemd.xml"
     73    xpointer="xpointer(//*[@os='i'])"/>
    4774
    4875    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
  • BOOK/final-system/multilib/systemd.xml

    r42ff691 r49da1d5  
    3333    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3434    href="../common/systemd.xml"
     35    xpointer="xpointer(//*[@os='p1'])"/>
     36
     37    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     38    href="../common/systemd.xml"
     39    xpointer="xpointer(//*[@os='p2'])"/>
     40
     41    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     42    href="../common/systemd.xml"
    3543    xpointer="xpointer(//*[@os='a'])"/>
    3644
     
    4149    --with-rootprefix="" --with-rootlibdir=/lib \
    4250    --enable-split-usr --disable-gudev --with-kbd-loadkeys=/bin/loadkeys \
    43     --with-kbd-setfont=/bin/setfont</userinput></screen>
     51    --with-kbd-setfont=/bin/setfont --with-dbuspolicydir=/etc/dbus-1/system.d \
     52    --with-dbusinterfacedir=/usr/share/dbus-1/interfaces \
     53    --with-dbussessionservicedir=/usr/share/dbus-1/services \
     54    --with-dbussystemservicedir=/usr/share/dbus-1/system-services</userinput></screen>
    4455
    4556    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     
    5061    href="../common/systemd.xml"
    5162    xpointer="xpointer(//*[@os='e'])"/>
     63
     64    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     65    href="../common/systemd.xml"
     66    xpointer="xpointer(//*[@os='f'])"/>
     67
     68    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     69    href="../common/systemd.xml"
     70    xpointer="xpointer(//*[@os='g'])"/>
     71
     72    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     73    href="../common/systemd.xml"
     74    xpointer="xpointer(//*[@os='h'])"/>
     75
     76    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     77    href="../common/systemd.xml"
     78    xpointer="xpointer(//*[@os='i'])"/>
    5279
    5380    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Note: See TracChangeset for help on using the changeset viewer.