Changeset 9793117 for BOOK/final-system


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/final-system
Files:
8 added
15 edited

Legend:

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