Changeset 441840b for BOOK/final-system


Ignore:
Timestamp:
Apr 23, 2011, 10:54:25 AM (15 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/final-system
Files:
8 added
15 edited

Legend:

Unmodified
Added
Removed
  • 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"/>
Note: See TracChangeset for help on using the changeset viewer.