[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, clfs-1.2, updated. a5f7c53ee3c0559bd3d09bf3ae4ae85e7dd5eec0
git
git at cross-lfs.org
Fri Jan 20 02:37:34 PST 2012
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, clfs-1.2 has been updated
via a5f7c53ee3c0559bd3d09bf3ae4ae85e7dd5eec0 (commit)
from 79e7622886e3c452d04607e1d1b08eb7e1d2bad7 (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 a5f7c53ee3c0559bd3d09bf3ae4ae85e7dd5eec0
Author: Jonathan Norman <jon at cosmo1847.co.uk>
Date: Fri Jan 20 10:37:22 2012 +0000
Updated Yaboot from 1.3.14 to 1.3.17 with thanks to Code Monkey.
diff --git a/BOOK/boot/ppc/yaboot-build.xml b/BOOK/boot/ppc/yaboot-build.xml
index 641440c..1fd922c 100644
--- a/BOOK/boot/ppc/yaboot-build.xml
+++ b/BOOK/boot/ppc/yaboot-build.xml
@@ -32,12 +32,14 @@
but it will try to use <command>strip</command> to strip the second-stage
loader. It also tries to change user and group ownership for the installed
files to <systemitem class="username">root</systemitem>, which the
- <systemitem class="username">clfs</systemitem> user cannot do. The following
- command fixes both issues:</para>
+ <systemitem class="username">clfs</systemitem> user cannot do. It will also
+ fail due to a compile warning with the -Werror flag on. The following
+ command fixes these issues:</para>
<screen><userinput>cp -v Makefile{,.orig}
sed -e "s/\(strip \)/${CLFS_TARGET}-\1/" \
-e 's/-o root -g root//' \
+ -e 's/-Werror//' \
Makefile.orig > Makefile</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/boot/ppc64/yaboot-build.xml b/BOOK/boot/ppc64/yaboot-build.xml
index 8558c95..d6b5f09 100644
--- a/BOOK/boot/ppc64/yaboot-build.xml
+++ b/BOOK/boot/ppc64/yaboot-build.xml
@@ -42,6 +42,7 @@ sed -e "s/\(-print-libgcc-file-name\)/${BUILD32} \1/" \
-e "s/\(-Bstatic\)/-melf32ppclinux \1/" \
-e "s/\(strip \)/${CLFS_TARGET}-\1/" \
-e 's/-o root -g root//' \
+ -e 's/-Werror//' \
Makefile.orig > Makefile</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-system/ppc/yaboot.xml b/BOOK/final-system/ppc/yaboot.xml
index 8ad5108..f205d8e 100644
--- a/BOOK/final-system/ppc/yaboot.xml
+++ b/BOOK/final-system/ppc/yaboot.xml
@@ -31,6 +31,11 @@
<screen os="b"><userinput>sed -i 's%/usr/local%/usr%' man/*</userinput></screen>
+ <para os="aa"> Prevent the build from failing due to warnings with
+ the following sed:</para>
+
+<screen os="ba"><userinput>sed -i 's%-Werror%%' Makefile</userinput></screen>
+
<para os="c">Compile the package:</para>
<screen os="d"><userinput>make PREFIX=/usr</userinput></screen>
diff --git a/BOOK/final-system/ppc64/yaboot.xml b/BOOK/final-system/ppc64/yaboot.xml
index d0d41ab..712dd4e 100644
--- a/BOOK/final-system/ppc64/yaboot.xml
+++ b/BOOK/final-system/ppc64/yaboot.xml
@@ -23,11 +23,14 @@
<para>Existing multilib distributions alter gcc to default to 32-bit
output. Because our gcc defaults to 64-bit, we need to pass appropriate
- options to both the compiler and the linker. The Makefile already
- overrides any CC and ignores LDFLAGS in favour of its own variables, so we
- need to use the following seds for a successful compile and install.</para>
+ options to both the compiler and the linker. To prevent the build from
+ failing due to compiler warnings, the -Werror flag is removed. The
+ Makefile already overrides any CC and ignores LDFLAGS in favour of
+ its own variables, so we need to use the following seds for a
+ successful compile and install.</para>
<screen><userinput>sed -i -e "s/\(-print-libgcc-file-name\)/${BUILD32} \1/" \
+ -e "s/-Werror//" \
-e "s/\(-Bstatic\)/-melf32ppclinux \1/" Makefile
</userinput></screen>
@@ -43,6 +46,12 @@
</listitem>
</varlistentry>
<varlistentry>
+ <term><parameter>"s/-Werror//"</parameter></term>
+ <listitem>
+ <para>This deletes the -Werror flag from the Makefile.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
<term><parameter>"s/\(-Bstatic\)/-melf32ppclinux \1/"</parameter></term>
<listitem>
<para>This picks the end of the LFLAGS which the Makefile passes to
diff --git a/BOOK/introduction/ppc/changelog.xml b/BOOK/introduction/ppc/changelog.xml
index 1fa2af1..f3d8261 100644
--- a/BOOK/introduction/ppc/changelog.xml
+++ b/BOOK/introduction/ppc/changelog.xml
@@ -32,6 +32,14 @@
</listitem>
-->
+ <listitem>
+ <para>January 20, 2012</para>
+ <itemizedlist>
+ <listitem>
+ <para>[Jonathan] - Updated Yaboot from 1.3.14 to 1.3.17 thanks to Code Monkey.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
<listitem>
<para>August 28, 2010</para>
diff --git a/BOOK/introduction/ppc64/changelog.xml b/BOOK/introduction/ppc64/changelog.xml
index 8b855de..142ff49 100644
--- a/BOOK/introduction/ppc64/changelog.xml
+++ b/BOOK/introduction/ppc64/changelog.xml
@@ -32,6 +32,14 @@
</listitem>
-->
+ <listitem>
+ <para>January 20, 2012</para>
+ <itemizedlist>
+ <listitem>
+ <para>[Jonathan] - Updated Yaboot from 1.3.14 to 1.3.17 thanks to Code Monkey.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
<listitem>
<para>June 15, 2011</para>
diff --git a/BOOK/packages.ent b/BOOK/packages.ent
index 8c424de..ac9f871 100644
--- a/BOOK/packages.ent
+++ b/BOOK/packages.ent
@@ -460,10 +460,10 @@
<!ENTITY xz-md5 "ee05b17a4062bb55cba099ef46eca007">
<!ENTITY xz-home "http://tukaani.org/xz/">
-<!ENTITY yaboot-version "1.3.14">
-<!ENTITY yaboot-size "213 KB">
+<!ENTITY yaboot-version "1.3.17">
+<!ENTITY yaboot-size "219 KB">
<!ENTITY yaboot-url "http://yaboot.ozlabs.org/releases/yaboot-&yaboot-version;.tar.gz">
-<!ENTITY yaboot-md5 "9b1246c474eeb37f61081ad762563b35">
+<!ENTITY yaboot-md5 "f599f52d1887a86fd798252d2946f635">
<!ENTITY yaboot-home "http://yaboot.ozlabs.org">
<!ENTITY zlib-version "1.2.5">
diff --git a/patches/yaboot-1.3.14-ofpath_path_prefix-1.patch b/patches/yaboot-1.3.17-ofpath_path_prefix-1.patch
similarity index 100%
rename from patches/yaboot-1.3.14-ofpath_path_prefix-1.patch
rename to patches/yaboot-1.3.17-ofpath_path_prefix-1.patch
-----------------------------------------------------------------------
Summary of changes:
BOOK/boot/ppc/yaboot-build.xml | 6 ++++--
BOOK/boot/ppc64/yaboot-build.xml | 1 +
BOOK/final-system/ppc/yaboot.xml | 5 +++++
BOOK/final-system/ppc64/yaboot.xml | 15 ++++++++++++---
BOOK/introduction/ppc/changelog.xml | 8 ++++++++
BOOK/introduction/ppc64/changelog.xml | 8 ++++++++
BOOK/packages.ent | 6 +++---
...ch => yaboot-1.3.17-ofpath_path_prefix-1.patch} | 0
8 files changed, 41 insertions(+), 8 deletions(-)
rename patches/{yaboot-1.3.14-ofpath_path_prefix-1.patch => yaboot-1.3.17-ofpath_path_prefix-1.patch} (100%)
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list