Changeset 4317f44 for BOOK/boot/multilib


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/multilib
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • BOOK/boot/multilib/createfiles.xml

    r957d7a0 r4317f44  
    1111  <title>Creating Essential Symlinks</title>
    1212
    13   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     13  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    1414  href="../common/createfiles.xml"
    1515  xpointer="xpointer(//*[@os='a'])"/>

  • BOOK/boot/multilib/creatingdirs.xml

    r957d7a0 r4317f44  
    1111  <title>Creating Directories</title>
    1212
    13   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     13  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    1414  href="../common/creatingdirs.xml"
    1515  xpointer="xpointer(//*[@os='a'])"/>
    … …  
    3131ln -sv ../lib/locale ${CLFS}/usr/lib64</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="../common/creatingdirs.xml"
    3535  xpointer="xpointer(//*[@os='c'])"/>
    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/creatingdirs.xml"
    3939  xpointer="xpointer(//*[@os='d'])"/>
    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/creatingdirs.xml"
    4343  xpointer="xpointer(//*[@os='e'])"/>

  • 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'])"/>

  • BOOK/boot/multilib/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="../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="../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="../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="../common/module-init-tools.xml"
    4343    xpointer="xpointer(//*[@os='j'])"/>
    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/module-init-tools.xml"
    4747    xpointer="xpointer(//*[@os='k'])"/>

  • BOOK/boot/multilib/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'])"/>
    … …  
    2323    <title>Installation of Sysvinit</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/sysvinit.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="../common/sysvinit.xml"
    3131    xpointer="xpointer(//*[@os='ab'])"/>
    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/sysvinit.xml"
    3535    xpointer="xpointer(//*[@os='c'])"/>
    … …  
    3838make -C src CC="${CC} ${BUILD64}"</userinput></screen>
    3939
    40     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     40    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4141    href="../common/sysvinit.xml"
    4242    xpointer="xpointer(//*[@os='e'])"/>
    4343
    44     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     44    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4545    href="../common/sysvinit.xml"
    4646    xpointer="xpointer(//*[@os='ad'])"/>
    … …  
    4848  </sect2>
    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/sysvinit.xml"
    5252  xpointer="xpointer(//*[@role='configuration'])"/>

  • BOOK/boot/multilib/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'])"/>
    … …  
    3232    --libdir=/usr/lib64 --disable-extras --disable-introspection</userinput></screen>
    3333
    34     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     34    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3535    href="../../final-system/common/udev.xml"
    3636    xpointer="xpointer(//*[@os='c'])"/>
    3737
    38     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     38    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    3939    href="../../final-system/common/udev.xml"
    4040    xpointer="xpointer(//*[@os='d'])"/>
    4141
    42     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     42    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    4343    href="../../final-system/common/udev.xml"
    4444    xpointer="xpointer(//*[@os='g'])"/>
    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="../common/udev.xml"
    4848    xpointer="xpointer(//*[@os='j'])"/>

  • BOOK/boot/multilib/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="../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="../common/util-linux.xml"
    3535    xpointer="xpointer(//*[@os='d'])"/>
    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/util-linux.xml"
    3939    xpointer="xpointer(//*[@os='e'])"/>
    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/util-linux.xml"
    4343    xpointer="xpointer(//*[@os='g'])"/>
    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/util-linux.xml"
    4747    xpointer="xpointer(//*[@os='h'])"/>
    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/util-linux.xml"
    5151    xpointer="xpointer(//*[@os='i'])"/>
Note: See TracChangeset for help on using the changeset viewer.