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/x86/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="../common/eglibc.xml"
     65    href="../common/glibc.xml"
    6666    xpointer="xpointer(//*[@os='g'])"/>
    6767
    6868<screen os="h"><userinput>
    6969    CFLAGS="-march=$(cut -d- -f1 &lt;&lt;&lt; $MACHTYPE) -O2" \
    70     ../eglibc-&eglibc-version;/configure --prefix=/usr \
    71     --disable-profile --enable-kernel=2.6.32 --libexecdir=/usr/lib/eglibc \
     70    ../glibc-&glibc-version;/configure --prefix=/usr \
     71    --disable-profile --enable-kernel=2.6.32 --libexecdir=/usr/lib/glibc \
    7272    --enable-obsolete-rpc</userinput></screen>
    7373
    7474    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    75     href="../common/eglibc.xml"
     75    href="../common/glibc.xml"
    7676    xpointer="xpointer(//*[@os='i'])"/>
    7777
    7878    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    79     href="../common/eglibc.xml"
     79    href="../common/glibc.xml"
    8080    xpointer="xpointer(//*[@os='j'])"/>
    8181
    8282    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    83     href="../common/eglibc.xml"
     83    href="../common/glibc.xml"
    8484    xpointer="xpointer(//*[@os='k'])"/>
    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='l'])"/>
    8989
    9090    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    91     href="../common/eglibc.xml"
     91    href="../common/glibc.xml"
    9292    xpointer="xpointer(//*[@os='m'])"/>
    9393
    9494    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    95     href="../common/eglibc.xml"
     95    href="../common/glibc.xml"
    9696    xpointer="xpointer(//*[@os='n'])"/>
    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='o'])"/>
    101101
    102102    <!-- this is specific to x86 because of the i686 reference in the math tests -->
    103103    <itemizedlist os="p">
     104      <listitem>
     105        <para>The <emphasis>nptl/tst-clock2</emphasis>,
     106        <emphasis>nptl/tst-attr3</emphasis>,
     107        <emphasis>tst/tst-cputimer1</emphasis>, and
     108        <emphasis>rt/tst-cpuclock2</emphasis>
     109        tests have been known to fail.  The
     110        reason is not completely understood, but indications are that minor
     111        timing issues can trigger these failures.</para>
     112      </listitem>
    104113      <listitem>
    105114        <para>The <emphasis>math</emphasis> tests, at least on i686, fail in
    … …  
    120129      <listitem>
    121130        <para>When running on older and slower hardware, some tests
    122         can fail because of test timeouts being exceeded.</para>
     131        can fail because of test timeouts being exceeded.
     132        Modifying the make check command to set a TIMEOUTFACTOR is reported to
     133        help eliminate these errors (e.g. <command>TIMEOUTFACTOR=16
     134        make -k check</command>).</para>
     135      </listitem>
     136      <listitem>
     137        <para>posix/tst-getaddrinfo4 will always fail due to not having a network
     138        connection when the test is run.</para>
    123139      </listitem>
    124140    </itemizedlist>
    125141
    126142    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    127     href="../common/eglibc.xml"
     143    href="../common/glibc.xml"
    128144    xpointer="xpointer(//*[@os='q'])"/>
    129145
    130146    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    131     href="../common/eglibc.xml"
     147    href="../common/glibc.xml"
    132148    xpointer="xpointer(//*[@os='r'])"/>
    133149
    134150    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    135     href="../common/eglibc.xml"
     151    href="../common/glibc.xml"
    136152    xpointer="xpointer(//*[@os='s'])"/>
    137153
    138154    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    139     href="../common/eglibc.xml"
     155    href="../common/glibc.xml"
    140156    xpointer="xpointer(//*[@os='t'])"/>
     157
     158    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     159    href="../common/glibc.xml"
     160    xpointer="xpointer(//*[@os='u'])"/>
     161
     162    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     163    href="../common/glibc.xml"
     164    xpointer="xpointer(//*[@os='v'])"/>
     165
     166    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     167    href="../common/glibc.xml"
     168    xpointer="xpointer(//*[@os='w'])"/>
     169
     170    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     171    href="../common/glibc.xml"
     172    xpointer="xpointer(//*[@os='x'])"/>
    141173
    142174  </sect2>
    143175
    144176  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    145   href="../common/eglibc.xml"
    146   xpointer="xpointer(id('i18n-eglibc'))"/>
     177  href="../common/glibc.xml"
     178  xpointer="xpointer(id('i18n-glibc'))"/>
    147179
    148180  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    149   href="../common/eglibc.xml"
    150   xpointer="xpointer(id('conf-eglibc'))"/>
     181  href="../common/glibc.xml"
     182  xpointer="xpointer(id('conf-glibc'))"/>
    151183
    152184  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    153   href="../common/eglibc.xml"
     185  href="../common/glibc.xml"
    154186  xpointer="xpointer(id('conf-ld'))"/>
    155187
    156188  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    157   href="../common/eglibc.xml"
    158   xpointer="xpointer(id('contents-eglibc'))"/>
     189  href="../common/glibc.xml"
     190  xpointer="xpointer(id('contents-glibc'))"/>
    159191
    160192</sect1>
Note: See TracChangeset for help on using the changeset viewer.