Ignore:
Timestamp:
Feb 22, 2011, 4:53:14 PM (14 years ago)
Author:
Joe Ciccone <jciccone@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
1f9faab
Parents:
957d7a0 (diff), dabbced (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 'master' into systemd

Conflicts:

BOOK/boot/alpha-chapter.xml
BOOK/boot/common/bootscripts.xml
BOOK/boot/mips-chapter.xml
BOOK/boot/mips64-64-chapter.xml
BOOK/boot/mips64-chapter.xml
BOOK/boot/ppc-chapter.xml
BOOK/boot/ppc64-chapter.xml
BOOK/boot/sparc-chapter.xml
BOOK/boot/sparc64-64-chapter.xml
BOOK/boot/sparc64-chapter.xml
BOOK/boot/x86-chapter.xml
BOOK/boot/x86_64-64-chapter.xml
BOOK/boot/x86_64-chapter.xml
BOOK/bootscripts/alpha-chapter.xml
BOOK/bootscripts/mips-chapter.xml
BOOK/bootscripts/mips64-64-chapter.xml
BOOK/bootscripts/mips64-chapter.xml
BOOK/bootscripts/ppc-chapter.xml
BOOK/bootscripts/ppc64-chapter.xml
BOOK/bootscripts/sparc-chapter.xml
BOOK/bootscripts/sparc64-64-chapter.xml
BOOK/bootscripts/sparc64-chapter.xml
BOOK/bootscripts/x86-chapter.xml
BOOK/bootscripts/x86_64-64-chapter.xml
BOOK/bootscripts/x86_64-chapter.xml
BOOK/final-system/alpha-chapter.xml
BOOK/final-system/mips-chapter.xml
BOOK/final-system/mips64-64-chapter.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/coreutils.xml
BOOK/final-system/multilib/util-linux-64bit.xml
BOOK/final-system/multilib/util-linux-n32.xml
BOOK/final-system/multilib/util-linux.xml
BOOK/final-system/ppc-chapter.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc-chapter.xml
BOOK/final-system/sparc64-64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86-chapter.xml
BOOK/final-system/x86_64-64-chapter.xml
BOOK/final-system/x86_64-chapter.xml

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r957d7a0 r4317f44  
    1616  </indexterm>
    1717
    18   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     18  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    1919  href="../common/eglibc.xml"
    2020  xpointer="xpointer(//*[@role='package'])"/>
    … …  
    2323    <title>Installation of EGLIBC</title>
    2424
    25     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     25    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2626    href="../common/eglibc.xml"
    2727    xpointer="xpointer(//*[@os='z'])"/>
    2828
    29     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     29    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3030    href="../common/eglibc.xml"
    3131    xpointer="xpointer(//*[@os='l3'])"/>
    3232
    33     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     33    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3434    href="../common/eglibc.xml"
    3535    xpointer="xpointer(//*[@os='l4'])"/>
    3636
    37     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     37    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3838    href="../common/eglibc.xml"
    3939    xpointer="xpointer(//*[@os='b'])"/>
    4040
    41     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     41    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4242    href="../common/eglibc.xml"
    4343    xpointer="xpointer(//*[@os='e'])"/>
    4444
    45     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     45    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4646    href="../common/eglibc.xml"
    4747    xpointer="xpointer(//*[@os='f'])"/>
    4848
    49     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     49    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    5050    href="../common/eglibc.xml"
    5151    xpointer="xpointer(//*[@os='g'])"/>
    … …  
    5656    --libexecdir=/usr/lib/eglibc --host=${CLFS_TARGET32}</userinput></screen>
    5757
    58     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     58    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    5959    href="../common/eglibc.xml"
    6060    xpointer="xpointer(//*[@os='i'])"/>
    6161
    62     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     62    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    6363    href="../common/eglibc.xml"
    6464    xpointer="xpointer(//*[@os='j'])"/>
    6565
    66     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     66    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    6767    href="../common/eglibc.xml"
    6868    xpointer="xpointer(//*[@os='k'])"/>
    6969
    70     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     70    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    7171    href="../common/eglibc.xml"
    7272    xpointer="xpointer(//*[@os='l'])"/>
    … …  
    8282<screen os="l2"><userinput>sed -i '/cross-compiling/s@ifeq@ifneq@g' ../eglibc-&eglibc-version;/localedata/Makefile</userinput></screen>
    8383
    84     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     84    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    8585    href="../common/eglibc.xml"
    8686    xpointer="xpointer(//*[@os='m'])"/>
    8787
    88     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     88    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    8989    href="../common/eglibc.xml"
    9090    xpointer="xpointer(//*[@os='n'])"/>
    9191
    92     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     92    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    9393    href="../common/eglibc.xml"
    9494    xpointer="xpointer(//*[@os='o'])"/>
    9595
    96     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     96    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    9797    href="../common/eglibc.xml"
    9898    xpointer="xpointer(//*[@os='p'])"/>
    9999
    100     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     100    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    101101    href="../common/eglibc.xml"
    102102    xpointer="xpointer(//*[@os='q'])"/>
    103103
    104     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     104    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    105105    href="../common/eglibc.xml"
    106106    xpointer="xpointer(//*[@os='r'])"/>
    107107
    108     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     108    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    109109    href="../common/eglibc.xml"
    110110    xpointer="xpointer(//*[@os='s'])"/>
    111111
    112     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     112    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    113113    href="../common/eglibc.xml"
    114114    xpointer="xpointer(//*[@os='t'])"/>
Note: See TracChangeset for help on using the changeset viewer.