Changeset df44c72 for BOOK/final-system


Ignore:
Timestamp:
Jan 21, 2014, 11:07:47 AM (11 years ago)
Author:
William Harrington <kb0iic@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
090632e
Parents:
5847541
Message:

Tidy up systemd multilib instructions to be proper in each 32bit, n32, and 64bit build.

Location:
BOOK/final-system/multilib
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • BOOK/final-system/multilib/systemd-64bit.xml

    r5847541 rdf44c72  
    2727<screen os="b"><userinput>CC="gcc ${BUILD64}" PKG_CONFIG_PATH="${PKG_CONFIG_PATH64}" \
    2828  ./configure --prefix=/usr \
    29     --sysconfdir=/etc --localstatedir=/var \
    30     --libexecdir=/usr/lib --docdir=/usr/share/doc/systemd-&systemd-version; \
    31     --with-rootprefix="" -with-rootlibdir=/lib \
     29    --sysconfdir=/etc --localstatedir=/var --libdir=/usr/lib64 \
     30    --libexecdir=/usr/lib64 --docdir=/usr/share/doc/systemd-&systemd-version; \
     31    --with-rootprefix="" -with-rootlibdir=/lib64 \
    3232    --enable-split-usr --disable-gudev</userinput></screen>
    3333

  • BOOK/final-system/multilib/systemd-n32.xml

    r5847541 rdf44c72  
    3232<screen os="b"><userinput>CC="gcc ${BUILDN32}" PKG_CONFIG_PATH="${PKG_CONFIG_PATHN32}" \
    3333  ./configure --prefix=/usr \
    34     --sysconfdir=/etc --localstatedir=/var \
     34    --sysconfdir=/etc --localstatedir=/var --libdir=/usr/lib32 \
    3535    --libexecdir=/usr/lib32 --docdir=/usr/share/doc/systemd-&systemd-version; \
    3636    --with-rootprefix="" -with-rootlibdir=/lib32 \
    … …  
    3838
    3939    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    40     href="systemd.xml"
     40    href="../common/systemd.xml"
    4141    xpointer="xpointer(//*[@os='c'])"/>
    4242
    4343    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    44     href="systemd.xml"
     44    href="../common/systemd.xml"
    4545    xpointer="xpointer(//*[@os='d'])"/>
    4646
    4747    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    48     href="systemd.xml"
     48    href="../common/systemd.xml"
    4949    xpointer="xpointer(//*[@os='e'])"/>
    5050
    5151    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    52     href="systemd.xml"
     52    href="../common/systemd.xml"
    5353    xpointer="xpointer(//*[@os='f'])"/>
    54 
    55     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    56     href="../common/systemd.xml"
    57     xpointer="xpointer(//*[@os='g'])"/>
    58 
    59     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    60     href="../common/systemd.xml"
    61     xpointer="xpointer(//*[@os='h'])"/>
    62 
    63     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    64     href="../common/systemd.xml"
    65     xpointer="xpointer(//*[@os='i'])"/>
    66 
    67     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    68     href="../common/systemd.xml"
    69     xpointer="xpointer(//*[@os='j'])"/>
    70 
    71     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    72     href="../common/systemd.xml"
    73     xpointer="xpointer(//*[@os='k'])"/>
    74 
    75     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    76     href="../common/systemd.xml"
    77     xpointer="xpointer(//*[@os='l'])"/>
    7854
    7955  </sect2>

  • BOOK/final-system/multilib/systemd.xml

    r5847541 rdf44c72  
    4646    xpointer="xpointer(//*[@os='c'])"/>
    4747
    48 <screen os="d"><userinput>make pam_systemd.la</userinput></screen>
     48    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     49    href="../common/systemd.xml"
     50    xpointer="xpointer(//*[@os='d'])"/>
    4951
    5052    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    5254    xpointer="xpointer(//*[@os='e'])"/>
    5355
    54 <screen os="f"><userinput>make install-pamlibLTLIBRARIES</userinput></screen>
    55 
    5656    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    5757    href="../common/systemd.xml"
    58     xpointer="xpointer(//*[@os='g'])"/>
    59 
    60     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    61     href="../common/systemd.xml"
    62     xpointer="xpointer(//*[@os='h'])"/>
    63 
    64     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    65     href="../common/systemd.xml"
    66     xpointer="xpointer(//*[@os='i'])"/>
    67 
    68     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    69     href="../common/systemd.xml"
    70     xpointer="xpointer(//*[@os='j'])"/>
    71 
    72     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    73     href="../common/systemd.xml"
    74     xpointer="xpointer(//*[@os='k'])"/>
    75 
    76     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    77     href="../common/systemd.xml"
    78     xpointer="xpointer(//*[@os='l'])"/>
     58    xpointer="xpointer(//*[@os='f'])"/>
    7959
    8060  </sect2>
Note: See TracChangeset for help on using the changeset viewer.