Ignore:
Timestamp:
Jan 4, 2014, 12:03:38 AM (11 years ago)
Author:
Chris Staub <chris@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
f90d077
Parents:
ec008670 (diff), e57ce38 (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/appendices/dependencies/common.xml
BOOK/boot/common/devices.xml
BOOK/boot/common/pwdgroup.xml
BOOK/boot/ppc64-64/powerpc-utils.xml
BOOK/boot/ppc64/util-linux-32.xml
BOOK/bootscripts/common/bootscripts.xml
BOOK/final-system/alpha-chapter.xml
BOOK/final-system/common/coreutils.xml
BOOK/final-system/common/eudev.xml
BOOK/final-system/common/kbd.xml
BOOK/final-system/mips-chapter.xml
BOOK/final-system/mips64-64-chapter.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/udev-64bit.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
BOOK/introduction/common/changelog.xml
BOOK/materials/common/packages.xml
BOOK/packages.ent

File:
1 moved

Legend:

Unmodified
Added
Removed

  • BOOK/final-system/multilib/kmod-64bit.xml

    rec008670 r229ed25  
    66]>
    77
    8 <sect1 id="ch-system-module-init-tools" role="wrap">
    9   <?dbhtml filename="module-init-tools.html"?>
     8<sect1 id="ch-system-kmod" role="wrap">
     9  <?dbhtml filename="kmod-64bit.html"?>
    1010
    11   <title>Module-Init-Tools-&module-init-tools-version;</title>
     11  <title>Kmod-&kmod-version; 64 Bit</title>
    1212
    13   <indexterm zone="ch-system-module-init-tools">
    14     <primary sortas="a-Module-Init-Tools">Module-Init-Tools</primary>
     13  <indexterm zone="ch-system-kmod">
     14    <primary sortas="a-Kmod">Kmod</primary>
    1515  </indexterm>
    1616
    1717  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    18   href="../common/module-init-tools.xml"
     18  href="../common/kmod.xml"
    1919  xpointer="xpointer(//*[@role='package'])"/>
    2020
    2121  <sect2 role="installation">
    22     <title>Installation of Module-Init-Tools</title>
     22    <title>Installation of Kmod</title>
    2323
    2424    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    25     href="../common/module-init-tools.xml"
     25    href="../common/kmod.xml"
     26    xpointer="xpointer(//*[@os='a'])"/>
     27
     28<screen os="b"><userinput>PKG_CONFIG_PATH=${PKG_CONFIG_PATH64} CC="gcc ${BUILD64}" \
     29        ./configure --prefix=/usr \
     30        --bindir=/bin --sysconfdir=/etc \
     31        --with-rootlibdir=/lib64 --libdir=/usr/lib64 \
     32        --with-zlib --with-xz --disable-manpages</userinput></screen>
     33
     34    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     35    href="../common/kmod.xml"
    2636    xpointer="xpointer(//*[@os='c'])"/>
    2737
    2838    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    29     href="../common/module-init-tools.xml"
     39    href="../common/kmod.xml"
    3040    xpointer="xpointer(//*[@os='d'])"/>
    3141
    3242    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    33     href="../common/module-init-tools.xml"
     43    href="../common/kmod.xml"
    3444    xpointer="xpointer(//*[@os='e'])"/>
    3545
    36 <screen os="f"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
    37     --bindir=/bin --sbindir=/sbin \
    38     --enable-zlib-dynamic</userinput></screen>
     46    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     47    href="../common/kmod.xml"
     48    xpointer="xpointer(//*[@os='f'])"/>
    3949
    4050    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    41     href="../common/module-init-tools.xml"
     51    href="../common/kmod.xml"
     52    xpointer="xpointer(//*[@os='f2'])"/>
     53
     54    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     55    href="../common/kmod.xml"
    4256    xpointer="xpointer(//*[@os='g'])"/>
    4357
    4458    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    45     href="../common/module-init-tools.xml"
     59    href="../common/kmod.xml"
    4660    xpointer="xpointer(//*[@os='h'])"/>
    47 
     61   
    4862    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    49     href="../common/module-init-tools.xml"
     63    href="../common/kmod.xml"
    5064    xpointer="xpointer(//*[@os='i'])"/>
    51 
     65   
    5266    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    53     href="../common/module-init-tools.xml"
     67    href="../common/kmod.xml"
    5468    xpointer="xpointer(//*[@os='j'])"/>
    55 
    56     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    57     href="../common/module-init-tools.xml"
    58     xpointer="xpointer(//*[@os='k'])"/>
    5969
    6070  </sect2>
    6171
    6272  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    63   href="../common/module-init-tools.xml"
    64   xpointer="xpointer(id('contents-module-init-tools'))"/>
     73  href="../common/kmod.xml"
     74  xpointer="xpointer(id('contents-kmod'))"/>
    6575
    6676</sect1>
Note: See TracChangeset for help on using the changeset viewer.