Changeset 4317f44 for BOOK/boot/common


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

Location:
BOOK/boot/common
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • BOOK/boot/common/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'])"/>
    … …  
    2323    <title>Installation of E2fsprogs</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="../../final-system/common/e2fsprogs.xml"
    2727    xpointer="xpointer(//*[@os='a'])"/>
    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="../../final-system/common/e2fsprogs.xml"
    3131    xpointer="xpointer(//*[@os='b'])"/>
    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="../../final-system/common/e2fsprogs.xml"
    3535    xpointer="xpointer(//*[@os='c'])"/>
    … …  
    4444      <title>The meaning of the configure options:</title>
    4545
    46       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     46      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4747      href="../../final-system/common/e2fsprogs.xml"
    4848      xpointer="xpointer(//*[@os='e2'])"/>
    … …  
    5050    </variablelist>
    5151
    52     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     52    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    5353    href="../../final-system/common/e2fsprogs.xml"
    5454    xpointer="xpointer(//*[@os='f'])"/>
    … …  
    5757    LIBBLKID="-lblkid" STATIC_LIBBLKID="-lblkid"</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="../../final-system/common/e2fsprogs.xml"
    6161    xpointer="xpointer(//*[@os='i'])"/>
    6262
    63     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     63    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    6464    href="../../final-system/common/e2fsprogs.xml"
    6565    xpointer="xpointer(//*[@os='j'])"/>
    6666
    67     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     67    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    6868    href="../../final-system/common/e2fsprogs.xml"
    6969    xpointer="xpointer(//*[@os='k'])"/>
    7070
    71     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     71    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    7272    href="../../final-system/common/e2fsprogs.xml"
    7373    xpointer="xpointer(//*[@os='l'])"/>

  • BOOK/boot/common/fstab.xml

    r957d7a0 r4317f44  
    3535EOF</userinput></screen>
    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/common/fstab.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="../../bootable/common/fstab.xml"
    4343  xpointer="xpointer(//*[@os='c'])"/>

  • BOOK/boot/common/module-init-tools.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/module-init-tools.xml"
    2020  xpointer="xpointer(//*[@role='package'])"/>
    … …  
    2323    <title>Installation of Module-Init-Tools</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="../../final-system/common/module-init-tools.xml"
    2727    xpointer="xpointer(//*[@os='e'])"/>
    … …  
    3131    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
    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="../../final-system/common/module-init-tools.xml"
    3535    xpointer="xpointer(//*[@os='h'])"/>
    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="../../final-system/common/module-init-tools.xml"
    3939    xpointer="xpointer(//*[@os='i'])"/>
    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="../../final-system/common/module-init-tools.xml"
    4343    xpointer="xpointer(//*[@os='j'])"/>

  • BOOK/boot/common/sysvinit.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/sysvinit.xml"
    2020  xpointer="xpointer(//*[@role='package'])"/>
    … …  
    3030    src/Makefile.orig > src/Makefile</userinput></screen>
    3131
    32     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     32    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3333    href="../../final-system/common/sysvinit.xml"
    3434    xpointer="xpointer(//*[@os='c'])"/>
    … …  
    3737make -C src CC="${CC}"</userinput></screen>
    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="../../final-system/common/sysvinit.xml"
    4141    xpointer="xpointer(//*[@os='e'])"/>

  • BOOK/boot/common/udev.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/udev.xml"
    2020  xpointer="xpointer(//*[@role='package'])"/>
    … …  
    2323    <title>Installation of Udev</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="../../final-system/common/udev.xml"
    2727    xpointer="xpointer(//*[@os='a'])"/>
    … …  
    3333    --disable-extras --disable-introspection</userinput></screen>
    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="../../final-system/common/udev.xml"
    3737    xpointer="xpointer(//*[@os='c'])"/>
    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="../../final-system/common/udev.xml"
    4141    xpointer="xpointer(//*[@os='d'])"/>
    4242
    43     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     43    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4444    href="../../final-system/common/udev.xml"
    4545    xpointer="xpointer(//*[@os='g'])"/>

  • BOOK/boot/common/util-linux.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/util-linux.xml"
    2020  xpointer="xpointer(//*[@role='package'])"/>
    … …  
    2323    <title>Installation of Util-linux</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="../../final-system/common/util-linux.xml"
    2727    xpointer="xpointer(//*[@os='a'])"/>
    … …  
    3131    --disable-makeinstall-chown</userinput></screen>
    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="../../final-system/common/util-linux.xml"
    3535    xpointer="xpointer(//*[@os='d'])"/>
    … …  
    3737<screen os="e"><userinput>make</userinput></screen>
    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="../../final-system/common/util-linux.xml"
    4141    xpointer="xpointer(//*[@os='g'])"/>
Note: See TracChangeset for help on using the changeset viewer.