Ignore:
Timestamp:
Apr 20, 2014, 8:57:39 AM (11 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/mips64-64/glibc.xml

    r88ef769 r03e6a40  
    66]>
    77
    8 <sect1 id="ch-system-eglibc" role="wrap">
    9   <?dbhtml filename="eglibc.html"?>
     8<sect1 id="ch-system-glibc" role="wrap">
     9  <?dbhtml filename="glibc.html"?>
    1010
    11   <title>EGLIBC-&eglibc-version;</title>
     11  <title>GLIBC-&glibc-version;</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="../common/eglibc.xml"
     18  href="../common/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='z'])"/>
    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='l1'])"/>
    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='l2'])"/>
    3535
    3636    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    37     href="../common/eglibc.xml"
     37    href="../common/glibc.xml"
    3838    xpointer="xpointer(//*[@os='l3'])"/>
    3939
    4040    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    41     href="../common/eglibc.xml"
     41    href="../common/glibc.xml"
    4242    xpointer="xpointer(//*[@os='l4'])"/>
    4343
    4444    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    45     href="../common/eglibc.xml"
     45    href="../common/glibc.xml"
    4646    xpointer="xpointer(//*[@os='b'])"/>
    4747
    4848    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    49     href="../mips64/eglibc-64bit.xml"
     49    href="../mips64/glibc-64bit.xml"
    5050    xpointer="xpointer(//*[@os='m3'])"/>
    5151
    5252    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    53     href="../mips64/eglibc-64bit.xml"
     53    href="../mips64/glibc-64bit.xml"
    5454    xpointer="xpointer(//*[@os='m4'])"/>
    5555
    5656    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    57     href="../common/eglibc.xml"
     57    href="../common/glibc.xml"
    5858    xpointer="xpointer(//*[@os='s1'])"/>
    5959
    6060    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    61     href="../common/eglibc.xml"
     61    href="../common/glibc.xml"
    6262    xpointer="xpointer(//*[@os='s2'])"/>
    6363
    6464    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    65     href="../common/eglibc.xml"
     65    href="../common/glibc.xml"
    6666    xpointer="xpointer(//*[@os='e'])"/>
    6767
    6868    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    69     href="../common/eglibc.xml"
     69    href="../common/glibc.xml"
    7070    xpointer="xpointer(//*[@os='f'])"/>
    7171
    7272    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    73     href="../x86_64-64/eglibc.xml"
     73    href="../x86_64-64/glibc.xml"
    7474    xpointer="xpointer(//*[@os='l5'])"/>
    7575
    7676    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    77     href="../x86_64-64/eglibc.xml"
     77    href="../x86_64-64/glibc.xml"
    7878    xpointer="xpointer(//*[@os='l6'])"/>
    7979
    80     <para>Now we will force EGLIBC to build as 64-bit instead of the default
     80    <para>Now we will force GLIBC to build as 64-bit instead of the default
    8181    n32 with the following sed:</para>
    8282
    … …  
    8585
    8686    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    87     href="../common/eglibc.xml"
     87    href="../common/glibc.xml"
    8888    xpointer="xpointer(//*[@os='g'])"/>
    8989
    9090    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    91     href="../x86_64-64/eglibc.xml"
     91    href="../x86_64-64/glibc.xml"
    9292    xpointer="xpointer(//*[@os='h'])"/>
    9393
    9494    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    95     href="../x86_64-64/eglibc.xml"
     95    href="../x86_64-64/glibc.xml"
    9696    xpointer="xpointer(//*[@os='i'])"/>
    9797
    9898    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    99     href="../common/eglibc.xml"
     99    href="../common/glibc.xml"
    100100    xpointer="xpointer(//*[@os='j'])"/>
    101101
    102102    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    103     href="../common/eglibc.xml"
     103    href="../common/glibc.xml"
    104104    xpointer="xpointer(//*[@os='k'])"/>
    105105
    106106    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    107     href="../common/eglibc.xml"
     107    href="../common/glibc.xml"
    108108    xpointer="xpointer(//*[@os='l'])"/>
    109109
    110110    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    111     href="../common/eglibc.xml"
     111    href="../common/glibc.xml"
    112112    xpointer="xpointer(//*[@os='m'])"/>
    113113
    114114    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    115     href="../multilib/eglibc-64bit.xml"
     115    href="../multilib/glibc-64bit.xml"
    116116    xpointer="xpointer(//*[@os='n'])"/>
    117117
    118118    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    119     href="../multilib/eglibc-64bit.xml"
     119    href="../multilib/glibc-64bit.xml"
    120120    xpointer="xpointer(//*[@os='o'])"/>
    121121
    122122    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    123     href="../multilib/eglibc-64bit.xml"
     123    href="../multilib/glibc-64bit.xml"
    124124    xpointer="xpointer(//*[@os='p'])"/>
    125125
    126126    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    127     href="../common/eglibc.xml"
     127    href="../common/glibc.xml"
    128128    xpointer="xpointer(//*[@os='q'])"/>
    129129
    130130    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    131     href="../common/eglibc.xml"
     131    href="../common/glibc.xml"
    132132    xpointer="xpointer(//*[@os='r'])"/>
    133133
    134134    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    135     href="../common/eglibc.xml"
     135    href="../common/glibc.xml"
    136136    xpointer="xpointer(//*[@os='s'])"/>
    137137
    138138    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    139     href="../common/eglibc.xml"
     139    href="../common/glibc.xml"
    140140    xpointer="xpointer(//*[@os='t'])"/>
    141141
    142142    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    143     href="../x86_64-64/eglibc.xml"
     143    href="../common/glibc.xml"
    144144    xpointer="xpointer(//*[@os='u'])"/>
    145145
    146146    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    147     href="../x86_64-64/eglibc.xml"
     147    href="../common/glibc.xml"
    148148    xpointer="xpointer(//*[@os='v'])"/>
     149
     150    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     151    href="../common/glibc.xml"
     152    xpointer="xpointer(//*[@os='w'])"/>
     153
     154    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     155    href="../common/glibc.xml"
     156    xpointer="xpointer(//*[@os='x'])"/>
    149157
    150158  </sect2>
    151159
    152160  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    153   href="../common/eglibc.xml"
    154   xpointer="xpointer(id('i18n-eglibc'))"/>
     161  href="../common/glibc.xml"
     162  xpointer="xpointer(id('i18n-glibc'))"/>
    155163
    156164  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    157   href="../common/eglibc.xml"
    158   xpointer="xpointer(id('conf-eglibc'))"/>
     165  href="../common/glibc.xml"
     166  xpointer="xpointer(id('conf-glibc'))"/>
    159167
    160168  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    161   href="../mips/eglibc.xml"
     169  href="../mips/glibc.xml"
    162170  xpointer="xpointer(id('conf-ld'))"/>
    163171
    164172  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    165   href="../common/eglibc.xml"
    166   xpointer="xpointer(id('contents-eglibc'))"/>
     173  href="../common/glibc.xml"
     174  xpointer="xpointer(id('contents-glibc'))"/>
    167175
    168176</sect1>
Note: See TracChangeset for help on using the changeset viewer.