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_64-64/glibc.xml

    r88ef769 r03e6a40  
    66]>
    77
    8 <sect1 id="ch-system-eglibc" role="wrap">
    9   <?dbhtml filename="eglibc.html"?>
    10 
    11   <title>EGLIBC-&eglibc-version;</title>
    12 
    13   <indexterm zone="ch-system-eglibc">
    14     <primary sortas="a-EGLIBC">EGLIBC</primary>
     8<sect1 id="ch-system-glibc" role="wrap">
     9  <?dbhtml filename="glibc.html"?>
     10
     11  <title>GLIBC-&glibc-version;</title>
     12
     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>
    23 
    24     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    25     href="../common/eglibc.xml"
     22    <title>Installation of GLIBC</title>
     23
     24    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     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
    64     <para os="l5">Tell EGLIBC to install its libraries into
     64    <para os="l5">Tell GLIBC to install its libraries into
    6565    <filename class="directory">/lib</filename>:</para>
    6666
    … …  
    6868
    6969    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    70     href="../common/eglibc.xml"
     70    href="../common/glibc.xml"
    7171    xpointer="xpointer(//*[@os='g'])"/>
    7272
    7373<screen os="h"><userinput>CFLAGS="-O2" \
    74     ../eglibc-&eglibc-version;/configure --prefix=/usr \
     74    ../glibc-&glibc-version;/configure --prefix=/usr \
    7575    --disable-profile --enable-kernel=2.6.32 \
    76     --libexecdir=/usr/lib/eglibc --libdir=/usr/lib \
     76    --libexecdir=/usr/lib/glibc --libdir=/usr/lib \
    7777    --enable-obsolete-rpc</userinput></screen>
    7878
    … …  
    8181
    8282      <varlistentry>
    83         <term><parameter>--libexecdir=/usr/lib/eglibc</parameter></term>
     83        <term><parameter>--libexecdir=/usr/lib/glibc</parameter></term>
    8484        <listitem>
    8585          <para>This changes the location of the <command>getconf</command>
    8686          utility from its default of <filename
    8787          class="directory">/usr/libexec</filename> to <filename
    88           class="directory">/usr/lib/eglibc</filename>.</para>
     88          class="directory">/usr/lib/glibc</filename>.</para>
    8989        </listitem>
    9090      </varlistentry>
    … …  
    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
    … …  
    133133    creating a symlink to the real loader.</para>
    134134
    135     <screen><userinput>ln -sv &eglibc-ld-name; /lib/ld-linux.so.2</userinput></screen>
    136 
    137     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    138     href="../common/eglibc.xml"
     135    <screen><userinput>ln -sv &glibc-ld-name; /lib/ld-linux.so.2</userinput></screen>
     136
     137    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     138    href="../common/glibc.xml"
    139139    xpointer="xpointer(//*[@os='s'])"/>
    140140
    141141    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    142     href="../common/eglibc.xml"
     142    href="../common/glibc.xml"
    143143    xpointer="xpointer(//*[@os='t'])"/>
    144144
    … …  
    149149
    150150    <screen><userinput>rm -v /lib/ld-linux.so.2
    151 cp -v /usr/bin/ldd{,.bak}
    152 sed '/RTLDLIST/s%/ld-linux.so.2 /lib64%%' /usr/bin/ldd.bak >/usr/bin/ldd</userinput></screen>
     151sed -i.bak '/RTLDLIST/s%/ld-linux.so.2 /lib64%%' /usr/bin/ldd</userinput></screen>
    153152
    154153    <para>Check the script to make sure the sed worked correctly, then delete
    … …  
    157156    <screen><userinput>rm -v /usr/bin/ldd.bak</userinput></screen>
    158157
    159  <para os="u">The stubs.h header installed by EGLIBC looks for stubs-32.h
    160     and stubs-64.h. This configuration of EGLIBC only generates stubs-64.h. Fix
    161     this with the following:</para>
    162 
    163     <screen os="v"><userinput>mv -v /usr/include/gnu/stubs{-64,}.h</userinput></screen>
     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'])"/>
    164173
    165174  </sect2>
    166175
    167176  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    168   href="../common/eglibc.xml"
    169   xpointer="xpointer(id('i18n-eglibc'))"/>
    170 
    171   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    172   href="../common/eglibc.xml"
    173   xpointer="xpointer(id('conf-eglibc'))"/>
     177  href="../common/glibc.xml"
     178  xpointer="xpointer(id('i18n-glibc'))"/>
     179
     180  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     181  href="../common/glibc.xml"
     182  xpointer="xpointer(id('conf-glibc'))"/>
    174183
    175184  <sect2 id="conf-ld" role="configuration">
    … …  
    195204
    196205    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    197     href="../common/eglibc.xml"
     206    href="../common/glibc.xml"
    198207    xpointer="xpointer(//*[@os='ld-b'])"/>
    199208
    200209    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    201     href="../common/eglibc.xml"
     210    href="../common/glibc.xml"
    202211    xpointer="xpointer(//*[@os='ld-c'])"/>
    203212
    … …  
    205214
    206215  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    207   href="../common/eglibc.xml"
    208   xpointer="xpointer(id('contents-eglibc'))"/>
     216  href="../common/glibc.xml"
     217  xpointer="xpointer(id('contents-glibc'))"/>
    209218
    210219</sect1>
Note: See TracChangeset for help on using the changeset viewer.