Ignore:
Timestamp:
Apr 20, 2014, 8:57:39 AM (12 years ago)
Author:
Chris Staub <chris@…>
Children:
0be79ea
Parents:
88ef769 (diff), 578ca586 (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' into simp

Conflicts:

BOOK/final-system/common/bash.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/bash.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/general.ent
BOOK/packages.ent
BOOK/temp-system/common/bash.xml
BOOK/temp-system/mips64-64-chapter.xml
BOOK/temp-system/mips64-chapter.xml
BOOK/temp-system/multilib/bash.xml
BOOK/temp-system/ppc64-64-chapter.xml
BOOK/temp-system/ppc64-chapter.xml
BOOK/temp-system/sparc64-64-chapter.xml
BOOK/temp-system/sparc64-chapter.xml
BOOK/temp-system/x86_64-64-chapter.xml
BOOK/temp-system/x86_64-chapter.xml

File:
1 moved

Legend:

Unmodified
Added
Removed

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

    r88ef769 r03e6a40  
    66]>
    77
    8 <sect1 id="ch-system-eglibc" role="wrap">
    9   <?dbhtml filename="eglibc-64bit.html"?>
     8<sect1 id="ch-system-glibc" role="wrap">
     9  <?dbhtml filename="glibc-64bit.html"?>
    1010
    11   <title>Glibc-&eglibc-version; 64-Bit</title>
     11  <title>Glibc-&glibc-version; 64-Bit</title>
    1212
    13   <indexterm zone="ch-system-eglibc">
    14     <primary sortas="a-EGLIBC">EGLIBC</primary>
     13  <indexterm zone="ch-system-glibc">
     14    <primary sortas="a-GLIBC">GLIBC</primary>
    1515  </indexterm>
    1616
    1717  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    18   href="eglibc.xml"
     18  href="glibc.xml"
    1919  xpointer="xpointer(//*[@role='package'])"/>
    2020
    2121  <sect2 role="installation">
    22     <title>Installation of EGLIBC</title>
     22    <title>Installation of GLIBC</title>
    2323
    2424    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    25     href="../common/eglibc.xml"
     25    href="../common/glibc.xml"
    2626    xpointer="xpointer(//*[@os='l1'])"/>
    2727
    2828    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    29     href="../common/eglibc.xml"
     29    href="../common/glibc.xml"
    3030    xpointer="xpointer(//*[@os='l2'])"/>
    3131
    3232    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    33     href="../common/eglibc.xml"
     33    href="../common/glibc.xml"
    3434    xpointer="xpointer(//*[@os='l3'])"/>
    3535
    … …  
    4040
    4141    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    42     href="eglibc.xml"
     42    href="glibc.xml"
    4343    xpointer="xpointer(//*[@os='b'])"/>
    4444
    4545    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    46     href="../common/eglibc.xml"
     46    href="../common/glibc.xml"
    4747    xpointer="xpointer(//*[@os='s1'])"/>
    4848
    4949    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    50     href="../common/eglibc.xml"
     50    href="../common/glibc.xml"
    5151    xpointer="xpointer(//*[@os='s2'])"/>
    5252
    5353    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    54     href="eglibc.xml"
     54    href="glibc.xml"
    5555    xpointer="xpointer(//*[@os='e'])"/>
    5656
    5757    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    58     href="eglibc.xml"
     58    href="glibc.xml"
    5959    xpointer="xpointer(//*[@os='f'])"/>
    6060
    61     <para os="m1">Tell EGLIBC to install its 64-bit libraries into
     61    <para os="m1">Tell GLIBC to install its 64-bit libraries into
    6262    <filename class="directory">/lib64</filename>:</para>
    6363
    … …  
    6565
    6666    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    67     href="eglibc.xml"
     67    href="glibc.xml"
    6868    xpointer="xpointer(//*[@os='g'])"/>
    6969
    7070<screen os="h"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
    71     ../eglibc-&eglibc-version;/configure --prefix=/usr \
     71    ../glibc-&glibc-version;/configure --prefix=/usr \
    7272    --disable-profile --enable-kernel=2.6.32 \
    7373    --libexecdir=/usr/lib64/glibc --libdir=/usr/lib64 \
    … …  
    8989
    9090    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    91     href="eglibc.xml"
     91    href="glibc.xml"
    9292    xpointer="xpointer(//*[@os='j'])"/>
    9393
    9494    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    95     href="eglibc.xml"
     95    href="glibc.xml"
    9696    xpointer="xpointer(//*[@os='k'])"/>
    9797
    9898    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    99     href="eglibc.xml"
     99    href="glibc.xml"
    100100    xpointer="xpointer(//*[@os='l'])"/>
    101101
    102102    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    103     href="eglibc.xml"
     103    href="glibc.xml"
    104104    xpointer="xpointer(//*[@os='m'])"/>
    105105
    106106    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    107     href="eglibc.xml"
     107    href="glibc.xml"
    108108    xpointer="xpointer(//*[@os='n'])"/>
    109109
    110110    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    111     href="eglibc.xml"
     111    href="glibc.xml"
    112112    xpointer="xpointer(//*[@os='o'])"/>
    113113
    114114    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    115     href="../common/eglibc.xml"
     115    href="../common/glibc.xml"
    116116    xpointer="xpointer(//*[@os='p'])"/>
    117117
    118118    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    119     href="eglibc.xml"
     119    href="glibc.xml"
    120120    xpointer="xpointer(//*[@os='s'])"/>
    121121
    122122    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    123     href="eglibc.xml"
     123    href="glibc.xml"
    124124    xpointer="xpointer(//*[@os='t'])"/>
     125
     126    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     127    href="../common/glibc.xml"
     128    xpointer="xpointer(//*[@os='u'])"/>
     129
     130    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     131    href="../common/glibc.xml"
     132    xpointer="xpointer(//*[@os='v'])"/>
     133
     134    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     135    href="../common/glibc.xml"
     136    xpointer="xpointer(//*[@os='w'])"/>
     137
     138    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     139    href="../common/glibc.xml"
     140    xpointer="xpointer(//*[@os='x'])"/>
    125141
    126142  </sect2>
    127143
    128144  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    129   href="../common/eglibc.xml"
    130   xpointer="xpointer(id('i18n-eglibc'))"/>
     145  href="../common/glibc.xml"
     146  xpointer="xpointer(id('i18n-glibc'))"/>
    131147
    132148  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    133   href="../common/eglibc.xml"
    134   xpointer="xpointer(id('conf-eglibc'))"/>
     149  href="../common/glibc.xml"
     150  xpointer="xpointer(id('conf-glibc'))"/>
    135151
    136152  <sect2 id="conf-ld" role="configuration">
    … …  
    177193
    178194  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    179   href="../common/eglibc.xml"
    180   xpointer="xpointer(id('contents-eglibc'))"/>
     195  href="../common/glibc.xml"
     196  xpointer="xpointer(id('contents-glibc'))"/>
    181197
    182198</sect1>
Note: See TracChangeset for help on using the changeset viewer.