Ignore:
Timestamp:
Apr 20, 2014, 8:57:39 AM (11 years ago)
Author:
Chris Staub <chris@…>
Children:
0be79ea
Parents:
88ef769 (diff), 578ca586 (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 'systemd' into simp

Conflicts:

BOOK/final-system/common/bash.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/bash.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/general.ent
BOOK/packages.ent
BOOK/temp-system/common/bash.xml
BOOK/temp-system/mips64-64-chapter.xml
BOOK/temp-system/mips64-chapter.xml
BOOK/temp-system/multilib/bash.xml
BOOK/temp-system/ppc64-64-chapter.xml
BOOK/temp-system/ppc64-chapter.xml
BOOK/temp-system/sparc64-64-chapter.xml
BOOK/temp-system/sparc64-chapter.xml
BOOK/temp-system/x86_64-64-chapter.xml
BOOK/temp-system/x86_64-chapter.xml

File:
1 edited

Legend:

Unmodified
Added
Removed

  • BOOK/boot/multilib/kmod.xml

    r88ef769 r03e6a40  
    2424
    2525    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     26    href="../common/kmod.xml"
     27    xpointer="xpointer(//*[@os='s1'])"/>
     28
     29    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     30    href="../common/kmod.xml"
     31    xpointer="xpointer(//*[@os='s2'])"/>
     32
     33    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    2634    href="../../final-system/common/kmod.xml"
    2735    xpointer="xpointer(//*[@os='a'])"/>
    … …  
    3038zlib_CFLAGS="-I/tools/include" zlib_LIBS="-L/tools/lib64 -lz" \
    3139CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
    32     --bindir=/bin --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    33     --libdir=/tools/lib64 --with-xz --with-zlib --disable-manpages</userinput></screen>
     40    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     41    --libdir=/tools/lib64 --with-xz --with-zlib</userinput></screen>
     42
     43    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     44    href="../common/kmod.xml"
     45    xpointer="xpointer(//*[@os='c'])"/>
    3446
    3547    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    … …  
    4557    xpointer="xpointer(//*[@os='g'])"/>
    4658
    47 <screen os="k"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
     59    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     60    href="../common/kmod.xml"
     61    xpointer="xpointer(//*[@os='h'])"/>
    4862
    49 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    50 href="../../final-system/common/kmod.xml"
    51 xpointer="xpointer(//*[@os='i'])"/>
     63    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     64    href="../common/kmod.xml"
     65    xpointer="xpointer(//*[@os='i'])"/>
    5266
    53 <screen os="j"><userinput>ln -sv kmod ${CLFS}/bin/lsmod
    54 ln -sv ../bin/kmod ${CLFS}/sbin/depmod
    55 ln -sv ../bin/kmod ${CLFS}/sbin/insmod
    56 ln -sv ../bin/kmod ${CLFS}/sbin/modprobe
    57 ln -sv ../bin/kmod ${CLFS}/sbin/modinfo
    58 ln -sv ../bin/kmod ${CLFS}/sbin/rmmod</userinput></screen>
     67    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     68    href="../common/kmod.xml"
     69    xpointer="xpointer(//*[@os='j'])"/>
    5970
    6071  </sect2>
Note: See TracChangeset for help on using the changeset viewer.