Changeset 03e6a40 for BOOK/final-system/sparc-chapter.xml

Timestamp:

Apr 20, 2014, 8:57:39 AM (11 years ago)

Author:

Chris Staub <chris@…>

Children:

0be79ea

Parents:

88ef769 (diff), 578ca586 (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 'systemd' into simp

Conflicts:

BOOK/final-system/common/bash.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/bash.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/general.ent
BOOK/packages.ent
BOOK/temp-system/common/bash.xml
BOOK/temp-system/mips64-64-chapter.xml
BOOK/temp-system/mips64-chapter.xml
BOOK/temp-system/multilib/bash.xml
BOOK/temp-system/ppc64-64-chapter.xml
BOOK/temp-system/ppc64-chapter.xml
BOOK/temp-system/sparc64-64-chapter.xml
BOOK/temp-system/sparc64-chapter.xml
BOOK/temp-system/x86_64-64-chapter.xml
BOOK/temp-system/x86_64-chapter.xml

File:

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

BOOK/final-system/sparc-chapter.xml

@@ -18 +18 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/linux-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man-pages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/eglibc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/glibc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/adjusting.xml"/>
+  <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/gmp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/mpfr.xml"/>
@@ -26 +27 @@
   <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/flex.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/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="common/attr.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/acl.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"/>
@@ -33 +38 @@
   <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/procps-ng.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/libcap.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/coreutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iana-etc.xml"/>
-  <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/libtool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/flex.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/iproute2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/perl.xml"/>
@@ -54 +57 @@
   <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/gettext.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/gperf.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"/>
@@ -63 +67 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/man.xml"/>
+  <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/xml-parser.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/intltool.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"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libestr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libee.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/rsyslog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/sysvinit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd.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/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/eudev.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="sparc/elftoaout.xml"/>