Changeset 229ed25 for BOOK/final-system/mips-chapter.xml

Timestamp:

Jan 4, 2014, 12:03:38 AM (10 years ago)

Author:

Chris Staub <chris@…>

Branches:

clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

f90d077

Parents:

ec008670 (diff), e57ce38 (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/boot/common/devices.xml
BOOK/boot/common/pwdgroup.xml
BOOK/boot/ppc64-64/powerpc-utils.xml
BOOK/boot/ppc64/util-linux-32.xml
BOOK/bootscripts/common/bootscripts.xml
BOOK/final-system/alpha-chapter.xml
BOOK/final-system/common/coreutils.xml
BOOK/final-system/common/eudev.xml
BOOK/final-system/common/kbd.xml
BOOK/final-system/mips-chapter.xml
BOOK/final-system/mips64-64-chapter.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/udev-64bit.xml
BOOK/final-system/multilib/util-linux.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/introduction/common/changelog.xml
BOOK/materials/common/packages.xml
BOOK/packages.ent

File:

• BOOK/final-system/mips-chapter.xml (modified) (5 diffs)

BOOK/final-system/mips-chapter.xml

@@ -23 +23 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ppl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cloog-ppl.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/isl.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cloog.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/zlib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gcc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/glib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/shadow.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/util-linux.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/procps.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/e2fsprogs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/coreutils.xml"/>
@@ -38 +39 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/m4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bison.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/procps.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libtool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/flex.xml"/>
@@ -48 +48 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/automake.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bash.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/diffutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gawk.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gawk.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gettext.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/groff.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/less.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gzip.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iputils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kbd.xml"/>
+<<<<<<< HEAD
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/less.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libcap.xml"/>
@@ -66 +69 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/expat.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/dbus.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/module-init-tools.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
@@ -76 +79 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/udev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/vim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/colo.xml"/>