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/boot/alpha/kernel.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="../../bootable/x86/kernel.xml"
    2020  xpointer="xpointer(//*[@role='package'])"/>
    … …  
    2323    <title>Installation of the kernel</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="../x86/kernel.xml"
    2727    xpointer="xpointer(//*[@os='aa'])"/>
    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="../x86/kernel.xml"
    3131    xpointer="xpointer(//*[@os='a'])"/>
    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="../../bootable/alpha/kernel.xml"
    3535    xpointer="xpointer(//*[@os='a3'])"/>
    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="../../bootable/alpha/kernel.xml"
    3939    xpointer="xpointer(//*[@os='a4'])"/>
    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="../x86/kernel.xml"
    4343    xpointer="xpointer(//*[@os='b'])"/>
    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="../x86/kernel.xml"
    4747    xpointer="xpointer(//*[@os='c'])"/>
    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="../x86/kernel.xml"
    5151    xpointer="xpointer(//*[@os='d'])"/>
    5252
    53     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     53    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    5454    href="../x86/kernel.xml"
    5555    xpointer="xpointer(//*[@os='ae'])"/>
    … …  
    5757<screen><userinput>make ARCH=alpha CROSS_COMPILE=${CLFS_TARGET}- menuconfig</userinput></screen>
    5858
    59     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     59    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    6060    href="../x86/kernel.xml"
    6161    xpointer="xpointer(//*[@os='m'])"/>
    … …  
    6363<screen><userinput>make ARCH=alpha CROSS_COMPILE=${CLFS_TARGET}-</userinput></screen>
    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="../x86/kernel.xml"
    6767    xpointer="xpointer(//*[@os='af'])"/>
    6868
    69     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     69    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    7070    href="../x86/kernel.xml"
    7171    xpointer="xpointer(//*[@os='p'])"/>
    7272
    73     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     73    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    7474    href="../x86/kernel.xml"
    7575    xpointer="xpointer(//*[@os='q'])"/>
    7676
    77     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     77    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    7878    href="../x86/kernel.xml"
    7979    xpointer="xpointer(//*[@os='s'])"/>
    … …  
    8282   INSTALL_MOD_PATH=${CLFS} modules_install</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="../x86/kernel.xml"
    8686    xpointer="xpointer(//*[@os='u'])"/>
    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="../x86/kernel.xml"
    9090    xpointer="xpointer(//*[@os='v'])"/>
    … …  
    9292<screen><userinput>cp -v vmlinux ${CLFS}/boot/clfskernel-&linux-version;</userinput></screen>
    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="../x86/kernel.xml"
    9696    xpointer="xpointer(//*[@os='w'])"/>
    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="../x86/kernel.xml"
    100100    xpointer="xpointer(//*[@os='w1'])"/>
    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="../x86/kernel.xml"
    104104    xpointer="xpointer(//*[@os='x'])"/>
    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="../x86/kernel.xml"
    108108    xpointer="xpointer(//*[@os='x1'])"/>
Note: See TracChangeset for help on using the changeset viewer.