Changeset 9793117


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

Location:
BOOK
Files:
8 added
21 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>

  • BOOK/boot/x86/grub-build.xml

    r21e442f r9793117  
    3333<screen os="ab"><userinput>./configure --prefix=/usr \
    3434    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
    35     --sysconfdir=/etc</userinput></screen>
     35    --sysconfdir=/etc --disable-werror</userinput></screen>
    3636
    3737    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    r21e442f r9793117  
    7070  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
    7171  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd.xml"/>
     72  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libestr.xml"/>
     73  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libee.xml"/>
    7274  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/rsyslog.xml"/>
    7375  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>

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

    r21e442f r9793117  
    2828    <para os="a">Prepare Rsyslog for compilation:</para>
    2929
    30 <screen os="b"><userinput>./configure --prefix=/usr --sbindir=/sbin</userinput></screen>
     30<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
    3131
    3232    <para os="c">Compile the package:</para>

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

    r21e442f r9793117  
    7070  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
    7171  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd.xml"/>
     72  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libestr.xml"/>
     73  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libee.xml"/>
    7274  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/rsyslog.xml"/>
    7375  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>

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

    r21e442f r9793117  
    7070  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
    7171  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd.xml"/>
     72  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libestr.xml"/>
     73  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libee.xml"/>
    7274  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/rsyslog.xml"/>
    7375  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>

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

    r21e442f r9793117  
    121121  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/systemd-n32.xml"/>
    122122  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/systemd-64bit.xml"/>
     123  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr.xml"/>
     124  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr-n32.xml"/>
     125  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr-64bit.xml"/>
     126  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libee.xml"/>
     127  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libee-n32.xml"/>
     128  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libee-64bit.xml"/>
    123129  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/rsyslog.xml"/>
    124130  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/tar.xml"/>

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

    r21e442f r9793117  
    2626    xpointer="xpointer(//*[@os='a'])"/>
    2727
    28 <screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr --sbindir=/sbin --libdir=/usr/lib64</userinput></screen>
     28<screen os="b"><userinput>CC="gcc ${BUILD64}" PKG_CONFIG_PATH="${PKG_CONFIG_PATH64}" \
     29  ./configure --prefix=/usr --libdir=/usr/lib64</userinput></screen>
    2930
    3031    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

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

    r21e442f r9793117  
    7070  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
    7171  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd.xml"/>
     72  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libestr.xml"/>
     73  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libee.xml"/>
    7274  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/rsyslog.xml"/>
    7375  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>

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

    r21e442f r9793117  
    9696  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/systemd.xml"/>
    9797  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/systemd-64bit.xml"/>
     98  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr.xml"/>
     99  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr-64bit.xml"/>
     100  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libee.xml"/>
     101  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libee-64bit.xml"/>
    98102  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/rsyslog.xml"/>
    99103  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/tar.xml"/>

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

    r21e442f r9793117  
    7070  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
    7171  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd.xml"/>
     72  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libestr.xml"/>
     73  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libee.xml"/>
    7274  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/rsyslog.xml"/>
    7375  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>

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

    r21e442f r9793117  
    7070  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
    7171  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd.xml"/>
     72  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libestr.xml"/>
     73  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libee.xml"/>
    7274  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/rsyslog.xml"/>
    7375  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>

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

    r21e442f r9793117  
    9696  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/systemd.xml"/>
    9797  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/systemd-64bit.xml"/>
     98  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr.xml"/>
     99  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr-64bit.xml"/>
     100  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libee.xml"/>
     101  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libee-64bit.xml"/>
    98102  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/rsyslog.xml"/>
    99103  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/tar.xml"/>

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

    r21e442f r9793117  
    7070  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
    7171  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd.xml"/>
     72  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libestr.xml"/>
     73  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libee.xml"/>
    7274  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/rsyslog.xml"/>
    7375  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>

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

    r21e442f r9793117  
    4242
    4343<screen os="b"><userinput>./configure --prefix=/usr \
    44     --sysconfdir=/etc</userinput></screen>
     44    --sysconfdir=/etc --disable-werror</userinput></screen>
    4545
    4646    <para os="c">Compile the package:</para>

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

    r21e442f r9793117  
    7070  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
    7171  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd.xml"/>
     72  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libestr.xml"/>
     73  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libee.xml"/>
    7274  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/rsyslog.xml"/>
    7375  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>

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

    r21e442f r9793117  
    9696  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/systemd.xml"/>
    9797  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/systemd-64bit.xml"/>
     98  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr.xml"/>
     99  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr-64bit.xml"/>
     100  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libee.xml"/>
     101  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libee-64bit.xml"/>
    98102  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/rsyslog.xml"/>
    99103  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/tar.xml"/>

  • BOOK/general.ent

    r21e442f r9793117  
    33<!ENTITY month "04"> <!-- Use two digits -->
    44<!ENTITY month_name "April">
    5 <!ENTITY day "16"> <!-- Use two digits -->
     5<!ENTITY day "23"> <!-- Use two digits -->
    66<!ENTITY year "2011"> <!-- Use four digits -->
    77

  • BOOK/introduction/common/changelog.xml

    r21e442f r9793117  
    3636    </listitem>
    3737-->
     38
     39    <listitem>
     40      <para>April 17, 2011</para>
     41      <itemizedlist>
     42        <listitem>
     43          <para>[jciccone] - Added libee, dependency of the new
     44          rsyslog.</para>
     45        </listitem>
     46        <listitem>
     47          <para>[jciccone] - Added libestr, dependency of the new
     48          rsyslog.</para>
     49        </listitem>
     50      </itemizedlist>
     51    </listitem>
     52
     53    <listitem>
     54      <para>April 17, 2011</para>
     55      <itemizedlist>
     56        <listitem>
     57          <para>[jciccone] - Updated Rsyslog to 6.1.7.</para>
     58        </listitem>
     59      </itemizedlist>
     60    </listitem>
    3861
    3962    <listitem>

  • BOOK/materials/common/packages.xml

    r21e442f r9793117  
    331331
    332332    <varlistentry>
     333      <term>Libee (&libee-version;) - <token>&libee-size;</token>:</term>
     334      <listitem>
     335        <para>Home page: <ulink url="&libee-home;"/></para>
     336        <para>Download: <ulink url="&libee-url;"/></para>
     337        <para>MD5 sum: <literal>&libee-md5;</literal></para>
     338      </listitem>
     339    </varlistentry>
     340
     341    <varlistentry>
     342      <term>Libestr (&libestr-version;) - <token>&libestr-size;</token>:</term>
     343      <listitem>
     344        <para>Home page: <ulink url="&libestr-home;"/></para>
     345        <para>Download: <ulink url="&libestr-url;"/></para>
     346        <para>MD5 sum: <literal>&libestr-md5;</literal></para>
     347      </listitem>
     348    </varlistentry>
     349
     350    <varlistentry>
    333351      <term>Libtool (&libtool-version;) - <token>&libtool-size;</token>:</term>
    334352      <listitem>

  • BOOK/packages.ent

    r21e442f r9793117  
    267267<!ENTITY libcap-home "http://sites.google.com/site/fullycapable/">
    268268
     269<!ENTITY libee-version "0.3.1">
     270<!ENTITY libee-size "344 KB">
     271<!ENTITY libee-url "http://www.libee.org/files/download/libee-&libee-version;.tar.gz">
     272<!ENTITY libee-md5 "61403a9a62b984381cf48454664f915e">
     273<!ENTITY libee-home "http://www.libee.org/">
     274
     275<!ENTITY libestr-version "0.1.0">
     276<!ENTITY libestr-size "308 KB">
     277<!ENTITY libestr-url "http://sourceforge.net/projects/libestr/files/libestr-&libestr-version;.tar.gz">
     278<!ENTITY libestr-md5 "1b8fe449cffc259075d327334c93bbda">
     279<!ENTITY libestr-home "http://sourceforge.net/projects/libestr/">
     280
    269281<!ENTITY libtool-version "2.4">
    270282<!ENTITY libtool-size "836 KB">
    … …  
    384396<!ENTITY readline-home "http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html">
    385397
    386 <!ENTITY rsyslog-version "4.4.2">
    387 <!ENTITY rsyslog-size "1,956 KB">
     398<!ENTITY rsyslog-version "6.1.7">
     399<!ENTITY rsyslog-size "2,336 KB">
    388400<!ENTITY rsyslog-url "http://download.rsyslog.com/rsyslog/rsyslog-&rsyslog-version;.tar.gz">
    389 <!ENTITY rsyslog-md5 "a8ada67b6cd5c00fbeb3a4b687b17359">
     401<!ENTITY rsyslog-md5 "7f14d4fb992c3cc81fd61e561298bd46">
    390402<!ENTITY rsyslog-home "http://www.rsyslog.com/">
    391403
Note: See TracChangeset for help on using the changeset viewer.