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/sparc64-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="../common/eglibc.xml"
     49    href="../common/glibc.xml"
    5050    xpointer="xpointer(//*[@os='s1'])"/>
    5151
    5252    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    53     href="../common/eglibc.xml"
     53    href="../common/glibc.xml"
    5454    xpointer="xpointer(//*[@os='s2'])"/>
    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='e'])"/>
    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='f'])"/>
    6363
    6464    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    65     href="../sparc64/eglibc-64bit.xml"
     65    href="../sparc64/glibc-64bit.xml"
    6666    xpointer="xpointer(//*[@os='t1'])"/>
    6767
    6868    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    69     href="../sparc64/eglibc-64bit.xml"
     69    href="../sparc64/glibc-64bit.xml"
    7070    xpointer="xpointer(//*[@os='t2'])"/>
    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
    8080    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    81     href="../common/eglibc.xml"
     81    href="../common/glibc.xml"
    8282    xpointer="xpointer(//*[@os='g'])"/>
    8383
    84 <screen os="h"><userinput>CC="gcc ${BUILD64}" ../eglibc-&eglibc-version;/configure --prefix=/usr \
     84<screen os="h"><userinput>CC="gcc ${BUILD64}" ../glibc-&glibc-version;/configure --prefix=/usr \
    8585    --disable-profile --enable-kernel=2.6.32 \
    86     --libexecdir=/usr/lib/eglibc --libdir=/usr/lib \
     86    --libexecdir=/usr/lib/glibc --libdir=/usr/lib \
    8787    --enable-obsolete-rpc --cache-file=config.cache</userinput></screen>
    8888
    8989    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    90     href="../x86_64-64/eglibc.xml"
     90    href="../x86_64-64/glibc.xml"
    9191    xpointer="xpointer(//*[@os='i'])"/>
    9292
    9393    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    94     href="../common/eglibc.xml"
     94    href="../common/glibc.xml"
    9595    xpointer="xpointer(//*[@os='j'])"/>
    9696
    9797    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    98     href="../common/eglibc.xml"
     98    href="../common/glibc.xml"
    9999    xpointer="xpointer(//*[@os='k'])"/>
    100100
    101101    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    102     href="../common/eglibc.xml"
     102    href="../common/glibc.xml"
    103103    xpointer="xpointer(//*[@os='l'])"/>
    104104
    105105    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    106     href="../common/eglibc.xml"
     106    href="../common/glibc.xml"
    107107    xpointer="xpointer(//*[@os='m'])"/>
    108108
    109109    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    110     href="../multilib/eglibc-64bit.xml"
     110    href="../multilib/glibc-64bit.xml"
    111111    xpointer="xpointer(//*[@os='n'])"/>
    112112
    113113    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    114     href="../multilib/eglibc-64bit.xml"
     114    href="../multilib/glibc-64bit.xml"
    115115    xpointer="xpointer(//*[@os='o'])"/>
    116116
    117117    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    118     href="../multilib/eglibc-64bit.xml"
     118    href="../multilib/glibc-64bit.xml"
    119119    xpointer="xpointer(//*[@os='p'])"/>
    120120
    121121    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    122     href="../common/eglibc.xml"
     122    href="../common/glibc.xml"
    123123    xpointer="xpointer(//*[@os='q'])"/>
    124124
    125125    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    126     href="../common/eglibc.xml"
     126    href="../common/glibc.xml"
    127127    xpointer="xpointer(//*[@os='r'])"/>
    128128
    129129    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    130     href="../common/eglibc.xml"
     130    href="../common/glibc.xml"
    131131    xpointer="xpointer(//*[@os='s'])"/>
    132132
    133133    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    134     href="../common/eglibc.xml"
     134    href="../common/glibc.xml"
    135135    xpointer="xpointer(//*[@os='t'])"/>
    136136
    137137    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    138     href="../x86_64-64/eglibc.xml"
     138    href="../common/glibc.xml"
    139139    xpointer="xpointer(//*[@os='u'])"/>
    140140
    141141    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    142     href="../x86_64-64/eglibc.xml"
     142    href="../common/glibc.xml"
    143143    xpointer="xpointer(//*[@os='v'])"/>
     144
     145    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     146    href="../common/glibc.xml"
     147    xpointer="xpointer(//*[@os='w'])"/>
     148
     149    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     150    href="../common/glibc.xml"
     151    xpointer="xpointer(//*[@os='x'])"/>
    144152
    145153  </sect2>
    146154
    147155  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    148   href="../common/eglibc.xml"
    149   xpointer="xpointer(id('i18n-eglibc'))"/>
     156  href="../common/glibc.xml"
     157  xpointer="xpointer(id('i18n-glibc'))"/>
    150158
    151159  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    152   href="../common/eglibc.xml"
    153   xpointer="xpointer(id('conf-eglibc'))"/>
     160  href="../common/glibc.xml"
     161  xpointer="xpointer(id('conf-glibc'))"/>
    154162
    155163  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    156   href="../common/eglibc.xml"
     164  href="../common/glibc.xml"
    157165  xpointer="xpointer(id('conf-ld'))"/>
    158166
    159167  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    160   href="../common/eglibc.xml"
    161   xpointer="xpointer(id('contents-eglibc'))"/>
     168  href="../common/glibc.xml"
     169  xpointer="xpointer(id('contents-glibc'))"/>
    162170
    163171</sect1>
Note: See TracChangeset for help on using the changeset viewer.