[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, sysvinit, updated. clfs-2.1.0-1091-g227ae5a
git
git at cross-lfs.org
Thu May 22 23:33:45 PDT 2014
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cross-LFS Book".
The branch, sysvinit has been updated
via 227ae5aa78cc6d85074fb376763466a0c3eb722e (commit)
via 536910c5a7271deb8c43bd27d029f0c7d910b19f (commit)
via 8d9eb88cc2f8f884efe9169e0e6833ecae506653 (commit)
via a1e3e5a36f68637807317694b27195a3c5ef0085 (commit)
via e49c2121ec44cf561166f212874c75d7d3223199 (commit)
from b5c851aa01a2be0fba0063e306ea8ac5221fa91f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 227ae5aa78cc6d85074fb376763466a0c3eb722e
Author: Chris Staub <chris at beaker67.com>
Date: Fri May 23 02:31:44 2014 -0400
Added more explanatory text about rationale for including packages in the temp-system
diff --git a/BOOK/temp-system/64/check.xml b/BOOK/temp-system/64/check.xml
index 892f7b7..242ecbb 100644
--- a/BOOK/temp-system/64/check.xml
+++ b/BOOK/temp-system/64/check.xml
@@ -23,6 +23,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/check.xml"
+ xpointer="xpointer(//*[@os='a'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/check.xml"
xpointer="xpointer(//*[@os='c'])"/>
<screen os="d"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
diff --git a/BOOK/temp-system/64/ncurses.xml b/BOOK/temp-system/64/ncurses.xml
index 84ebd3d..f5a41f7 100644
--- a/BOOK/temp-system/64/ncurses.xml
+++ b/BOOK/temp-system/64/ncurses.xml
@@ -24,6 +24,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/ncurses.xml"
+ xpointer="xpointer(//*[@os='h'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/ncurses.xml"
xpointer="xpointer(//*[@os='p1'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/temp-system/64/zlib.xml b/BOOK/temp-system/64/zlib.xml
index b8ab7aa..71aeef1 100644
--- a/BOOK/temp-system/64/zlib.xml
+++ b/BOOK/temp-system/64/zlib.xml
@@ -24,6 +24,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/zlib.xml"
+ xpointer="xpointer(//*[@os='h'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/zlib.xml"
xpointer="xpointer(//*[@os='a'])"/>
<screen os="b"><userinput>CC="${CC} ${BUILD64}" \
diff --git a/BOOK/temp-system/common/check.xml b/BOOK/temp-system/common/check.xml
index 2a035bb..55b476d 100644
--- a/BOOK/temp-system/common/check.xml
+++ b/BOOK/temp-system/common/check.xml
@@ -24,6 +24,10 @@
<sect2 role="installation">
<title>Installation of Check</title>
+ <para os="a">We will install Check into
+ <filename class="directory">/tools</filename> to satisfy a dependency
+ on it for Kbd and Libpipeline in the final system.</para>
+
<para os="c">Prepare Check for compilation:</para>
<screen os="d"><userinput>./configure --prefix=/tools \
diff --git a/BOOK/temp-system/common/gettext.xml b/BOOK/temp-system/common/gettext.xml
index e58343f..7e08135 100644
--- a/BOOK/temp-system/common/gettext.xml
+++ b/BOOK/temp-system/common/gettext.xml
@@ -22,6 +22,10 @@
<sect2 role="installation">
<title>Installation of Gettext</title>
+ <para os="i">Many packages' installation procedures use the
+ <command>msgfmt</command> program for i18n support, so we will compile
+ and install it into <filename class="directory">/tools</filename>.</para>
+
<para os="a">Only the programs in the
<filename class="directory">gettext-tools</filename> directory need to be
installed for the temp-system:</para>
diff --git a/BOOK/temp-system/common/ncurses.xml b/BOOK/temp-system/common/ncurses.xml
index 70543a7..ba0647a 100644
--- a/BOOK/temp-system/common/ncurses.xml
+++ b/BOOK/temp-system/common/ncurses.xml
@@ -22,6 +22,9 @@
<sect2 role="installation">
<title>Installation of Ncurses</title>
+ <para os="h">We will need Ncurses for several other packages in the
+ temporary environment, including Bash, Util-linux, and Vim.</para>
+
<para os="p1">The following patch fixes an issue with some Bash versions:</para>
<screen os="p2"><userinput>patch -Np1 -i ../&ncurses-bashfix-patch;</userinput></screen>
diff --git a/BOOK/temp-system/common/vim.xml b/BOOK/temp-system/common/vim.xml
index 72460c3..279ab4d 100644
--- a/BOOK/temp-system/common/vim.xml
+++ b/BOOK/temp-system/common/vim.xml
@@ -22,6 +22,15 @@
<sect2 role="installation">
<title>Installation of VIM</title>
+ <para os="a">We will cross-compile Vim so that we can have a text editor in
+ <filename class="directory">/tools</filename>. Vim is not technically
+ necessary in the temporary system, in that it is not there to satisfy any
+ package dependencies in the final system, but we believe that a text editor
+ is an extremely useful tool to have there.<!-- If you prefer a different
+ editor, you may check the hints project at <ulink url="&hints-root;" />
+ for information on cross-compiling other text editors. (placeholder -
+ uncomment this sentence if/when such information actually exists)--></para>
+
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../final-system/common/vim.xml"
xpointer="xpointer(//*[@os='p1'])"/>
diff --git a/BOOK/temp-system/common/zlib.xml b/BOOK/temp-system/common/zlib.xml
index ca53b89..fe3674c 100644
--- a/BOOK/temp-system/common/zlib.xml
+++ b/BOOK/temp-system/common/zlib.xml
@@ -22,6 +22,10 @@
<sect2 role="installation">
<title>Installation of Zlib</title>
+ <para os="h">Several packages in the temporary system use Zlib,
+ including Binutils, GCC, and Util-linux, so we will add it to
+ <filename class="directory">/tools</filename>.</para>
+
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../final-system/common/zlib.xml"
xpointer="xpointer(//*[@os='a'])"/>
diff --git a/BOOK/temp-system/multilib/check.xml b/BOOK/temp-system/multilib/check.xml
index b5eb933..675b62d 100644
--- a/BOOK/temp-system/multilib/check.xml
+++ b/BOOK/temp-system/multilib/check.xml
@@ -23,6 +23,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/check.xml"
+ xpointer="xpointer(//*[@os='a'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/check.xml"
xpointer="xpointer(//*[@os='c'])"/>
<screen os="d"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
diff --git a/BOOK/temp-system/multilib/gettext.xml b/BOOK/temp-system/multilib/gettext.xml
index 502013c..8f9b8d3 100644
--- a/BOOK/temp-system/multilib/gettext.xml
+++ b/BOOK/temp-system/multilib/gettext.xml
@@ -24,6 +24,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/gettext.xml"
+ xpointer="xpointer(//*[@os='i'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/gettext.xml"
xpointer="xpointer(//*[@os='a'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/temp-system/multilib/ncurses.xml b/BOOK/temp-system/multilib/ncurses.xml
index 63e6f4c..69448ec 100644
--- a/BOOK/temp-system/multilib/ncurses.xml
+++ b/BOOK/temp-system/multilib/ncurses.xml
@@ -24,6 +24,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/ncurses.xml"
+ xpointer="xpointer(//*[@os='h'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/ncurses.xml"
xpointer="xpointer(//*[@os='p1'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/temp-system/multilib/vim.xml b/BOOK/temp-system/multilib/vim.xml
index 12b4cac..58eb21b 100644
--- a/BOOK/temp-system/multilib/vim.xml
+++ b/BOOK/temp-system/multilib/vim.xml
@@ -24,6 +24,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/vim.xml"
+ xpointer="xpointer(//*[@os='a'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/vim.xml"
xpointer="xpointer(//*[@os='p1'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/temp-system/multilib/zlib.xml b/BOOK/temp-system/multilib/zlib.xml
index 8928d41..1bd1e61 100644
--- a/BOOK/temp-system/multilib/zlib.xml
+++ b/BOOK/temp-system/multilib/zlib.xml
@@ -24,6 +24,10 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/zlib.xml"
+ xpointer="xpointer(//*[@os='h'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/zlib.xml"
xpointer="xpointer(//*[@os='a'])"/>
<screen os="b"><userinput>CC="${CC} ${BUILD64}" \
commit 536910c5a7271deb8c43bd27d029f0c7d910b19f
Author: Chris Staub <chris at beaker67.com>
Date: Fri May 23 02:25:36 2014 -0400
Swapped file and linux-headers order in cross-tools
Conflicts:
BOOK/introduction/common/changelog.xml
diff --git a/BOOK/cross-tools/mips-chapter.xml b/BOOK/cross-tools/mips-chapter.xml
index d9c8f28..37f6370 100644
--- a/BOOK/cross-tools/mips-chapter.xml
+++ b/BOOK/cross-tools/mips-chapter.xml
@@ -13,8 +13,8 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.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="mips/linux-headers.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="mips/linux-headers.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/ncurses.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
diff --git a/BOOK/cross-tools/mips64-64-chapter.xml b/BOOK/cross-tools/mips64-64-chapter.xml
index ae2818b..b66893b 100644
--- a/BOOK/cross-tools/mips64-64-chapter.xml
+++ b/BOOK/cross-tools/mips64-64-chapter.xml
@@ -13,8 +13,8 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.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="mips/linux-headers.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="mips/linux-headers.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/ncurses.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
diff --git a/BOOK/cross-tools/mips64-chapter.xml b/BOOK/cross-tools/mips64-chapter.xml
index 3d1bcce..aac5684 100644
--- a/BOOK/cross-tools/mips64-chapter.xml
+++ b/BOOK/cross-tools/mips64-chapter.xml
@@ -13,8 +13,8 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.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="mips/linux-headers.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="mips/linux-headers.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/ncurses.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/pkg-config-lite.xml"/>
diff --git a/BOOK/cross-tools/ppc-chapter.xml b/BOOK/cross-tools/ppc-chapter.xml
index 56ead83..bf9cd84 100644
--- a/BOOK/cross-tools/ppc-chapter.xml
+++ b/BOOK/cross-tools/ppc-chapter.xml
@@ -13,8 +13,8 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.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="ppc/linux-headers.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="ppc/linux-headers.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/ncurses.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
diff --git a/BOOK/cross-tools/ppc64-64-chapter.xml b/BOOK/cross-tools/ppc64-64-chapter.xml
index f4833bd..8aad23b 100644
--- a/BOOK/cross-tools/ppc64-64-chapter.xml
+++ b/BOOK/cross-tools/ppc64-64-chapter.xml
@@ -13,8 +13,8 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.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="ppc/linux-headers.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="ppc/linux-headers.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/ncurses.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
diff --git a/BOOK/cross-tools/ppc64-chapter.xml b/BOOK/cross-tools/ppc64-chapter.xml
index 44fbd70..e7dcd77 100644
--- a/BOOK/cross-tools/ppc64-chapter.xml
+++ b/BOOK/cross-tools/ppc64-chapter.xml
@@ -13,8 +13,8 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.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="ppc/linux-headers.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="ppc/linux-headers.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/ncurses.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/pkg-config-lite.xml"/>
diff --git a/BOOK/cross-tools/sparc-chapter.xml b/BOOK/cross-tools/sparc-chapter.xml
index e6e38da..80a2eb5 100644
--- a/BOOK/cross-tools/sparc-chapter.xml
+++ b/BOOK/cross-tools/sparc-chapter.xml
@@ -13,8 +13,8 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.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="sparc/linux-headers.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="sparc/linux-headers.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/ncurses.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
diff --git a/BOOK/cross-tools/sparc64-64-chapter.xml b/BOOK/cross-tools/sparc64-64-chapter.xml
index 1ee9a06..e2f2af4 100644
--- a/BOOK/cross-tools/sparc64-64-chapter.xml
+++ b/BOOK/cross-tools/sparc64-64-chapter.xml
@@ -13,8 +13,8 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.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="sparc64/linux-headers.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="sparc64/linux-headers.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/ncurses.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
diff --git a/BOOK/cross-tools/sparc64-chapter.xml b/BOOK/cross-tools/sparc64-chapter.xml
index 96f1e9e..fbd9726 100644
--- a/BOOK/cross-tools/sparc64-chapter.xml
+++ b/BOOK/cross-tools/sparc64-chapter.xml
@@ -13,8 +13,8 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.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="sparc64/linux-headers.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="sparc64/linux-headers.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/ncurses.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/pkg-config-lite.xml"/>
diff --git a/BOOK/cross-tools/x86-chapter.xml b/BOOK/cross-tools/x86-chapter.xml
index b7d4a75..d730075 100644
--- a/BOOK/cross-tools/x86-chapter.xml
+++ b/BOOK/cross-tools/x86-chapter.xml
@@ -13,8 +13,8 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.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="x86/linux-headers.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="x86/linux-headers.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/ncurses.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
diff --git a/BOOK/cross-tools/x86_64-64-chapter.xml b/BOOK/cross-tools/x86_64-64-chapter.xml
index 91f126e..55c6dda 100644
--- a/BOOK/cross-tools/x86_64-64-chapter.xml
+++ b/BOOK/cross-tools/x86_64-64-chapter.xml
@@ -13,8 +13,8 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.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="x86_64/linux-headers.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="x86_64/linux-headers.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/ncurses.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/pkg-config-lite.xml"/>
diff --git a/BOOK/cross-tools/x86_64-chapter.xml b/BOOK/cross-tools/x86_64-chapter.xml
index 0343b20..2990568 100644
--- a/BOOK/cross-tools/x86_64-chapter.xml
+++ b/BOOK/cross-tools/x86_64-chapter.xml
@@ -13,8 +13,8 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.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="x86_64/linux-headers.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="x86_64/linux-headers.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/ncurses.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/pkg-config-lite.xml"/>
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index f204024..9ddd97f 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -43,6 +43,11 @@
<para>[Chris] - Removed xgettext and msgmerge from temp-system
Gettext - those are only needed for ACL/Attr.</para>
</listitem>
+ <listitem>
+ <para>[Chris] - Swapped build order of Linux-headers and File in
+ Cross-Tools - no particular reason for File to be after
+ Linux-headers, so just make them alphabetical.</para>
+ </listitem>
</itemizedlist>
</listitem>
commit 8d9eb88cc2f8f884efe9169e0e6833ecae506653
Author: Chris Staub <chris at beaker67.com>
Date: Fri May 23 01:22:21 2014 -0400
Replaced command with xinclude from final system
diff --git a/BOOK/temp-system/common/zlib.xml b/BOOK/temp-system/common/zlib.xml
index dc6224a..ca53b89 100644
--- a/BOOK/temp-system/common/zlib.xml
+++ b/BOOK/temp-system/common/zlib.xml
@@ -40,7 +40,9 @@
href="../../final-system/common/zlib.xml"
xpointer="xpointer(//*[@os='f'])"/>
-<screen os="g"><userinput>make install</userinput></screen>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../../final-system/common/zlib.xml"
+ xpointer="xpointer(//*[@os='g'])"/>
</sect2>
commit a1e3e5a36f68637807317694b27195a3c5ef0085
Author: Chris Staub <chris at beaker67.com>
Date: Fri May 23 01:19:44 2014 -0400
Another grammer fix
diff --git a/BOOK/temp-system/multilib/gmp.xml b/BOOK/temp-system/multilib/gmp.xml
index 855958a..50c77bf 100644
--- a/BOOK/temp-system/multilib/gmp.xml
+++ b/BOOK/temp-system/multilib/gmp.xml
@@ -46,7 +46,7 @@
--libdir=/tools/lib64 --enable-cxx</userinput></screen>
<variablelist os="ca">
- <title>The meaning of the new configure option:</title>
+ <title>The meaning of the new configure options:</title>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/gmp.xml"
commit e49c2121ec44cf561166f212874c75d7d3223199
Author: Chris Staub <chris at beaker67.com>
Date: Fri May 23 01:18:34 2014 -0400
Grammar correction
diff --git a/BOOK/temp-system/common/gmp.xml b/BOOK/temp-system/common/gmp.xml
index ed6f1ad..fd871b9 100644
--- a/BOOK/temp-system/common/gmp.xml
+++ b/BOOK/temp-system/common/gmp.xml
@@ -33,7 +33,7 @@
-->
<para os="a">As with the Cross-Tools, we will compile GMP, MPFR, MPC, ISL,
- and CLooG so that GCC can use them. though this time we will
+ and CLooG so that GCC can use them, though this time we will
cross-compile them into <filename class="directory">/tools</filename>.</para>
<para os="b">Prepare GMP for compilation:</para>
-----------------------------------------------------------------------
Summary of changes:
BOOK/cross-tools/mips-chapter.xml | 2 +-
BOOK/cross-tools/mips64-64-chapter.xml | 2 +-
BOOK/cross-tools/mips64-chapter.xml | 2 +-
BOOK/cross-tools/ppc-chapter.xml | 2 +-
BOOK/cross-tools/ppc64-64-chapter.xml | 2 +-
BOOK/cross-tools/ppc64-chapter.xml | 2 +-
BOOK/cross-tools/sparc-chapter.xml | 2 +-
BOOK/cross-tools/sparc64-64-chapter.xml | 2 +-
BOOK/cross-tools/sparc64-chapter.xml | 2 +-
BOOK/cross-tools/x86-chapter.xml | 2 +-
BOOK/cross-tools/x86_64-64-chapter.xml | 2 +-
BOOK/cross-tools/x86_64-chapter.xml | 2 +-
BOOK/introduction/common/changelog.xml | 5 +++++
BOOK/temp-system/64/check.xml | 4 ++++
BOOK/temp-system/64/ncurses.xml | 4 ++++
BOOK/temp-system/64/zlib.xml | 4 ++++
BOOK/temp-system/common/check.xml | 4 ++++
BOOK/temp-system/common/gettext.xml | 4 ++++
BOOK/temp-system/common/gmp.xml | 2 +-
BOOK/temp-system/common/ncurses.xml | 3 +++
BOOK/temp-system/common/vim.xml | 9 +++++++++
BOOK/temp-system/common/zlib.xml | 8 +++++++-
BOOK/temp-system/multilib/check.xml | 4 ++++
BOOK/temp-system/multilib/gettext.xml | 4 ++++
BOOK/temp-system/multilib/gmp.xml | 2 +-
BOOK/temp-system/multilib/ncurses.xml | 4 ++++
BOOK/temp-system/multilib/vim.xml | 4 ++++
BOOK/temp-system/multilib/zlib.xml | 4 ++++
28 files changed, 78 insertions(+), 15 deletions(-)
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list