Changeset 441840b


Ignore:
Timestamp:
Apr 23, 2011, 10:54:25 AM (14 years ago)
Author:
Joe Ciccone <jciccone@…>
Children:
5f27dfa
Parents:
2643b9b4 (diff), 2a31285 (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 simp

Location:
BOOK
Files:
8 added
21 edited

Legend:

Unmodified
Added
Removed

  • BOOK/appendices/dependencies/common.xml

    r2643b9b4 r441840b  
    836836      </segmentedlist>
    837837
     838<!-- Begin libestr dependency info -->
     839  <bridgehead renderas="sect2" id="libee-dep">Libee</bridgehead>
     840
     841      <segmentedlist>
     842        <segtitle>&dependencies;</segtitle>
     843
     844        <seglistitem>
     845         <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, Findutils, Gawk,
     846         GCC, Grep, Libestr, Make, Pkg-config, Sed and Texinfo</seg>
     847        </seglistitem>
     848      </segmentedlist>
     849
     850      <segmentedlist>
     851        <segtitle>&testsuites;</segtitle>
     852
     853        <seglistitem>
     854          <seg>None</seg>
     855        </seglistitem>
     856      </segmentedlist>
     857
     858      <segmentedlist>
     859        <segtitle>&before;</segtitle>
     860
     861        <seglistitem>
     862          <seg>Rsyslog</seg>
     863        </seglistitem>
     864      </segmentedlist>
     865
     866<!-- Begin libestr dependency info -->
     867  <bridgehead renderas="sect2" id="libestr-dep">Libestr</bridgehead>
     868
     869      <segmentedlist>
     870        <segtitle>&dependencies;</segtitle>
     871
     872        <seglistitem>
     873         <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, Findutils, Gawk,
     874         GCC, Grep, Make, Sed and Texinfo</seg>
     875        </seglistitem>
     876      </segmentedlist>
     877
     878      <segmentedlist>
     879        <segtitle>&testsuites;</segtitle>
     880
     881        <seglistitem>
     882          <seg>None</seg>
     883        </seglistitem>
     884      </segmentedlist>
     885
     886      <segmentedlist>
     887        <segtitle>&before;</segtitle>
     888
     889        <seglistitem>
     890          <seg>Libee and Rsyslog</seg>
     891        </seglistitem>
     892      </segmentedlist>
     893
    838894<!-- Begin Libtool dependency info -->
    839895  <bridgehead renderas="sect2" id="libtool-dep">Libtool</bridgehead>
    … …  
    13161372
    13171373        <seglistitem>
    1318          <seg>Binutils, Coreutils, Diffutils, EGLIBC, Gawk, GCC, Grep, Make
    1319          and Sed</seg>
     1374         <seg>Binutils, Coreutils, Diffutils, EGLIBC, Gawk, GCC, Grep, libee,
     1375         Libestr, Make, Sed and Zlib</seg>
    13201376        </seglistitem>
    13211377      </segmentedlist>

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

    r2643b9b4 r441840b  
    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

    r2643b9b4 r441840b  
    6565  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
    6666  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
     67  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libestr.xml"/>
     68  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libee.xml"/>
    6769  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/rsyslog.xml"/>
    6870  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>

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

    r2643b9b4 r441840b  
    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

    r2643b9b4 r441840b  
    6565  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
    6666  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
     67  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libestr.xml"/>
     68  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libee.xml"/>
    6769  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/rsyslog.xml"/>
    6870  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>

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

    r2643b9b4 r441840b  
    6565  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
    6666  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
     67  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libestr.xml"/>
     68  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libee.xml"/>
    6769  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/rsyslog.xml"/>
    6870  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>

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

    r2643b9b4 r441840b  
    106106  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/psmisc.xml"/>
    107107  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/shadow.xml"/>
     108  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr.xml"/>
     109  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr-n32.xml"/>
     110  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr-64bit.xml"/>
     111  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libee.xml"/>
     112  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libee-n32.xml"/>
     113  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libee-64bit.xml"/>
    108114  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/rsyslog.xml"/>
    109115  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>

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

    r2643b9b4 r441840b  
    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

    r2643b9b4 r441840b  
    6565  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
    6666  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
     67  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libestr.xml"/>
     68  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libee.xml"/>
    6769  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/rsyslog.xml"/>
    6870  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>

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

    r2643b9b4 r441840b  
    8686  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/psmisc.xml"/>
    8787  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/shadow.xml"/>
     88  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr.xml"/>
     89  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr-64bit.xml"/>
     90  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libee.xml"/>
     91  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libee-64bit.xml"/>
    8892  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/rsyslog.xml"/>
    8993  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>

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

    r2643b9b4 r441840b  
    6565  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
    6666  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
     67  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libestr.xml"/>
     68  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libee.xml"/>
    6769  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/rsyslog.xml"/>
    6870  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>

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

    r2643b9b4 r441840b  
    6565  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
    6666  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
     67  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libestr.xml"/>
     68  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libee.xml"/>
    6769  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/rsyslog.xml"/>
    6870  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>

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

    r2643b9b4 r441840b  
    8686  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/psmisc.xml"/>
    8787  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/shadow.xml"/>
     88  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr.xml"/>
     89  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr-64bit.xml"/>
     90  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libee.xml"/>
     91  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libee-64bit.xml"/>
    8892  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/rsyslog.xml"/>
    8993  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>

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

    r2643b9b4 r441840b  
    6565  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
    6666  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
     67  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libestr.xml"/>
     68  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libee.xml"/>
    6769  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/rsyslog.xml"/>
    6870  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>

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

    r2643b9b4 r441840b  
    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

    r2643b9b4 r441840b  
    6565  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
    6666  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
     67  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libestr.xml"/>
     68  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libee.xml"/>
    6769  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/rsyslog.xml"/>
    6870  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>

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

    r2643b9b4 r441840b  
    8686  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/psmisc.xml"/>
    8787  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/shadow.xml"/>
     88  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr.xml"/>
     89  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr-64bit.xml"/>
     90  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libee.xml"/>
     91  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libee-64bit.xml"/>
    8892  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/rsyslog.xml"/>
    8993  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>

  • BOOK/general.ent

    r2643b9b4 r441840b  
    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

    r2643b9b4 r441840b  
    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

    r2643b9b4 r441840b  
    295295
    296296    <varlistentry>
     297      <term>Libee (&libee-version;) - <token>&libee-size;</token>:</term>
     298      <listitem>
     299        <para>Home page: <ulink url="&libee-home;"/></para>
     300        <para>Download: <ulink url="&libee-url;"/></para>
     301        <para>MD5 sum: <literal>&libee-md5;</literal></para>
     302      </listitem>
     303    </varlistentry>
     304
     305    <varlistentry>
     306      <term>Libestr (&libestr-version;) - <token>&libestr-size;</token>:</term>
     307      <listitem>
     308        <para>Home page: <ulink url="&libestr-home;"/></para>
     309        <para>Download: <ulink url="&libestr-url;"/></para>
     310        <para>MD5 sum: <literal>&libestr-md5;</literal></para>
     311      </listitem>
     312    </varlistentry>
     313
     314    <varlistentry>
    297315      <term>Libtool (&libtool-version;) - <token>&libtool-size;</token>:</term>
    298316      <listitem>

  • BOOK/packages.ent

    r2643b9b4 r441840b  
    242242<!ENTITY less-home "http://www.greenwoodsoftware.com/less">
    243243
     244<!ENTITY libee-version "0.3.1">
     245<!ENTITY libee-size "344 KB">
     246<!ENTITY libee-url "http://www.libee.org/files/download/libee-&libee-version;.tar.gz">
     247<!ENTITY libee-md5 "61403a9a62b984381cf48454664f915e">
     248<!ENTITY libee-home "http://www.libee.org/">
     249
     250<!ENTITY libestr-version "0.1.0">
     251<!ENTITY libestr-size "308 KB">
     252<!ENTITY libestr-url "http://sourceforge.net/projects/libestr/files/libestr-&libestr-version;.tar.gz">
     253<!ENTITY libestr-md5 "1b8fe449cffc259075d327334c93bbda">
     254<!ENTITY libestr-home "http://sourceforge.net/projects/libestr/">
     255
    244256<!ENTITY libtool-version "2.4">
    245257<!ENTITY libtool-size "836 KB">
    … …  
    359371<!ENTITY readline-home "http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html">
    360372
    361 <!ENTITY rsyslog-version "4.4.2">
    362 <!ENTITY rsyslog-size "1,956 KB">
     373<!ENTITY rsyslog-version "6.1.7">
     374<!ENTITY rsyslog-size "2,336 KB">
    363375<!ENTITY rsyslog-url "http://download.rsyslog.com/rsyslog/rsyslog-&rsyslog-version;.tar.gz">
    364 <!ENTITY rsyslog-md5 "a8ada67b6cd5c00fbeb3a4b687b17359">
     376<!ENTITY rsyslog-md5 "7f14d4fb992c3cc81fd61e561298bd46">
    365377<!ENTITY rsyslog-home "http://www.rsyslog.com/">
    366378
Note: See TracChangeset for help on using the changeset viewer.