Ignore:
Timestamp:
Feb 23, 2011, 12:53:14 AM (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/ppc64/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'])"/>
    … …  
    5555<screen os="u4"><userinput>sed -i "s/\(^check-textrel-CFLAGS = \)/\1 ${BUILD32} /" elf/Makefile</userinput></screen>
    5656
    57     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     57    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    5858    href="../common/eglibc.xml"
    5959    xpointer="xpointer(//*[@os='e'])"/>
    6060
    61     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     61    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    6262    href="../common/eglibc.xml"
    6363    xpointer="xpointer(//*[@os='f'])"/>
    6464
    65     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     65    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    6666    href="../common/eglibc.xml"
    6767    xpointer="xpointer(//*[@os='g'])"/>
    … …  
    7272    --libexecdir=/usr/lib/eglibc --host=${CLFS_TARGET32}</userinput></screen>
    7373
    74     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     74    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    7575    href="../common/eglibc.xml"
    7676    xpointer="xpointer(//*[@os='i'])"/>
    7777
    78     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     78    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    7979    href="../common/eglibc.xml"
    8080    xpointer="xpointer(//*[@os='j'])"/>
    8181
    82     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     82    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    8383    href="../common/eglibc.xml"
    8484    xpointer="xpointer(//*[@os='k'])"/>
    8585
    86     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     86    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    8787    href="../common/eglibc.xml"
    8888    xpointer="xpointer(//*[@os='l'])"/>
    8989
    90     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     90    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    9191    href="../multilib/eglibc.xml"
    9292    xpointer="xpointer(//*[@os='l1'])"/>
    9393
    94     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     94    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    9595    href="../multilib/eglibc.xml"
    9696    xpointer="xpointer(//*[@os='l2'])"/>
    9797
    98     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     98    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    9999    href="../common/eglibc.xml"
    100100    xpointer="xpointer(//*[@os='m'])"/>
    101101
    102     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     102    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    103103    href="../common/eglibc.xml"
    104104    xpointer="xpointer(//*[@os='n'])"/>
    105105
    106     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     106    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    107107    href="../common/eglibc.xml"
    108108    xpointer="xpointer(//*[@os='o'])"/>
    109109
    110     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     110    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    111111    href="../common/eglibc.xml"
    112112    xpointer="xpointer(//*[@os='p'])"/>
    113113
    114     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     114    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    115115    href="../common/eglibc.xml"
    116116    xpointer="xpointer(//*[@os='q'])"/>
    117117
    118     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     118    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    119119    href="../common/eglibc.xml"
    120120    xpointer="xpointer(//*[@os='r'])"/>
    121121
    122     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     122    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    123123    href="../common/eglibc.xml"
    124124    xpointer="xpointer(//*[@os='s'])"/>
    125125
    126     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     126    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    127127    href="../common/eglibc.xml"
    128128    xpointer="xpointer(//*[@os='t'])"/>
Note: See TracChangeset for help on using the changeset viewer.