[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. clfs-2.1.0-1248-gefe4145
git
git at cross-lfs.org
Wed Jun 11 08:39:57 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, master has been updated
via efe41453e2454849ef554deeee62e6597556e3d9 (commit)
via bb0285e3d52f0778c5c0f89b59dbb90ab799b029 (commit)
via 5b192dc0160f6160c772662371ec12f2101fd755 (commit)
via 704051ee2db6534c2798d4e63fedc654c68feb92 (commit)
from 782606bd5ad30313b050393ca073d6e6bb6794a9 (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 efe41453e2454849ef554deeee62e6597556e3d9
Merge: bb0285e 782606b
Author: Chris Staub <chris at beaker67.com>
Date: Wed Jun 11 11:39:49 2014 -0400
Merge branch 'master' of git.cross-lfs.org:cross-lfs
Conflicts:
BOOK/introduction/common/changelog.xml
diff --cc BOOK/introduction/common/changelog.xml
index 4f7adf4,5d91e37..86b8a46
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@@ -37,14 -37,14 +37,24 @@@
-->
<listitem>
+ <para>11 June 2014</para>
+ <itemizedlist>
+ <listitem>
+ <para>[Chris] - Placed file before findutils in temp-system.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
++
++ <listitem>
+ <para>10 June 2014</para>
+ <itemizedlist>
+ <listitem>
+ <para>[William Harrington] - Upgraded Gettext to 0.19.1.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
<listitem>
<para>04 June 2014</para>
<itemizedlist>
commit bb0285e3d52f0778c5c0f89b59dbb90ab799b029
Author: Chris Staub <chris at beaker67.com>
Date: Wed Jun 11 11:33:55 2014 -0400
Swap file and findutils in temp-system
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index 82e1ae4..4f7adf4 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -37,6 +37,15 @@
-->
<listitem>
+ <para>11 June 2014</para>
+ <itemizedlist>
+ <listitem>
+ <para>[Chris] - Placed file before findutils in temp-system.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>04 June 2014</para>
<itemizedlist>
<listitem>
diff --git a/BOOK/temp-system/mips-chapter.xml b/BOOK/temp-system/mips-chapter.xml
index 77d4fc9..d2ca5cc 100644
--- a/BOOK/temp-system/mips-chapter.xml
+++ b/BOOK/temp-system/mips-chapter.xml
@@ -27,8 +27,8 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/check.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/diffutils.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/file.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"/>
diff --git a/BOOK/temp-system/mips64-64-chapter.xml b/BOOK/temp-system/mips64-64-chapter.xml
index a71b61f..919c5d3 100644
--- a/BOOK/temp-system/mips64-64-chapter.xml
+++ b/BOOK/temp-system/mips64-64-chapter.xml
@@ -27,8 +27,8 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/check.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/diffutils.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/file.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"/>
diff --git a/BOOK/temp-system/mips64-chapter.xml b/BOOK/temp-system/mips64-chapter.xml
index 9f42e0b..7c74218 100644
--- a/BOOK/temp-system/mips64-chapter.xml
+++ b/BOOK/temp-system/mips64-chapter.xml
@@ -27,8 +27,8 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/check.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/diffutils.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="multilib/file.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"/>
diff --git a/BOOK/temp-system/ppc-chapter.xml b/BOOK/temp-system/ppc-chapter.xml
index 987b169..022ae30 100644
--- a/BOOK/temp-system/ppc-chapter.xml
+++ b/BOOK/temp-system/ppc-chapter.xml
@@ -26,8 +26,8 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/check.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/diffutils.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/file.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"/>
diff --git a/BOOK/temp-system/ppc64-64-chapter.xml b/BOOK/temp-system/ppc64-64-chapter.xml
index b19e2f1..2de131e 100644
--- a/BOOK/temp-system/ppc64-64-chapter.xml
+++ b/BOOK/temp-system/ppc64-64-chapter.xml
@@ -27,8 +27,8 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/check.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/diffutils.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/file.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"/>
diff --git a/BOOK/temp-system/ppc64-chapter.xml b/BOOK/temp-system/ppc64-chapter.xml
index 318818b..6da603d 100644
--- a/BOOK/temp-system/ppc64-chapter.xml
+++ b/BOOK/temp-system/ppc64-chapter.xml
@@ -26,8 +26,8 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/check.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/diffutils.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="multilib/file.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"/>
diff --git a/BOOK/temp-system/sparc64-64-chapter.xml b/BOOK/temp-system/sparc64-64-chapter.xml
index 04061a8..83faa4f 100644
--- a/BOOK/temp-system/sparc64-64-chapter.xml
+++ b/BOOK/temp-system/sparc64-64-chapter.xml
@@ -27,8 +27,8 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/check.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/diffutils.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/file.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"/>
diff --git a/BOOK/temp-system/sparc64-chapter.xml b/BOOK/temp-system/sparc64-chapter.xml
index 02e6f00..6f334a4 100644
--- a/BOOK/temp-system/sparc64-chapter.xml
+++ b/BOOK/temp-system/sparc64-chapter.xml
@@ -27,8 +27,8 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/check.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/diffutils.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="multilib/file.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"/>
diff --git a/BOOK/temp-system/x86-chapter.xml b/BOOK/temp-system/x86-chapter.xml
index 77d4fc9..d2ca5cc 100644
--- a/BOOK/temp-system/x86-chapter.xml
+++ b/BOOK/temp-system/x86-chapter.xml
@@ -27,8 +27,8 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/check.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/diffutils.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/file.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"/>
diff --git a/BOOK/temp-system/x86_64-64-chapter.xml b/BOOK/temp-system/x86_64-64-chapter.xml
index 04061a8..83faa4f 100644
--- a/BOOK/temp-system/x86_64-64-chapter.xml
+++ b/BOOK/temp-system/x86_64-64-chapter.xml
@@ -27,8 +27,8 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/check.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/diffutils.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/file.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"/>
diff --git a/BOOK/temp-system/x86_64-chapter.xml b/BOOK/temp-system/x86_64-chapter.xml
index 02e6f00..6f334a4 100644
--- a/BOOK/temp-system/x86_64-chapter.xml
+++ b/BOOK/temp-system/x86_64-chapter.xml
@@ -27,8 +27,8 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/check.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/diffutils.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="multilib/file.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"/>
commit 5b192dc0160f6160c772662371ec12f2101fd755
Author: Chris Staub <chris at beaker67.com>
Date: Wed Jun 11 11:33:33 2014 -0400
Use correct xinclude for temp-system vim
diff --git a/BOOK/temp-system/common/vim.xml b/BOOK/temp-system/common/vim.xml
index 1d9bf82..f6a6742 100644
--- a/BOOK/temp-system/common/vim.xml
+++ b/BOOK/temp-system/common/vim.xml
@@ -119,9 +119,9 @@ EOF</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../final-system/common/vim.xml"
- xpointer="xpointer(//*[@os='l'])"/>
+ xpointer="xpointer(//*[@os='m'])"/>
-<screen os="m"><userinput>ln -sv vim /tools/bin/vi</userinput></screen>
+<screen os="n"><userinput>ln -sv vim /tools/bin/vi</userinput></screen>
<para os="tv1">Create a temporary vimrc to make it function more the way you may
expect it to. This is explained more in the final system:</para>
commit 704051ee2db6534c2798d4e63fedc654c68feb92
Author: Chris Staub <chris at beaker67.com>
Date: Wed Jun 11 11:04:28 2014 -0400
Updated date
diff --git a/BOOK/general.ent b/BOOK/general.ent
index a498461..8d573b6 100644
--- a/BOOK/general.ent
+++ b/BOOK/general.ent
@@ -2,7 +2,7 @@
<!ENTITY month "06"> <!-- Use two digits -->
<!ENTITY month_name "June">
-<!ENTITY day "10"> <!-- Use two digits -->
+<!ENTITY day "11"> <!-- Use two digits -->
<!ENTITY year "2014"> <!-- Use four digits -->
<!ENTITY releasedate "&month_name; &day;, &year;">
-----------------------------------------------------------------------
Summary of changes:
BOOK/general.ent | 2 +-
BOOK/introduction/common/changelog.xml | 10 ++++++++++
BOOK/temp-system/common/vim.xml | 4 ++--
BOOK/temp-system/mips-chapter.xml | 2 +-
BOOK/temp-system/mips64-64-chapter.xml | 2 +-
BOOK/temp-system/mips64-chapter.xml | 2 +-
BOOK/temp-system/ppc-chapter.xml | 2 +-
BOOK/temp-system/ppc64-64-chapter.xml | 2 +-
BOOK/temp-system/ppc64-chapter.xml | 2 +-
BOOK/temp-system/sparc64-64-chapter.xml | 2 +-
BOOK/temp-system/sparc64-chapter.xml | 2 +-
BOOK/temp-system/x86-chapter.xml | 2 +-
BOOK/temp-system/x86_64-64-chapter.xml | 2 +-
BOOK/temp-system/x86_64-chapter.xml | 2 +-
14 files changed, 24 insertions(+), 14 deletions(-)
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list