[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. 72ba28faca1956bad0f6d1c49fe2cb1abcaebb0e

git git at cross-lfs.org
Tue Jan 29 14:39:18 PST 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  72ba28faca1956bad0f6d1c49fe2cb1abcaebb0e (commit)
      from  8929f0780639b9bf73e3606d261805a08f14229f (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 72ba28faca1956bad0f6d1c49fe2cb1abcaebb0e
Author: Jonathan Norman <jon at cosmo1847.co.uk>
Date:   Tue Jan 29 22:39:12 2013 +0000

    Updated SILO build instructions in the boot method.

diff --git a/BOOK/boot/sparc/silo-build.xml b/BOOK/boot/sparc/silo-build.xml
index df2e0ae..60bb764 100644
--- a/BOOK/boot/sparc/silo-build.xml
+++ b/BOOK/boot/sparc/silo-build.xml
@@ -30,11 +30,30 @@
     href="../../final-system/sparc/silo.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
+<para os="ae">This sed allows us to compile the bin2h binary separately.</para>
+
+<screen os="ad"><userinput>sed -i -e 's@\$(PROGRAMS)$@programs\n\nprograms: &@' common/Makefile</userinput></screen>
+
+<para os="af">Compile the bin2h and util binaries for the host.</para>
+
+<screen os="aa"><userinput>make -C common programs CC=cc
+make -C second util CC=cc</userinput></screen>
+
+    <variablelist>
+      <varlistentry>
+        <term><parameter>CC=cc</parameter></term>
+        <listitem>
+          <para>Overwrites the default value of <command>gcc -m32</command> which will fail 
+to compile on 64 bit targets. This is not to be confused with <command>CC=${CC}</command> below.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/sparc/silo.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="aa"><userinput>make CROSS_COMPILE=${CLFS_TARGET}-</userinput></screen>
+<screen os="ac"><userinput>make CC=${CC} AS=${AS} LD=${LD} STRIP=${STRIP}</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/sparc/silo.xml"
diff --git a/BOOK/general.ent b/BOOK/general.ent
index d4621ab..345afea 100644
--- a/BOOK/general.ent
+++ b/BOOK/general.ent
@@ -2,7 +2,7 @@
 
 <!ENTITY month "01"> <!-- Use two digits -->
 <!ENTITY month_name "January">
-<!ENTITY day "27"> <!-- Use two digits -->
+<!ENTITY day "29"> <!-- Use two digits -->
 <!ENTITY year "2013"> <!-- Use four digits -->
 
 <!ENTITY releasedate "&month_name; &day;, &year;">
diff --git a/BOOK/introduction/sparc/changelog.xml b/BOOK/introduction/sparc/changelog.xml
index 63e6c19..a803199 100644
--- a/BOOK/introduction/sparc/changelog.xml
+++ b/BOOK/introduction/sparc/changelog.xml
@@ -32,6 +32,16 @@
     </listitem>
 
 -->
+
+    <listitem>
+      <para>29 January 2013</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Jonathan] - Updated SILO build commands in the boot method.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>01 September 2012</para>
       <itemizedlist>
diff --git a/BOOK/introduction/sparc64-64/changelog.xml b/BOOK/introduction/sparc64-64/changelog.xml
index 67ec2a7..7256808 100644
--- a/BOOK/introduction/sparc64-64/changelog.xml
+++ b/BOOK/introduction/sparc64-64/changelog.xml
@@ -32,6 +32,16 @@
     </listitem>
 
 -->
+
+    <listitem>
+      <para>29 January 2013</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Jonathan] - Updated SILO build commands in the boot method.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
    <listitem>
       <para>01 September 2012</para>
       <itemizedlist>
diff --git a/BOOK/introduction/sparc64/changelog.xml b/BOOK/introduction/sparc64/changelog.xml
index aecd5d8..9b2c15d 100644
--- a/BOOK/introduction/sparc64/changelog.xml
+++ b/BOOK/introduction/sparc64/changelog.xml
@@ -33,6 +33,15 @@
 
 -->
     <listitem>
+      <para>29 January 2013</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Jonathan] - Updated SILO build commands in the boot method.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>27 January 2013</para>
       <itemizedlist>
         <listitem>

-----------------------------------------------------------------------

Summary of changes:
 BOOK/boot/sparc/silo-build.xml             |   21 ++++++++++++++++++++-
 BOOK/general.ent                           |    2 +-
 BOOK/introduction/sparc/changelog.xml      |   10 ++++++++++
 BOOK/introduction/sparc64-64/changelog.xml |   10 ++++++++++
 BOOK/introduction/sparc64/changelog.xml    |    9 +++++++++
 5 files changed, 50 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Cross-LFS Book



More information about the Clfs-commits mailing list