Changeset 43100c0 for BOOK/final-system


Ignore:
Timestamp:
Feb 3, 2014, 3:21:44 AM (12 years ago)
Author:
Chris Staub <chris@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
4340580
Parents:
849369d (diff), 961afdcd (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' of git.cross-lfs.org:cross-lfs into systemd

Location:
BOOK/final-system
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • BOOK/final-system/common/diffutils.xml

    r849369d r43100c0  
    2525  <sect2 role="installation">
    2626    <title>Installation of Diffutils</title>
     27
     28    <para os="s1">"Fix a file so locale files are installed:"</para>
     29
     30<screen os="s2"><userinput>sed -i 's:= @mkdir_p@:= /bin/mkdir -p:' po/Makefile.in.in</userinput></screen>
    2731
    2832    <para os="a">Prepare Diffutils for compilation:</para>

  • BOOK/final-system/common/expat.xml

    r849369d r43100c0  
    3333<screen os="d"><userinput>make</userinput></screen>
    3434
    35     <para os="e">To test the results, issue:
    36     <userinput>make check</userinput>.</para>
     35    <para os="e">To test the results, issue:</para>
     36
     37<screen os="e2"><userinput remap="test">make check</userinput></screen>
    3738
    3839    <para os="f">Install the package:</para>

  • BOOK/final-system/common/iana-etc.xml

    r849369d r43100c0  
    2626    <title>Installation of Iana-Etc</title>
    2727
    28     <note os="p1">
    29       <para>This package has the option of downloading updated data when internet access is available. If /etc/resolv.conf has a nameserver entry and internet access is available at this step, then apply the IANA get patch and get the updated data:
    30 <screen><command>patch -Np1 -i ../&iana-etc-get_fix-patch;</command>
    31 <command>make get</command></screen>
    32 Do not apply the following patch.</para>
    33     </note>
     28    <para os="p2">The following patch updates the services and protocol xml files:</para>
    3429
    35     <para os="p2">The following patch updates the services and protocol files:</para>
    36 
    37 <screen os="p3"><userinput>patch -Np1 -i ../&iana-etc-numbers_update-patch;</userinput></screen>
     30<screen os="p3"><userinput>xzcat ../&iana-etc-numbers_update-patch; | patch -Np1 -i -</userinput></screen>
    3831
    3932    <para os="a">The following command converts the raw data provided by IANA into
    … …  
    4134    <filename>/etc/services</filename> data files:</para>
    4235
    43 <screen os="b"><userinput>make</userinput></screen>
     36<screen os="b"><userinput>make get &amp;&amp;
     37make</userinput></screen>
    4438
    4539    <para os="c">This package does not come with a test suite.</para>

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

    r849369d r43100c0  
    2929    href="bzip2.xml"
    3030    xpointer="xpointer(//*[@os='s2'])"/>
     31
     32    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     33    href="../common/bzip2.xml"
     34    xpointer="xpointer(//*[@os='s3'])"/>
     35
     36    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     37    href="../common/bzip2.xml"
     38    xpointer="xpointer(//*[@os='s4'])"/>
    3139
    3240    <para os="m1">We need to change the default lib path

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

    r849369d r43100c0  
    3030    href="bzip2.xml"
    3131    xpointer="xpointer(//*[@os='s2'])"/>
     32
     33    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     34    href="../common/bzip2.xml"
     35    xpointer="xpointer(//*[@os='s3'])"/>
     36
     37    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     38    href="../common/bzip2.xml"
     39    xpointer="xpointer(//*[@os='s4'])"/>
    3240
    3341    <para os="m1">We need to change the default lib path

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

    r849369d r43100c0  
    3030    href="../common/bzip2.xml"
    3131    xpointer="xpointer(//*[@os='s2'])"/>
     32
     33    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     34    href="../common/bzip2.xml"
     35    xpointer="xpointer(//*[@os='s3'])"/>
     36
     37    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     38    href="../common/bzip2.xml"
     39    xpointer="xpointer(//*[@os='s4'])"/>
    3240
    3341    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    r849369d r43100c0  
    2121  <sect2 role="installation">
    2222    <title>Installation of Diffutils</title>
     23
     24    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     25    href="../common/diffutils.xml"
     26    xpointer="xpointer(//*[@os='s1'])"/>
     27
     28    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     29    href="../common/diffutils.xml"
     30    xpointer="xpointer(//*[@os='s2'])"/>
    2331
    2432    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    r849369d r43100c0  
    2626    xpointer="xpointer(//*[@os='a'])"/>
    2727
    28 <screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
    29     --libdir=/usr/lib64</userinput></screen>
     28<screen os="b"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" ./configure \
     29    --prefix=/usr --libdir=/usr/lib64</userinput></screen>
    3030
    3131  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    4040    href="../common/expat.xml"
    4141    xpointer="xpointer(//*[@os='e'])"/>
     42
     43  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     44    href="../common/expat.xml"
     45    xpointer="xpointer(//*[@os='e2'])"/>
    4246
    4347  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    r849369d r43100c0  
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    29 <screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr \
    30     --libdir=/usr/lib32</userinput></screen>
     29<screen os="b"><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" \
     30    ./configure --prefix=/usr --libdir=/usr/lib32</userinput></screen>
    3131
    3232  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    4141    href="../common/expat.xml"
    4242    xpointer="xpointer(//*[@os='e'])"/>
     43
     44  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     45    href="../common/expat.xml"
     46    xpointer="xpointer(//*[@os='e2'])"/>
    4347
    4448  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    r849369d r43100c0  
    2727    xpointer="xpointer(//*[@os='a'])"/>
    2828
    29 <screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr \
    30     --libdir=/usr/lib</userinput></screen>
     29<screen os="b"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" ./configure \
     30    --prefix=/usr --libdir=/usr/lib</userinput></screen>
    3131
    3232  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    4141    href="../common/expat.xml"
    4242    xpointer="xpointer(//*[@os='e'])"/>
     43
     44  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     45    href="../common/expat.xml"
     46    xpointer="xpointer(//*[@os='e2'])"/>
    4347
    4448  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Note: See TracChangeset for help on using the changeset viewer.