Changeset a4d251f for BOOK/final-system


Ignore:
Timestamp:
Jan 30, 2011, 1:26:37 PM (14 years ago)
Author:
Joe Ciccone <jciccone@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
fff5cb5
Parents:
2572b8e (diff), 27931b9 (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/final-system
Files:
3 added
16 edited

Legend:

Unmodified
Added
Removed

  • BOOK/final-system/alpha-chapter.xml

    r2572b8e ra4d251f  
    3030  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sed.xml"/>
    3131  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
     32  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pkg-config.xml"/>
    3233  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux.xml"/>
    3334  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>

  • BOOK/final-system/common/e2fsprogs.xml

    r2572b8e ra4d251f  
    3737    <para os="c">Prepare E2fsprogs for compilation:</para>
    3838
    39 <screen os="d"><userinput>PKG_CONFIG=true ../configure --prefix=/usr --with-root-prefix="" \
     39<screen os="d"><userinput>../configure --prefix=/usr --with-root-prefix="" \
    4040    --enable-elf-shlibs --disable-libblkid \
    4141    --disable-libuuid --disable-fsck \
    … …  
    7171    <para os="f">Compile the package:</para>
    7272
    73 <screen os="g"><userinput>make LIBUUID="-luuid" STATIC_LIBUUID="-luuid" \
    74     LIBBLKID="-lblkid" STATIC_LIBBLKID="-lblkid"</userinput></screen>
     73<screen os="g"><userinput>make</userinput></screen>
    7574
    7675    <para os="h">To test the results, issue:

  • BOOK/final-system/mips-chapter.xml

    r2572b8e ra4d251f  
    3030  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sed.xml"/>
    3131  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
     32  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pkg-config.xml"/>
    3233  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux.xml"/>
    3334  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>

  • BOOK/final-system/mips64-64-chapter.xml

    r2572b8e ra4d251f  
    3030  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sed.xml"/>
    3131  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
     32  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pkg-config.xml"/>
    3233  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux.xml"/>
    3334  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>

  • BOOK/final-system/mips64-chapter.xml

    r2572b8e ra4d251f  
    4545  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses-n32.xml"/>
    4646  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses-64bit.xml"/>
     47  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/pkg-config.xml"/>
    4748  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux.xml"/>
    4849  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux-n32.xml"/>

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

    r2572b8e ra4d251f  
    3939    xpointer="xpointer(//*[@os='c'])"/>
    4040
    41 <screen os="d"><userinput>CC="gcc ${BUILD64}" PKG_CONFIG=true \
    42     ../configure --prefix=/usr --with-root-prefix="" \
     41<screen os="d"><userinput>CC="gcc ${BUILD64}" PKG_CONFIG_PATH="${PKG_CONFIG_PATH64}" \
     42  ../configure --prefix=/usr --with-root-prefix="" \
    4343    --enable-elf-shlibs --disable-libblkid \
    4444    --disable-libuuid --disable-fsck \

  • BOOK/final-system/multilib/e2fsprogs-n32.xml

    r2572b8e ra4d251f  
    4040    xpointer="xpointer(//*[@os='c'])"/>
    4141
    42 <screen os="d"><userinput>CC="gcc ${BUILDN32}" PKG_CONFIG=true \
    43     ../configure --prefix=/usr --with-root-prefix="" \
     42<screen os="d"><userinput>CC="gcc ${BUILDN32}" PKG_CONFIG_PATH="${PKG_CONFIG_PATHN32}" \
     43  ../configure --prefix=/usr --with-root-prefix="" \
    4444    --enable-elf-shlibs --disable-libblkid \
    4545    --disable-libuuid --disable-fsck \

  • BOOK/final-system/multilib/e2fsprogs.xml

    r2572b8e ra4d251f  
    3535    xpointer="xpointer(//*[@os='c'])"/>
    3636
    37 <screen os="d"><userinput>CC="gcc ${BUILD32}" PKG_CONFIG=true \
    38     ../configure --prefix=/usr --with-root-prefix="" \
     37<screen os="d"><userinput>CC="gcc ${BUILD32}" PKG_CONFIG_PATH="${PKG_CONFIG_PATH32}" \
     38  ../configure --prefix=/usr --with-root-prefix="" \
    3939    --enable-elf-shlibs --disable-libblkid \
    4040    --disable-libuuid --disable-fsck \

  • BOOK/final-system/ppc-chapter.xml

    r2572b8e ra4d251f  
    3030  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sed.xml"/>
    3131  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
     32  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pkg-config.xml"/>
    3233  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux.xml"/>
    3334  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>

  • BOOK/final-system/ppc64-chapter.xml

    r2572b8e ra4d251f  
    3939  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses.xml"/>
    4040  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses-64bit.xml"/>
     41  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/pkg-config.xml"/>
    4142  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux.xml"/>
    4243  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux-64bit.xml"/>

  • BOOK/final-system/sparc-chapter.xml

    r2572b8e ra4d251f  
    3030  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sed.xml"/>
    3131  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
     32  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pkg-config.xml"/>
    3233  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux.xml"/>
    3334  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>

  • BOOK/final-system/sparc64-64-chapter.xml

    r2572b8e ra4d251f  
    3030  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sed.xml"/>
    3131  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
     32  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pkg-config.xml"/>
    3233  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux.xml"/>
    3334  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>

  • BOOK/final-system/sparc64-chapter.xml

    r2572b8e ra4d251f  
    3939  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses.xml"/>
    4040  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses-64bit.xml"/>
     41  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/pkg-config.xml"/>
    4142  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux.xml"/>
    4243  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux-64bit.xml"/>

  • BOOK/final-system/x86-chapter.xml

    r2572b8e ra4d251f  
    3030  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sed.xml"/>
    3131  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
     32  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pkg-config.xml"/>
    3233  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux.xml"/>
    3334  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>

  • BOOK/final-system/x86_64-64-chapter.xml

    r2572b8e ra4d251f  
    3030  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sed.xml"/>
    3131  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
     32  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pkg-config.xml"/>
    3233  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux.xml"/>
    3334  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>

  • BOOK/final-system/x86_64-chapter.xml

    r2572b8e ra4d251f  
    3939  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses.xml"/>
    4040  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses-64bit.xml"/>
     41  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/pkg-config.xml"/>
    4142  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux.xml"/>
    4243  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux-64bit.xml"/>
Note: See TracChangeset for help on using the changeset viewer.