Changeset af0fe7f


Ignore:
Timestamp:
Feb 13, 2011, 11:08:22 AM (14 years ago)
Author:
Joe Ciccone <jciccone@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
d89bf75
Parents:
8050e8b (diff), 0162995 (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

Location:
BOOK
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • BOOK/boot/64/e2fsprogs.xml

    r8050e8b raf0fe7f  
    3535    xpointer="xpointer(//*[@os='c'])"/>
    3636
    37     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    38     href="../multilib/e2fsprogs.xml"
    39     xpointer="xpointer(//*[@os='aa'])"/>
     37<screen os="aa"><userinput>LDFLAGS="-Wl,-rpath-link,/tools/lib" \
     38  CC="${CC} ${BUILD64}" PKG_CONFIG=true \
     39    ../configure --prefix=/tools --enable-elf-shlibs \
     40    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
     41    --disable-libblkid --disable-libuuid --disable-fsck \
     42    --disable-uuidd</userinput></screen>
    4043
    4144    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

  • BOOK/boot/common/e2fsprogs.xml

    r8050e8b raf0fe7f  
    5454    xpointer="xpointer(//*[@os='f'])"/>
    5555
    56     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    57     href="../../final-system/common/e2fsprogs.xml"
    58     xpointer="xpointer(//*[@os='g'])"/>
     56<screen os="g"><userinput>make LIBUUID="-luuid" STATIC_LIBUUID="-luuid" \
     57    LIBBLKID="-lblkid" STATIC_LIBBLKID="-lblkid"</userinput></screen>
    5958
    6059    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

  • BOOK/general.ent

    r8050e8b raf0fe7f  
    33<!ENTITY month "02"> <!-- Use two digits -->
    44<!ENTITY month_name "Feburary">
    5 <!ENTITY day "10"> <!-- Use two digits -->
     5<!ENTITY day "13"> <!-- Use two digits -->
    66<!ENTITY year "2011"> <!-- Use four digits -->
    77

  • BOOK/prologue/common/hostreqs.xml

    r8050e8b raf0fe7f  
    101101
    102102    <listitem>
    103       <para><emphasis role="strong">Texinfo-4.4</emphasis></para>
     103      <para><emphasis role="strong">Texinfo-4.7</emphasis></para>
    104104    </listitem>
    105105
Note: See TracChangeset for help on using the changeset viewer.