[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. clfs-2.0.0-311-g7357219
git
git at cross-lfs.org
Thu Aug 22 09:18:27 PDT 2013
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 735721942b41e6d7f5b79b34d9108151a5f19759 (commit)
via 058c18ab494345fe85159b52128ebe15aec58c6b (commit)
from bafe4be5930e2a57695d214f2d8c3a6287f666df (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 735721942b41e6d7f5b79b34d9108151a5f19759
Author: William Harrington <kb0iic at berzerkula.org>
Date: Thu Aug 22 11:18:19 2013 -0500
Fix yaboot commands for pure64 build.
diff --git a/BOOK/final-system/ppc64-64-chapter.xml b/BOOK/final-system/ppc64-64-chapter.xml
index ee838b1..64e9276 100644
--- a/BOOK/final-system/ppc64-64-chapter.xml
+++ b/BOOK/final-system/ppc64-64-chapter.xml
@@ -76,7 +76,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/hfsutils.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/parted.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/powerpc-utils.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/yaboot.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64-64/yaboot.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/aboutdebug.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/stripping.xml"/>
diff --git a/BOOK/final-system/ppc64-64/yaboot.xml b/BOOK/final-system/ppc64-64/yaboot.xml
new file mode 100644
index 0000000..c682212
--- /dev/null
+++ b/BOOK/final-system/ppc64-64/yaboot.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+ <!ENTITY % general-entities SYSTEM "../../general.ent">
+ %general-entities;
+]>
+
+<sect1 id="ch-system-yaboot" role="wrap">
+ <?dbhtml filename="yaboot.html"?>
+
+ <title>Yaboot-&yaboot-version;</title>
+
+ <indexterm zone="ch-system-yaboot">
+ <primary sortas="a-Yaboot">Yaboot</primary>
+ </indexterm>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../ppc/yaboot.xml"
+ xpointer="xpointer(//*[@role='package'])"/>
+
+ <sect2 role="installation">
+ <title>Installation of Yaboot</title>
+
+ <para>Yaboot defaults to build as 32bit, so we need to pass appropriate
+ 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/m32/m64/g" \
+ -e "s/-Werror//" \
+ -e "s/elf32ppclinux/elf64ppc" Makefile
+</userinput></screen>
+
+ <variablelist os="j">
+ <title>The meaning of the sed parameters:</title>
+
+ <varlistentry>
+ <term><parameter>"s/m32/m64/g"</parameter></term>
+ <listitem>
+ <para>Replaces -m32 wih -m64 to force <command>gcc</command> to
+ create 64-bit code when compiling yaboot.</para>
+ </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/elf32ppclinux/elf64ppc/"</parameter></term>
+ <listitem>
+ <para>This replaces the 32 bit emulation with a 64 bit emulation
+ flag to force <command>ld</command> to use a suitable 64-bit
+ emulation picked from the output of <command>'ld -V'</command>.</para>
+ </listitem>
+ </varlistentry>
+
+ </variablelist>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../ppc/yaboot.xml"
+ xpointer="xpointer(//*[@os='p3'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../ppc/yaboot.xml"
+ xpointer="xpointer(//*[@os='p4'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../ppc/yaboot.xml"
+ xpointer="xpointer(//*[@os='a'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../ppc/yaboot.xml"
+ xpointer="xpointer(//*[@os='b'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../ppc/yaboot.xml"
+ xpointer="xpointer(//*[@os='c'])"/>
+
+<screen os="d"><userinput>make PREFIX=/usr</userinput></screen>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../ppc/yaboot.xml"
+ xpointer="xpointer(//*[@os='e'])"/>
+
+ <important os="j0">
+ <para>The install of yaboot can fail if you miss any of the
+ patches or seds. <command>ld</command> will issue warnings,
+ but the install will appear to complete successfully. That
+ would result in an unbootable system, so you need to log the
+ output to check it.</para>
+ </important>
+
+<screen os='f'><userinput>make PREFIX=/usr install 2>&1 | tee instlog</userinput></screen>
+
+ <para os='g'>To ensure that the install was successful, run the following
+ command:</para>
+
+<screen os='h'><userinput>grep 'powerpc:common64' instlog</userinput></screen>
+
+ <para os='i'>If the command gave you <emphasis>any</emphasis> output
+ (... is incompatible with powerpc:common output) the build of yaboot is
+ broken and you will have to correct your error(s) and repeat it.</para>
+
+ </sect2>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../ppc/yaboot.xml"
+ xpointer="xpointer(id('contents-yaboot'))"/>
+
+</sect1>
commit 058c18ab494345fe85159b52128ebe15aec58c6b
Author: William Harrington <kb0iic at berzerkula.org>
Date: Thu Aug 22 11:17:58 2013 -0500
Update date.
diff --git a/BOOK/general.ent b/BOOK/general.ent
index 4a40544..f8d0f31 100644
--- a/BOOK/general.ent
+++ b/BOOK/general.ent
@@ -2,7 +2,7 @@
<!ENTITY month "08"> <!-- Use two digits -->
<!ENTITY month_name "August">
-<!ENTITY day "21"> <!-- Use two digits -->
+<!ENTITY day "22"> <!-- Use two digits -->
<!ENTITY year "2013"> <!-- Use four digits -->
<!ENTITY releasedate "&month_name; &day;, &year;">
-----------------------------------------------------------------------
Summary of changes:
BOOK/final-system/ppc64-64-chapter.xml | 2 +-
BOOK/final-system/{ppc64 => ppc64-64}/yaboot.xml | 33 ++++++++++------------
BOOK/general.ent | 2 +-
3 files changed, 17 insertions(+), 20 deletions(-)
copy BOOK/final-system/{ppc64 => ppc64-64}/yaboot.xml (71%)
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list