[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. a27d2a4cca379fb75db1cecd7f1aa9fcf7652fb7
git
git at cross-lfs.org
Sat Aug 28 10:32:51 PDT 2010
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 a27d2a4cca379fb75db1cecd7f1aa9fcf7652fb7 (commit)
via 616b1809763addb4d06671ab5a170dd6fa795706 (commit)
via 89ccea8567c40e1ce76c4c59db8d8c7e56f0468c (commit)
via 54cc3d8d2ca533c30607ccf41f30df30e82b9aee (commit)
from 1c83a65f1c3e3cdb7452cbed5cd8a44de53e4b97 (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 a27d2a4cca379fb75db1cecd7f1aa9fcf7652fb7
Author: Joe Ciccone <jciccone at gmail.com>
Date: Sat Aug 28 13:30:38 2010 -0400
Added a sed to procps that fixes an issue with make 3.82.
diff --git a/BOOK/final-system/common/procps.xml b/BOOK/final-system/common/procps.xml
index d6ef3e0..5b3229b 100644
--- a/BOOK/final-system/common/procps.xml
+++ b/BOOK/final-system/common/procps.xml
@@ -25,6 +25,10 @@
<sect2 role="installation">
<title>Installation of Procps</title>
+ <para os="s1">The following fixes an issue with Make 3.82:</para>
+
+<screen os="s2"><userinput>sed -i -r '/^-include/s/\*(.*)/proc\1 ps\1/' Makefile</userinput></screen>
+
<para os="a">Compile the package:</para>
<screen os="b"><userinput>make</userinput></screen>
diff --git a/BOOK/final-system/multilib/procps-64bit.xml b/BOOK/final-system/multilib/procps-64bit.xml
index 1cb309f..602cd93 100644
--- a/BOOK/final-system/multilib/procps-64bit.xml
+++ b/BOOK/final-system/multilib/procps-64bit.xml
@@ -23,6 +23,14 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../common/procps.xml"
+ xpointer="xpointer(//*[@os='s1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/procps.xml"
+ xpointer="xpointer(//*[@os='s2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/procps.xml"
xpointer="xpointer(//*[@os='a'])"/>
<screen os="b"><userinput>make CC="gcc ${BUILD64}" m64=""</userinput></screen>
diff --git a/BOOK/final-system/multilib/procps-n32.xml b/BOOK/final-system/multilib/procps-n32.xml
index c2723c0..98f2b66 100644
--- a/BOOK/final-system/multilib/procps-n32.xml
+++ b/BOOK/final-system/multilib/procps-n32.xml
@@ -24,6 +24,14 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../common/procps.xml"
+ xpointer="xpointer(//*[@os='s1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/procps.xml"
+ xpointer="xpointer(//*[@os='s2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/procps.xml"
xpointer="xpointer(//*[@os='a'])"/>
<screen os="b"><userinput>make CC="gcc ${BUILDN32}" m64=""</userinput></screen>
diff --git a/BOOK/final-system/multilib/procps.xml b/BOOK/final-system/multilib/procps.xml
index 092f767..54e811f 100644
--- a/BOOK/final-system/multilib/procps.xml
+++ b/BOOK/final-system/multilib/procps.xml
@@ -24,6 +24,14 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../common/procps.xml"
+ xpointer="xpointer(//*[@os='s1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/procps.xml"
+ xpointer="xpointer(//*[@os='s2'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/procps.xml"
xpointer="xpointer(//*[@os='a'])"/>
<screen os="b"><userinput>make CC="gcc ${BUILD32}" m64=""</userinput></screen>
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index 0cafc04..fb5e2e6 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -40,6 +40,10 @@
<para>Augest 28, 2010</para>
<itemizedlist>
<listitem>
+ <para>[jciccone] - Added a sed to procps that fixes an issue with
+ Make 3.82.</para>
+ </listitem>
+ <listitem>
<para>[jciccone] - Added a note to GMP in the final system about
building for a different cpu.</para>
</listitem>
commit 616b1809763addb4d06671ab5a170dd6fa795706
Author: Joe Ciccone <jciccone at gmail.com>
Date: Sat Aug 28 13:22:50 2010 -0400
Added a note to GMP in the final system about building GMP for a different target CPU.
diff --git a/BOOK/final-system/common/gmp.xml b/BOOK/final-system/common/gmp.xml
index 5c589ce..f0e1b38 100644
--- a/BOOK/final-system/common/gmp.xml
+++ b/BOOK/final-system/common/gmp.xml
@@ -32,6 +32,19 @@
<screen os="p2"><userinput>patch -Np1 -i ../&gmp-branch_update-patch;</userinput></screen>
-->
+
+ <note os="n1">
+ <para>If you are compiling this package on a different CPU then you plan to
+ run the CLFS system on. You must replace GMP's <filename>config.guess</filename>
+ and <filename>config.sub</filename> wrappers with the originals. This will
+ prevent GMP from optimizing for the wrong CPU. You can make this change with
+ the following command:</para>
+
+<screen><userinput>mv config{fsf,}.guess
+mv config{fsf,}.sub</userinput></screen>
+
+ </note>
+
<para os="a">Prepare GMP for compilation:</para>
<screen os="b"><userinput>CPPFLAGS=-fexceptions CC="gcc -isystem /usr/include" \
diff --git a/BOOK/final-system/mips64/gmp-64bit.xml b/BOOK/final-system/mips64/gmp-64bit.xml
index 25a2844..2029cc1 100644
--- a/BOOK/final-system/mips64/gmp-64bit.xml
+++ b/BOOK/final-system/mips64/gmp-64bit.xml
@@ -31,6 +31,11 @@
xpointer="xpointer(//*[@os='p2'])"/>
-->
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/gmp.xml"
+ xpointer="xpointer(//*[@os='n1'])"/>
+
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../common/gmp.xml"
xpointer="xpointer(//*[@os='a'])"/>
diff --git a/BOOK/final-system/multilib/gmp-64bit.xml b/BOOK/final-system/multilib/gmp-64bit.xml
index 50cfe78..4c1de1e 100644
--- a/BOOK/final-system/multilib/gmp-64bit.xml
+++ b/BOOK/final-system/multilib/gmp-64bit.xml
@@ -33,6 +33,10 @@
-->
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../common/gmp.xml"
+ xpointer="xpointer(//*[@os='n1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/gmp.xml"
xpointer="xpointer(//*[@os='a'])"/>
<screen os="b"><userinput>CPPFLAGS=-fexceptions CC="gcc -isystem /usr/include ${BUILD64}" \
diff --git a/BOOK/final-system/multilib/gmp-n32.xml b/BOOK/final-system/multilib/gmp-n32.xml
index 2ec813c..19c0e15 100644
--- a/BOOK/final-system/multilib/gmp-n32.xml
+++ b/BOOK/final-system/multilib/gmp-n32.xml
@@ -32,6 +32,11 @@
xpointer="xpointer(//*[@os='p2'])"/>
-->
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/gmp.xml"
+ xpointer="xpointer(//*[@os='n1'])"/>
+
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../common/gmp.xml"
xpointer="xpointer(//*[@os='a'])"/>
diff --git a/BOOK/final-system/multilib/gmp.xml b/BOOK/final-system/multilib/gmp.xml
index a821783..08633fa 100644
--- a/BOOK/final-system/multilib/gmp.xml
+++ b/BOOK/final-system/multilib/gmp.xml
@@ -34,6 +34,10 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../common/gmp.xml"
+ xpointer="xpointer(//*[@os='n1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../common/gmp.xml"
xpointer="xpointer(//*[@os='a'])"/>
<screen os="b"><userinput>CPPFLAGS=-fexceptions CC="gcc -isystem /usr/include ${BUILD32}" \
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index 620d415..0cafc04 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -40,7 +40,12 @@
<para>Augest 28, 2010</para>
<itemizedlist>
<listitem>
- <para>[Jonathan] - Corrected md5sums and some links, thanks to Code Monkey.</para>
+ <para>[jciccone] - Added a note to GMP in the final system about
+ building for a different cpu.</para>
+ </listitem>
+ <listitem>
+ <para>[Jonathan] - Corrected md5sums and some links, thanks to
+ Code Monkey.</para>
</listitem>
</itemizedlist>
</listitem>
commit 89ccea8567c40e1ce76c4c59db8d8c7e56f0468c
Merge: 54cc3d8 1c83a65
Author: Joe Ciccone <jciccone at gmail.com>
Date: Sat Aug 28 09:49:49 2010 -0400
Merge branch 'master' of cross-lfs.org:cross-lfs
commit 54cc3d8d2ca533c30607ccf41f30df30e82b9aee
Author: Joe Ciccone <jciccone at gmail.com>
Date: Sun Aug 8 20:45:03 2010 -0400
Remove the bootloaders page from the boot section on x86_64-64.
diff --git a/BOOK/boot/x86_64-64-chapter.xml b/BOOK/boot/x86_64-64-chapter.xml
index ed84e73..b37e2fb 100644
--- a/BOOK/boot/x86_64-64-chapter.xml
+++ b/BOOK/boot/x86_64-64-chapter.xml
@@ -21,7 +21,6 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/udev.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pwdgroup.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/kernel.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/bootloaders.xml"/>
<!-- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/bin86.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/lilo-build.xml"/> -->
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/settingenviron.xml"/>
diff --git a/BOOK/boot/x86_64-64/bootloaders.xml b/BOOK/boot/x86_64-64/bootloaders.xml
deleted file mode 100644
index 80e521b..0000000
--- a/BOOK/boot/x86_64-64/bootloaders.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?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-boot-building-a-bootloader" role="wrap">
- <?dbhtml filename="building-a-bootloader.html"?>
-
- <title>Building a bootloader</title>
-
- <para>On x86 and x86_64 (multilib) architectures, the preferred
- bootloader is GRUB. Unfortunately, GRUB doesn't work on x86_64
- Pure64 - the stage2 files can be correctly built as 32-bit, but the
- <command>grub</command> shell is a 64-bit program, and tries to
- execute some of the stage2 routines - this results in a segmentation
- fault. Therefore, in the final system we use Lilo as the bootloader.
- </para>
-
- <para>If you already have a bootloader, such as GRUB, installed on
- the system then you should use that to make your new kernel bootable.
- </para>
-
- <note>
- <para>We will now cross-compile Bin86 and Lilo - these instructions
- assume you are using an x86_64 machine (e.g. booted fron a Live CD),
- either pure64 or multilib. This approach will not work if you are
- running the machine as i686, because a 32-bit kernel will not be
- able to execute a 64-bit binary to install the bootloader. If that
- is the case, you will need to install an i686 bootloader on the
- host system.
- </para>
- </note>
-
-</sect1>
-----------------------------------------------------------------------
Summary of changes:
BOOK/boot/x86_64-64-chapter.xml | 1 -
BOOK/boot/x86_64-64/bootloaders.xml | 36 ---------------------------
BOOK/final-system/common/gmp.xml | 13 +++++++++
BOOK/final-system/common/procps.xml | 4 +++
BOOK/final-system/mips64/gmp-64bit.xml | 5 +++
BOOK/final-system/multilib/gmp-64bit.xml | 4 +++
BOOK/final-system/multilib/gmp-n32.xml | 5 +++
BOOK/final-system/multilib/gmp.xml | 4 +++
BOOK/final-system/multilib/procps-64bit.xml | 8 ++++++
BOOK/final-system/multilib/procps-n32.xml | 8 ++++++
BOOK/final-system/multilib/procps.xml | 8 ++++++
BOOK/introduction/common/changelog.xml | 11 +++++++-
12 files changed, 69 insertions(+), 38 deletions(-)
delete mode 100644 BOOK/boot/x86_64-64/bootloaders.xml
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list