Ignore:
Timestamp:
Apr 23, 2011, 10:52:47 AM (14 years ago)
Author:
Joe Ciccone <jciccone@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
bd31da6b
Parents:
21e442f (diff), a675f833 (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/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/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/materials/common/packages.xml
BOOK/packages.ent

File:
1 edited

Legend:

Unmodified
Added
Removed

  • BOOK/appendices/dependencies/common.xml

    r21e442f r9793117  
    947947      </segmentedlist>
    948948
     949<!-- Begin libestr dependency info -->
     950  <bridgehead renderas="sect2" id="libee-dep">Libee</bridgehead>
     951
     952      <segmentedlist>
     953        <segtitle>&dependencies;</segtitle>
     954
     955        <seglistitem>
     956         <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, Findutils, Gawk,
     957         GCC, Grep, Libestr, Make, Pkg-config, Sed and Texinfo</seg>
     958        </seglistitem>
     959      </segmentedlist>
     960
     961      <segmentedlist>
     962        <segtitle>&testsuites;</segtitle>
     963
     964        <seglistitem>
     965          <seg>None</seg>
     966        </seglistitem>
     967      </segmentedlist>
     968
     969      <segmentedlist>
     970        <segtitle>&before;</segtitle>
     971
     972        <seglistitem>
     973          <seg>None</seg>
     974        </seglistitem>
     975      </segmentedlist>
     976
     977<!-- Begin libestr dependency info -->
     978  <bridgehead renderas="sect2" id="libestr-dep">Libestr</bridgehead>
     979
     980      <segmentedlist>
     981        <segtitle>&dependencies;</segtitle>
     982
     983        <seglistitem>
     984         <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, Findutils, Gawk,
     985         GCC, Grep, Make, Sed and Texinfo</seg>
     986        </seglistitem>
     987      </segmentedlist>
     988
     989      <segmentedlist>
     990        <segtitle>&testsuites;</segtitle>
     991
     992        <seglistitem>
     993          <seg>None</seg>
     994        </seglistitem>
     995      </segmentedlist>
     996
     997      <segmentedlist>
     998        <segtitle>&before;</segtitle>
     999
     1000        <seglistitem>
     1001          <seg>None</seg>
     1002        </seglistitem>
     1003      </segmentedlist>
     1004
    9491005<!-- Begin Libtool dependency info -->
    9501006  <bridgehead renderas="sect2" id="libtool-dep">Libtool</bridgehead>
    … …  
    14271483
    14281484        <seglistitem>
    1429          <seg>Binutils, Coreutils, Diffutils, EGLIBC, Gawk, GCC, Grep, Make
    1430          and Sed</seg>
     1485         <seg>Binutils, Coreutils, Diffutils, EGLIBC, Gawk, GCC, Grep, libee,
     1486         Libestr, Make, Sed and Zlib</seg>
    14311487        </seglistitem>
    14321488      </segmentedlist>
Note: See TracChangeset for help on using the changeset viewer.