Ignore:
Timestamp:
Feb 22, 2011, 4:53:14 PM (13 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/boot/multilib/e2fsprogs.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="../../final-system/common/e2fsprogs.xml"
    2020  xpointer="xpointer(//*[@role='package'])"/>
    … …  
    2929sed -e "/libdir=.*\/lib/s@/lib@/lib64@g" configure.orig &gt; configure</userinput></screen>
    3030
    31     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     31    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3232    href="../common/e2fsprogs.xml"
    3333    xpointer="xpointer(//*[@os='a'])"/>
    3434
    35     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     35    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3636    href="../common/e2fsprogs.xml"
    3737    xpointer="xpointer(//*[@os='b'])"/>
    3838
    39     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     39    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4040    href="../common/e2fsprogs.xml"
    4141    xpointer="xpointer(//*[@os='c'])"/>
    … …  
    4848    --disable-uuidd</userinput></screen>
    4949
    50     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     50    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    5151    href="../common/e2fsprogs.xml"
    5252    xpointer="xpointer(//*[@os='e'])"/>
    5353
    54     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     54    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    5555    href="../common/e2fsprogs.xml"
    5656    xpointer="xpointer(//*[@os='f'])"/>
    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/e2fsprogs.xml"
    6060    xpointer="xpointer(//*[@os='g'])"/>
    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/e2fsprogs.xml"
    6464    xpointer="xpointer(//*[@os='i'])"/>
    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/e2fsprogs.xml"
    6868    xpointer="xpointer(//*[@os='j'])"/>
    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/e2fsprogs.xml"
    7272    xpointer="xpointer(//*[@os='k'])"/>
    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/e2fsprogs.xml"
    7676    xpointer="xpointer(//*[@os='l'])"/>
    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/e2fsprogs.xml"
    8080    xpointer="xpointer(//*[@os='ad'])"/>
    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/e2fsprogs.xml"
    8484    xpointer="xpointer(//*[@os='ae'])"/>
Note: See TracChangeset for help on using the changeset viewer.