[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, systemd, updated. clfs-2.1.0-913-ge611bb9
git
git at cross-lfs.org
Sat May 3 13:21:16 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, systemd has been updated
via e611bb934bfecacc4f4577638603b279eed59518 (commit)
via bd9950865221613ebbb58624200cb03db45c54a6 (commit)
from ba03323ad0b1d538e9d3ef1c37e82a85d464dc8f (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 e611bb934bfecacc4f4577638603b279eed59518
Author: Chris Staub <chris at beaker67.com>
Date: Sat May 3 16:21:12 2014 -0400
Fix compile error for colo and colo pages more readable
diff --git a/BOOK/boot/mips/colo-build.xml b/BOOK/boot/mips/colo-build.xml
index 68fec93..93fd18b 100644
--- a/BOOK/boot/mips/colo-build.xml
+++ b/BOOK/boot/mips/colo-build.xml
@@ -36,6 +36,13 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../final-system/mips/colo.xml"
+ xpointer="xpointer(//*[@os='s1'])"/>
+
+<screen os="s2"><userinput>cp -v stage2/Makefile{,.orig}
+sed '/^CFLAGS/s/-Werror //' stage2/Makefile.orig > stage2/Makefile</userinput></screen>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../../final-system/mips/colo.xml"
xpointer="xpointer(//*[@os='b'])"/>
<screen os="aa"><userinput>cd tools/elf2rfx
diff --git a/BOOK/boot/mips64/colo-build.xml b/BOOK/boot/mips64/colo-build.xml
index 8829582..83b1726 100644
--- a/BOOK/boot/mips64/colo-build.xml
+++ b/BOOK/boot/mips64/colo-build.xml
@@ -23,6 +23,10 @@
<title>Installation of Colo</title>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../mips/colo-build.xml"
+ xpointer="xpointer(//*[@os='a'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../../final-system/mips64/colo.xml"
xpointer="xpointer(//*[@os='p1'])"/>
@@ -40,7 +44,15 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../mips/colo-build.xml"
- xpointer="xpointer(//*[@os='a'])"/>
+ xpointer="xpointer(//*[@os='s1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../mips/colo-build.xml"
+ xpointer="xpointer(//*[@os='s2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../mips/colo-build.xml"
+ xpointer="xpointer(//*[@os='b'])"/>
<screen os="aa"><userinput>cd tools/elf2rfx
make CC=gcc
@@ -49,7 +61,7 @@ make CC="${CC} ${BUILD64}" CROSS_COMPILE="${CLFS_TARGET}-" binary</userinput></s
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../mips/colo-build.xml"
- xpointer="xpointer(//*[@os='b'])"/>
+ xpointer="xpointer(//*[@os='c'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../mips/colo-build.xml"
diff --git a/BOOK/final-system/mips/colo.xml b/BOOK/final-system/mips/colo.xml
index ae6de91..617b77d 100644
--- a/BOOK/final-system/mips/colo.xml
+++ b/BOOK/final-system/mips/colo.xml
@@ -34,6 +34,11 @@
<screen os="p4"><userinput>patch -Np1 -i ../&colo-relocation-patch;</userinput></screen>
+ <para os="s1">Disable -Werror in one of the <filename>Makefile</filename>s
+ to prevent a compile failure:</para>
+
+<screen os="s2"><userinput>sed -i '/^CFLAGS/s/-Werror //' stage2/Makefile</userinput></screen>
+
<para os="b">Compile the Colo package:</para>
<screen><userinput>make</userinput></screen>
diff --git a/BOOK/final-system/mips64/colo.xml b/BOOK/final-system/mips64/colo.xml
index f868f95..be7c450 100644
--- a/BOOK/final-system/mips64/colo.xml
+++ b/BOOK/final-system/mips64/colo.xml
@@ -21,6 +21,10 @@
<sect2 role="installation">
<title>Installation of Colo</title>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../mips/colo.xml"
+ xpointer="xpointer(//*[@os='a'])"/>
+
<para os="p1">This patch updates the Colo bootloader to build under
64 bit:</para>
@@ -36,7 +40,11 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../mips/colo.xml"
- xpointer="xpointer(//*[@os='a'])"/>
+ xpointer="xpointer(//*[@os='s1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../mips/colo.xml"
+ xpointer="xpointer(//*[@os='s2'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../mips/colo.xml"
diff --git a/BOOK/introduction/mips/changelog.xml b/BOOK/introduction/mips/changelog.xml
index 1ff8d5e..6caf00e 100644
--- a/BOOK/introduction/mips/changelog.xml
+++ b/BOOK/introduction/mips/changelog.xml
@@ -33,6 +33,16 @@
-->
<listitem>
+ <para>03 May 2014</para>
+ <itemizedlist>
+ <listitem>
+ <para>[Chris] - Added sed command to disable -Werror in one of
+ Colo's Makefiles to allow it to build.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>24 October 2013</para>
<itemizedlist>
<listitem>
diff --git a/BOOK/introduction/mips64-64/changelog.xml b/BOOK/introduction/mips64-64/changelog.xml
index cd1359e..2760676 100644
--- a/BOOK/introduction/mips64-64/changelog.xml
+++ b/BOOK/introduction/mips64-64/changelog.xml
@@ -33,6 +33,16 @@
-->
<listitem>
+ <para>03 May 2014</para>
+ <itemizedlist>
+ <listitem>
+ <para>[Chris] - Added sed command to disable -Werror in one of
+ Colo's Makefiles to allow it to build.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>24 October 2013</para>
<itemizedlist>
<listitem>
diff --git a/BOOK/introduction/mips64/changelog.xml b/BOOK/introduction/mips64/changelog.xml
index 7c1f55a..9ac8566 100644
--- a/BOOK/introduction/mips64/changelog.xml
+++ b/BOOK/introduction/mips64/changelog.xml
@@ -33,6 +33,16 @@
-->
<listitem>
+ <para>03 May 2014</para>
+ <itemizedlist>
+ <listitem>
+ <para>[Chris] - Added sed command to disable -Werror in one of
+ Colo's Makefiles to allow it to build.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>29 April 2014</para>
<itemizedlist>
<listitem>
commit bd9950865221613ebbb58624200cb03db45c54a6
Author: Chris Staub <chris at beaker67.com>
Date: Sat May 3 16:13:29 2014 -0400
Move creation of boot symlink for mips to a more appropriate place
diff --git a/BOOK/boot/mips/creatingdirs.xml b/BOOK/boot/mips/creatingdirs.xml
index bec5072..561ffef 100644
--- a/BOOK/boot/mips/creatingdirs.xml
+++ b/BOOK/boot/mips/creatingdirs.xml
@@ -18,6 +18,10 @@
href="../common/creatingdirs.xml"
xpointer="xpointer(//*[@os='b'])"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../common/creatingdirs.xml"
+ xpointer="xpointer(//*[@os='c'])"/>
+
<para>These entries are needed for the RaQ2 bootloader. Only use these
if you are utilizing the Colo bootloader:</para>
@@ -26,10 +30,6 @@ ln -svf . boot</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../common/creatingdirs.xml"
- xpointer="xpointer(//*[@os='c'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../common/creatingdirs.xml"
xpointer="xpointer(//*[@os='d'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-----------------------------------------------------------------------
Summary of changes:
BOOK/boot/mips/colo-build.xml | 7 +++++++
BOOK/boot/mips/creatingdirs.xml | 8 ++++----
BOOK/boot/mips64/colo-build.xml | 16 ++++++++++++++--
BOOK/final-system/mips/colo.xml | 5 +++++
BOOK/final-system/mips64/colo.xml | 10 +++++++++-
BOOK/introduction/mips/changelog.xml | 10 ++++++++++
BOOK/introduction/mips64-64/changelog.xml | 10 ++++++++++
BOOK/introduction/mips64/changelog.xml | 10 ++++++++++
8 files changed, 69 insertions(+), 7 deletions(-)
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list