Ticket #1111: glibc-updates.patch

File glibc-updates.patch, 23.0 KB (added by chris@…, 8 years ago)

  • BOOK/final-system/common/glibc.xml 

    diff --git a/BOOK/final-system/common/glibc.xml b/BOOK/final-system/common/glibc.xml
index 2379f12..2ce24be 100644
    a b  
    2727  <sect2 role="installation">
    2828    <title>Installation of Glibc</title>
    2929
    30     <note os="z">
    31       <para>Some packages outside of CLFS suggest installing GNU libiconv in
    32       order to translate data from one encoding to another. The project's
    33       home page (<ulink url="http://www.gnu.org/software/libiconv/"/>) says
    34       <quote>This library provides an <function>iconv()</function>
    35       implementation, for use on systems which don't have one, or whose
    36       implementation cannot convert from/to Unicode.</quote> Glibc provides
    37       an <function>iconv()</function> implementation and can convert from/to
    38       Unicode, therefore libiconv is not required on a CLFS system.</para>
     30    <note os="b">
     31      <para>The Glibc build system is self-contained and will install
     32      perfectly, even though the compiler specs file and linker are still
     33      pointing at <filename class="directory">/tools</filename>. The specs
     34      and linker cannot be adjusted before the Glibc install because the
     35      Glibc Autoconf tests would give false results and defeat the goal
     36      of achieving a clean build.</para>
    3937    </note>
    4038
    4139    <para os="l1">At the end of the installation, the build system will run
    … … sed -i "s|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=${LINKER} -o|" \ 
    5351  scripts/test-installation.pl
    5452unset LINKER</userinput></screen>
    5553
    56     <para os="b">The Glibc build system is self-contained and will install
    57     perfectly, even though the compiler specs file and linker are still
    58     pointing at <filename class="directory">/tools</filename>. The specs
    59     and linker cannot be adjusted before the Glibc install because the
    60     Glibc Autoconf tests would give false results and defeat the goal
    61     of achieving a clean build.</para>
    62 
    6354    <para os="e">The Glibc documentation recommends building Glibc outside of     the source directory in a dedicated build directory:</para>
    6455
    6556<screen os="f"><userinput>mkdir -v ../glibc-build
    … … cd ../glibc-build</userinput></screen> 
    162153<screen os="t"><userinput>make install &amp;&amp;
    163154rm -v /usr/include/rpcsvc/*.x</userinput></screen>
    164155
    165     <para os="u">Install the configuration file and runtime directory for
     156    <para os="u">Install the configuration file, runtime directory, and systemd support files for
    166157    <command>nscd</command>:</para>
    167158
    168159<screen os="v"><userinput>cp -v ../glibc-&glibc-version;/nscd/nscd.conf /etc/nscd.conf
    169 mkdir -pv /var/cache/nscd</userinput></screen>
    170 
    171     <para os="w">Install the systemd support files for <command>nscd</command>:</para>
    172 
    173 <screen os="x"><userinput>install -v -Dm644 ../glibc-&glibc-version;/nscd/nscd.tmpfiles /usr/lib/tmpfiles.d/nscd.conf
     160mkdir -pv /var/cache/nscd
     161install -v -Dm644 ../glibc-&glibc-version;/nscd/nscd.tmpfiles /usr/lib/tmpfiles.d/nscd.conf
    174162install -v -Dm644 ../glibc-&glibc-version;/nscd/nscd.service /lib/systemd/system/nscd.service</userinput></screen>
    175163
    176164  </sect2>
    … … install -v -Dm644 ../glibc-&glibc-version;/nscd/nscd.service /lib/systemd/system 
    178166  <sect2 id="i18n-glibc" role="configuration">
    179167    <title>Internationalization</title>
    180168
    181     <para>The locales that can make the system respond in a different
    182     language were not installed by the above command. Install them
    183     with:</para>
     169    <indexterm zone="i18n-glibc">
     170      <primary sortas="e-/etc/localtime">/etc/localtime</primary>
     171    </indexterm>
     172
     173    <para>Use the following command to install the locales that can make the
     174    system respond in a different language:</para>
    184175
    185176<screen><userinput>make localedata/install-locales</userinput></screen>
    186177
    … … localedef -i ja_JP -f EUC-JP ja_JP</userinput></screen> 
    226217    circumvent these restrictions are documented in internationalization-related
    227218    hints.</para>
    228219
    229   </sect2>
    230 
    231   <sect2 id="conf-glibc" role="configuration">
    232     <title>Configuring Glibc</title>
    233 
    234     <indexterm zone="conf-glibc">
    235       <primary sortas="e-/etc/nsswitch.conf">/etc/nsswitch.conf</primary>
    236     </indexterm>
    237 
    238     <indexterm zone="conf-glibc">
    239       <primary sortas="e-/etc/localtime">/etc/localtime</primary>
    240     </indexterm>
    241 
    242     <para>The <filename>/etc/nsswitch.conf</filename> file needs to be created
    243     because, although Glibc provides defaults when this file is missing or
    244     corrupt, the Glibc defaults do not work well in a networked environment.
    245     The time zone also needs to be configured.</para>
    246 
    247     <para>Create a new file <filename>/etc/nsswitch.conf</filename> by running
    248     the following:</para>
    249 
    250 <screen><userinput>cat &gt; /etc/nsswitch.conf &lt;&lt; "EOF"
    251 <literal># Begin /etc/nsswitch.conf
    252 
    253 passwd: files
    254 group: files
    255 shadow: files
    256 
    257 hosts: files dns
    258 networks: files
    259 
    260 protocols: files
    261 services: files
    262 ethers: files
    263 rpc: files
    264 
    265 # End /etc/nsswitch.conf</literal>
    266 EOF</userinput></screen>
    267 
    268     <para>Install timezone data:</para>
     220    <para>Next, install timezone data:</para>
    269221<screen><userinput>tar -xf ../tzdata&tzdata-version;.tar.gz
    270222
    271223ZONEINFO=/usr/share/zoneinfo
    … … unset ZONEINFO</userinput></screen> 
    338290
    339291  </sect2>
    340292
     293  <sect2 id="conf-glibc" role="configuration">
     294    <title>Configuring Glibc</title>
     295
     296    <indexterm zone="conf-glibc">
     297      <primary sortas="e-/etc/nsswitch.conf">/etc/nsswitch.conf</primary>
     298    </indexterm>
     299
     300    <para>The <filename>/etc/nsswitch.conf</filename> file needs to be created
     301    because, although Glibc provides defaults when this file is missing or
     302    corrupt, the Glibc defaults do not work well in a networked environment.
     303    The time zone also needs to be configured.</para>
     304
     305    <para>Create a new file <filename>/etc/nsswitch.conf</filename> by running
     306    the following:</para>
     307
     308<screen><userinput>cat &gt; /etc/nsswitch.conf &lt;&lt; "EOF"
     309<literal># Begin /etc/nsswitch.conf
     310
     311passwd: files
     312group: files
     313shadow: files
     314
     315hosts: files dns
     316networks: files
     317
     318protocols: files
     319services: files
     320ethers: files
     321rpc: files
     322
     323# End /etc/nsswitch.conf</literal>
     324EOF</userinput></screen>
     325
     326  </sect2>
     327
    341328  <sect2 id="conf-ld" role="configuration">
    342329    <title>Configuring The Dynamic Loader</title>
    343330

  • BOOK/final-system/mips64-64/glibc.xml 

    diff --git a/BOOK/final-system/mips64-64/glibc.xml b/BOOK/final-system/mips64-64/glibc.xml
index aa7de88..d9b1ce8 100644
    a b  
    2323
    2424    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2525    href="../common/glibc.xml"
    26     xpointer="xpointer(//*[@os='z'])"/>
     26    xpointer="xpointer(//*[@os='b'])"/>
    2727
    2828    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2929    href="../common/glibc.xml"
    … …  
    4343
    4444    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4545    href="../common/glibc.xml"
    46     xpointer="xpointer(//*[@os='b'])"/>
    47 
    48     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    49     href="../common/glibc.xml"
    5046    xpointer="xpointer(//*[@os='e'])"/>
    5147
    5248    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    131127    href="../common/glibc.xml"
    132128    xpointer="xpointer(//*[@os='v'])"/>
    133129
    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'])"/>
    141 
    142130  </sect2>
    143131
    144132  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    diff --git a/BOOK/final-system/mips64/glibc-64bit.xml b/BOOK/final-system/mips64/glibc-64bit.xml
index 56bd1c9..a1be1d1 100644
    a b  
    2222    <title>Installation of Glibc</title>
    2323
    2424    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     25    href="../multilib/glibc.xml"
     26    xpointer="xpointer(//*[@os='b'])"/>
     27
     28    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2529    href="../common/glibc.xml"
    2630    xpointer="xpointer(//*[@os='l1'])"/>
    2731
    … …  
    3135
    3236    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3337    href="../multilib/glibc.xml"
    34     xpointer="xpointer(//*[@os='b'])"/>
    35 
    36     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    37     href="../multilib/glibc.xml"
    3838    xpointer="xpointer(//*[@os='e'])"/>
    3939
    4040    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    105105    href="../common/glibc.xml"
    106106    xpointer="xpointer(//*[@os='v'])"/>
    107107
    108     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    109     href="../common/glibc.xml"
    110     xpointer="xpointer(//*[@os='w'])"/>
    111 
    112     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    113     href="../common/glibc.xml"
    114     xpointer="xpointer(//*[@os='x'])"/>
    115 
    116108  </sect2>
    117109
    118110  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/final-system/mips64/glibc-n32.xml 

    diff --git a/BOOK/final-system/mips64/glibc-n32.xml b/BOOK/final-system/mips64/glibc-n32.xml
index 59b8d72..347a981 100644
    a b  
    2222    <title>Installation of Glibc</title>
    2323
    2424    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     25    href="../multilib/glibc.xml"
     26    xpointer="xpointer(//*[@os='b'])"/>
     27
     28    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2529    href="../common/glibc.xml"
    2630    xpointer="xpointer(//*[@os='l1'])"/>
    2731
    … … unset LINKER</userinput></screen> 
    3236
    3337    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3438    href="../multilib/glibc.xml"
    35     xpointer="xpointer(//*[@os='b'])"/>
    36 
    37     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    38     href="../multilib/glibc.xml"
    3939    xpointer="xpointer(//*[@os='e'])"/>
    4040
    4141    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    diff --git a/BOOK/final-system/multilib/glibc-64bit.xml b/BOOK/final-system/multilib/glibc-64bit.xml
index 0b56766..64a4c18 100644
    a b  
    2222    <title>Installation of Glibc</title>
    2323
    2424    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     25    href="glibc.xml"
     26    xpointer="xpointer(//*[@os='b'])"/>
     27
     28    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2529    href="../common/glibc.xml"
    2630    xpointer="xpointer(//*[@os='l1'])"/>
    2731
    … … unset LINKER</userinput></screen> 
    3236
    3337    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3438    href="glibc.xml"
    35     xpointer="xpointer(//*[@os='b'])"/>
    36 
    37     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    38     href="glibc.xml"
    3939    xpointer="xpointer(//*[@os='e'])"/>
    4040
    4141    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … … unset LINKER</userinput></screen> 
    118118    href="../common/glibc.xml"
    119119    xpointer="xpointer(//*[@os='v'])"/>
    120120
    121     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    122     href="../common/glibc.xml"
    123     xpointer="xpointer(//*[@os='w'])"/>
    124 
    125     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    126     href="../common/glibc.xml"
    127     xpointer="xpointer(//*[@os='x'])"/>
    128 
    129121  </sect2>
    130122
    131123  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    diff --git a/BOOK/final-system/multilib/glibc.xml b/BOOK/final-system/multilib/glibc.xml
index 3ecc0ad..7eb2b2e 100644
    a b  
    2424
    2525    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2626    href="../common/glibc.xml"
    27     xpointer="xpointer(//*[@os='z'])"/>
     27    xpointer="xpointer(//*[@os='b'])"/>
    2828
    2929    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3030    href="../common/glibc.xml"
    … …  
    3636
    3737    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3838    href="../common/glibc.xml"
    39     xpointer="xpointer(//*[@os='b'])"/>
    40 
    41     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    42     href="../common/glibc.xml"
    4339    xpointer="xpointer(//*[@os='e'])"/>
    4440
    4541    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/final-system/ppc/glibc.xml 

    diff --git a/BOOK/final-system/ppc/glibc.xml b/BOOK/final-system/ppc/glibc.xml
index a9463f5..1107e8f 100644
    a b  
    2323
    2424    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2525    href="../common/glibc.xml"
    26     xpointer="xpointer(//*[@os='z'])"/>
     26    xpointer="xpointer(//*[@os='b'])"/>
    2727
    2828    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2929    href="../common/glibc.xml"
    … …  
    3535
    3636    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3737    href="../common/glibc.xml"
    38     xpointer="xpointer(//*[@os='b'])"/>
    39 
    40     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    41     href="../common/glibc.xml"
    4238    xpointer="xpointer(//*[@os='e'])"/>
    4339
    4440    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    109105    href="../common/glibc.xml"
    110106    xpointer="xpointer(//*[@os='v'])"/>
    111107
    112     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    113     href="../common/glibc.xml"
    114     xpointer="xpointer(//*[@os='w'])"/>
    115 
    116     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    117     href="../common/glibc.xml"
    118     xpointer="xpointer(//*[@os='x'])"/>
    119 
    120108  </sect2>
    121109
    122110  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/final-system/ppc64-64/glibc.xml 

    diff --git a/BOOK/final-system/ppc64-64/glibc.xml b/BOOK/final-system/ppc64-64/glibc.xml
index 26db7eb..d144be0 100644
    a b  
    2323
    2424    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2525    href="../common/glibc.xml"
    26     xpointer="xpointer(//*[@os='z'])"/>
     26    xpointer="xpointer(//*[@os='b'])"/>
    2727
    2828    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2929    href="../common/glibc.xml"
    … …  
    4343
    4444    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4545    href="../common/glibc.xml"
    46     xpointer="xpointer(//*[@os='b'])"/>
    47 
    48     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    49     href="../common/glibc.xml"
    5046    xpointer="xpointer(//*[@os='e'])"/>
    5147
    5248    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    141137    href="../common/glibc.xml"
    142138    xpointer="xpointer(//*[@os='v'])"/>
    143139
    144     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    145     href="../common/glibc.xml"
    146     xpointer="xpointer(//*[@os='w'])"/>
    147 
    148     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    149     href="../common/glibc.xml"
    150     xpointer="xpointer(//*[@os='x'])"/>
    151 
    152140  </sect2>
    153141
    154142  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    diff --git a/BOOK/final-system/ppc64/glibc-64bit.xml b/BOOK/final-system/ppc64/glibc-64bit.xml
index 9112f73..cd9f85a 100644
    a b  
    2222    <title>Installation of Glibc</title>
    2323
    2424    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     25    href="glibc.xml"
     26    xpointer="xpointer(//*[@os='b'])"/>
     27
     28    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2529    href="../common/glibc.xml"
    2630    xpointer="xpointer(//*[@os='l1'])"/>
    2731
    … …  
    3135
    3236    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3337    href="glibc.xml"
    34     xpointer="xpointer(//*[@os='b'])"/>
    35 
    36     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    37     href="glibc.xml"
    3838    xpointer="xpointer(//*[@os='e'])"/>
    3939
    4040    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    107107    href="../common/glibc.xml"
    108108    xpointer="xpointer(//*[@os='v'])"/>
    109109
    110     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    111     href="../common/glibc.xml"
    112     xpointer="xpointer(//*[@os='w'])"/>
    113 
    114     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    115     href="../common/glibc.xml"
    116     xpointer="xpointer(//*[@os='x'])"/>
    117 
    118110  </sect2>
    119111
    120112  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/final-system/ppc64/glibc.xml 

    diff --git a/BOOK/final-system/ppc64/glibc.xml b/BOOK/final-system/ppc64/glibc.xml
index 347df4f..d95a538 100644
    a b  
    2424
    2525    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2626    href="../common/glibc.xml"
    27     xpointer="xpointer(//*[@os='z'])"/>
     27    xpointer="xpointer(//*[@os='b'])"/>
    2828
    2929    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3030    href="../common/glibc.xml"
    … …  
    3434    href="../common/glibc.xml"
    3535    xpointer="xpointer(//*[@os='l2'])"/>
    3636
    37     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    38     href="../common/glibc.xml"
    39     xpointer="xpointer(//*[@os='b'])"/>
    40 
    4137    <para os="u1">The powerpc (32) architecture is expected to fail the
    4238    check-textrel tests because it cannot protect some elf segments in
    4339    shared libraries from being executable and writable. Using the default

  • BOOK/final-system/sparc64-64/glibc.xml 

    diff --git a/BOOK/final-system/sparc64-64/glibc.xml b/BOOK/final-system/sparc64-64/glibc.xml
index ffddb10..1ce9a78 100644
    a b  
    2323
    2424    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2525    href="../common/glibc.xml"
    26     xpointer="xpointer(//*[@os='z'])"/>
     26    xpointer="xpointer(//*[@os='b'])"/>
    2727
    2828    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2929    href="../common/glibc.xml"
    … …  
    4343
    4444    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4545    href="../common/glibc.xml"
    46     xpointer="xpointer(//*[@os='b'])"/>
    47 
    48     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    49     href="../common/glibc.xml"
    5046    xpointer="xpointer(//*[@os='e'])"/>
    5147
    5248    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    138134    href="../common/glibc.xml"
    139135    xpointer="xpointer(//*[@os='v'])"/>
    140136
    141     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    142     href="../common/glibc.xml"
    143     xpointer="xpointer(//*[@os='w'])"/>
    144 
    145     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    146     href="../common/glibc.xml"
    147     xpointer="xpointer(//*[@os='x'])"/>
    148 
    149137  </sect2>
    150138
    151139  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    diff --git a/BOOK/final-system/sparc64/glibc-64bit.xml b/BOOK/final-system/sparc64/glibc-64bit.xml
index 728f723..4f0619c 100644
    a b  
    2323
    2424    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2525    href="../common/glibc.xml"
     26    xpointer="xpointer(//*[@os='b'])"/>
     27
     28    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     29    href="../common/glibc.xml"
    2630    xpointer="xpointer(//*[@os='l1'])"/>
    2731
    2832    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    3135
    3236    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3337    href="../common/glibc.xml"
    34     xpointer="xpointer(//*[@os='b'])"/>
    35 
    36     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    37     href="../common/glibc.xml"
    3838    xpointer="xpointer(//*[@os='e'])"/>
    3939
    4040    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    115115    href="../common/glibc.xml"
    116116    xpointer="xpointer(//*[@os='v'])"/>
    117117
    118     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    119     href="../common/glibc.xml"
    120     xpointer="xpointer(//*[@os='w'])"/>
    121 
    122     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    123     href="../common/glibc.xml"
    124     xpointer="xpointer(//*[@os='x'])"/>
    125 
    126118  </sect2>
    127119
    128120  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/final-system/x86/glibc.xml 

    diff --git a/BOOK/final-system/x86/glibc.xml b/BOOK/final-system/x86/glibc.xml
index f32d3c8..e652f26 100644
    a b  
    2323
    2424    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2525    href="../common/glibc.xml"
    26     xpointer="xpointer(//*[@os='z'])"/>
     26    xpointer="xpointer(//*[@os='b'])"/>
    2727
    2828    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2929    href="../common/glibc.xml"
    … …  
    3535
    3636    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3737    href="../common/glibc.xml"
    38     xpointer="xpointer(//*[@os='b'])"/>
    39 
    40     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    41     href="../common/glibc.xml"
    4238    xpointer="xpointer(//*[@os='e'])"/>
    4339
    4440    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    147143    href="../common/glibc.xml"
    148144    xpointer="xpointer(//*[@os='v'])"/>
    149145
    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'])"/>
    157 
    158146  </sect2>
    159147
    160148  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

  • BOOK/final-system/x86_64-64/glibc.xml 

    diff --git a/BOOK/final-system/x86_64-64/glibc.xml b/BOOK/final-system/x86_64-64/glibc.xml
index 593ef0e..a832d69 100644
    a b  
    2323
    2424    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2525    href="../common/glibc.xml"
    26     xpointer="xpointer(//*[@os='z'])"/>
     26    xpointer="xpointer(//*[@os='b'])"/>
    2727
    2828    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2929    href="../common/glibc.xml"
    … …  
    4242
    4343    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4444    href="../common/glibc.xml"
    45     xpointer="xpointer(//*[@os='b'])"/>
    46 
    47     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    48     href="../common/glibc.xml"
    4945    xpointer="xpointer(//*[@os='e'])"/>
    5046
    5147    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    125121    href="../common/glibc.xml"
    126122    xpointer="xpointer(//*[@os='v'])"/>
    127123
    128     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    129     href="../common/glibc.xml"
    130     xpointer="xpointer(//*[@os='w'])"/>
    131 
    132     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    133     href="../common/glibc.xml"
    134     xpointer="xpointer(//*[@os='x'])"/>
    135 
    136124  </sect2>
    137125
    138126  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    diff --git a/BOOK/final-system/x86_64/glibc-64bit.xml b/BOOK/final-system/x86_64/glibc-64bit.xml
index be1db44..2ad7328 100644
    a b  
    2222    <title>Installation of Glibc</title>
    2323
    2424    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     25    href="../multilib/glibc.xml"
     26    xpointer="xpointer(//*[@os='b'])"/>
     27
     28    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2529    href="../common/glibc.xml"
    2630    xpointer="xpointer(//*[@os='l1'])"/>
    2731
    … …  
    3135
    3236    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3337    href="../multilib/glibc.xml"
    34     xpointer="xpointer(//*[@os='b'])"/>
    35 
    36     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    37     href="../multilib/glibc.xml"
    3838    xpointer="xpointer(//*[@os='e'])"/>
    3939
    4040    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    110110    href="../common/glibc.xml"
    111111    xpointer="xpointer(//*[@os='v'])"/>
    112112
    113     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    114     href="../common/glibc.xml"
    115     xpointer="xpointer(//*[@os='w'])"/>
    116 
    117     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    118     href="../common/glibc.xml"
    119     xpointer="xpointer(//*[@os='x'])"/>
    120 
    121113  </sect2>
    122114
    123115  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"