Changeset 9f61be5


Ignore:
Timestamp:
Jul 19, 2009, 7:39:58 PM (13 years ago)
Author:
Jim Gifford <clfs@…>
Branches:
clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
15012ca
Parents:
95620ac (diff), 7c0efc5 (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' of git@…:cross-lfs

Location:
BOOK
Files:
3 deleted
15 edited

Legend:

Unmodified
Added
Removed
  • BOOK/appendices/dependencies/common.xml

    r95620ac r9f61be5  
    416416
    417417        <seglistitem>
    418           <seg></seg>
     418          <seg>None</seg>
    419419        </seglistitem>
    420420      </segmentedlist>
  • BOOK/chroot/alpha-chapter.xml

    r95620ac r9f61be5  
    1414  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
    1515  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux-ng.xml"/>
    16   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
    1716  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kernfs.xml"/>
    1817  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/chroot.xml"/>
  • BOOK/chroot/mips-chapter.xml

    r95620ac r9f61be5  
    1414  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
    1515  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux-ng.xml"/>
    16   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
    1716  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kernfs.xml"/>
    1817  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/before-chroot.xml"/>
  • BOOK/chroot/mips64-64-chapter.xml

    r95620ac r9f61be5  
    1414  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
    1515  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux-ng.xml"/>
    16   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/e2fsprogs.xml"/>
    1716  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kernfs.xml"/>
    1817  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/chroot.xml"/>
  • BOOK/chroot/mips64-chapter.xml

    r95620ac r9f61be5  
    1414  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
    1515  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux-ng.xml"/>
    16   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/e2fsprogs.xml"/>
    1716  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kernfs.xml"/>
    1817  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/chroot.xml"/>
  • BOOK/chroot/ppc-chapter.xml

    r95620ac r9f61be5  
    1414  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
    1515  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux-ng.xml"/>
    16   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
    1716  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kernfs.xml"/>
    1817  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc/before-chroot.xml"/>
  • BOOK/chroot/ppc64-chapter.xml

    r95620ac r9f61be5  
    1414  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
    1515  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux-ng.xml"/>
    16   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/e2fsprogs.xml"/>
    1716  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kernfs.xml"/>
    1817  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/chroot.xml"/>
  • BOOK/chroot/sparc-chapter.xml

    r95620ac r9f61be5  
    1414  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
    1515  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux-ng.xml"/>
    16   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
    1716  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kernfs.xml"/>
    1817  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/before-chroot.xml"/>
  • BOOK/chroot/sparc64-64-chapter.xml

    r95620ac r9f61be5  
    1414  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
    1515  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux-ng.xml"/>
    16   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/e2fsprogs.xml"/>
    1716  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kernfs.xml"/>
    1817  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/chroot.xml"/>
  • BOOK/chroot/sparc64-chapter.xml

    r95620ac r9f61be5  
    1414  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
    1515  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux-ng.xml"/>
    16   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/e2fsprogs.xml"/>
    1716  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kernfs.xml"/>
    1817  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/chroot.xml"/>
  • BOOK/chroot/x86-chapter.xml

    r95620ac r9f61be5  
    1414  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
    1515  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux-ng.xml"/>
    16   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
    1716  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kernfs.xml"/>
    1817  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/before-chroot.xml"/>
  • BOOK/chroot/x86_64-64-chapter.xml

    r95620ac r9f61be5  
    1414  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
    1515  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux-ng.xml"/>
    16   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/e2fsprogs.xml"/>
    1716  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kernfs.xml"/>
    1817  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/chroot.xml"/>
  • BOOK/chroot/x86_64-chapter.xml

    r95620ac r9f61be5  
    1414  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
    1515  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux-ng.xml"/>
    16   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/e2fsprogs.xml"/>
    1716  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kernfs.xml"/>
    1817  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/chroot.xml"/>
  • BOOK/temp-system/native-chapter.xml

    r95620ac r9f61be5  
    2626  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/coreutils.xml"/>
    2727  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/diffutils.xml"/>
    28   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chroot/common/e2fsprogs.xml"/>
    2928  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/findutils.xml"/>
    3029  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>
  • BOOK/temp-system/native64-chapter.xml

    r95620ac r9f61be5  
    2626  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/coreutils.xml"/>
    2727  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/diffutils.xml"/>
    28   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../chroot/multilib/e2fsprogs.xml"/>
    2928  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/findutils.xml"/>
    3029  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/file.xml"/>
Note: See TracChangeset for help on using the changeset viewer.