[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, sysvinit, updated. clfs-2.1.0-1069-g0982dd4
git
git at cross-lfs.org
Tue May 20 21:38:06 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, sysvinit has been updated
via 0982dd41e357bd9835480b9fbe646b6229219cab (commit)
via 01817d3511d84cd093d755c629bb1dc459ab122f (commit)
via 9a6583371b9d0bfbefa8f6cd70b1c94e4b92d266 (commit)
via 33346dd55f8dbcda977621aa7d4b94f7dfaa60dd (commit)
via 1de8183e195dc82b0076536fe368c8053c8a8ef2 (commit)
from 65f4aaad2c366e4091047e6780695b563e599611 (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 0982dd41e357bd9835480b9fbe646b6229219cab
Merge: 01817d3 65f4aaa
Author: Chris Staub <chris at beaker67.com>
Date: Wed May 21 00:37:48 2014 -0400
Merge branch 'sysvinit' of git.cross-lfs.org:cross-lfs into sysvinit
commit 01817d3511d84cd093d755c629bb1dc459ab122f
Author: Chris Staub <chris at beaker67.com>
Date: Tue May 20 13:17:36 2014 -0400
Merged Build Flags pages with Build Variables, and moved those to final-preps
diff --git a/BOOK/chroot/sparc64-64/flags.xml b/BOOK/chroot/sparc64-64/flags.xml
index e871461..6d2b6cf 100644
--- a/BOOK/chroot/sparc64-64/flags.xml
+++ b/BOOK/chroot/sparc64-64/flags.xml
@@ -21,11 +21,11 @@
<screen><userinput>echo export BUILD64=\""${BUILD64}\"" >> ~/.bash_profile</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../../cross-tools/sparc64-64/flags.xml"
- xpointer="xpointer(//*[@os='e'])"/>
+ href="../../final-preps/sparc64-64/variables.xml"
+ xpointer="xpointer(//*[@os='k'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../../cross-tools/sparc64-64/flags.xml"
- xpointer="xpointer(//*[@os='f'])"/>
+ href="../../final-preps/sparc64-64/variables.xml"
+ xpointer="xpointer(//*[@os='l'])"/>
</sect1>
diff --git a/BOOK/chroot/sparc64/flags.xml b/BOOK/chroot/sparc64/flags.xml
index 8065b0e..dbdf08e 100644
--- a/BOOK/chroot/sparc64/flags.xml
+++ b/BOOK/chroot/sparc64/flags.xml
@@ -30,11 +30,11 @@ export CLFS_TARGET32="${CLFS_TARGET32}"
EOF</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../../cross-tools/sparc64/flags.xml"
- xpointer="xpointer(//*[@os='e'])"/>
+ href="../../final-preps/sparc64/variables.xml"
+ xpointer="xpointer(//*[@os='k'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../../cross-tools/sparc64/flags.xml"
- xpointer="xpointer(//*[@os='f'])"/>
+ href="../../final-preps/sparc64/variables.xml"
+ xpointer="xpointer(//*[@os='l'])"/>
</sect1>
diff --git a/BOOK/cross-tools/64/flags.xml b/BOOK/cross-tools/64/flags.xml
deleted file mode 100644
index b080b7c..0000000
--- a/BOOK/cross-tools/64/flags.xml
+++ /dev/null
@@ -1,23 +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-cross-tools-flags">
- <?dbhtml filename="flags.html"?>
-
- <title>Build Flags</title>
-
- <para os="a">We will need to setup target specific flags for the compiler
- and linkers.</para>
-
- <screen os="b"><userinput>export BUILD64="-m64"</userinput></screen>
-
- <para os="c">Now add the build flags to <filename>~/.bashrc</filename> to
- prevent issues if we stop and come back later.</para>
-
- <screen os="d"><userinput>echo export BUILD64=\""${BUILD64}\"" >> ~/.bashrc</userinput></screen>
-
-</sect1>
diff --git a/BOOK/cross-tools/mips-chapter.xml b/BOOK/cross-tools/mips-chapter.xml
index eea390f..d9c8f28 100644
--- a/BOOK/cross-tools/mips-chapter.xml
+++ b/BOOK/cross-tools/mips-chapter.xml
@@ -12,7 +12,6 @@
<title>Constructing Cross-Compile Tools</title>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/variables.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/linux-headers.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
diff --git a/BOOK/cross-tools/mips64-64-chapter.xml b/BOOK/cross-tools/mips64-64-chapter.xml
index 059de14..ae2818b 100644
--- a/BOOK/cross-tools/mips64-64-chapter.xml
+++ b/BOOK/cross-tools/mips64-64-chapter.xml
@@ -12,8 +12,6 @@
<title>Constructing Cross-Compile Tools</title>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64-64/variables.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64-64/flags.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/linux-headers.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
diff --git a/BOOK/cross-tools/mips64-64/flags.xml b/BOOK/cross-tools/mips64-64/flags.xml
deleted file mode 100644
index 90f2d81..0000000
--- a/BOOK/cross-tools/mips64-64/flags.xml
+++ /dev/null
@@ -1,27 +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-cross-tools-flags">
- <?dbhtml filename="flags.html"?>
-
- <title>Build Flags</title>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../64/flags.xml"
- xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>export BUILD64="-mabi=64"</userinput></screen>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../64/flags.xml"
- xpointer="xpointer(//*[@os='c'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../64/flags.xml"
- xpointer="xpointer(//*[@os='d'])"/>
-
-</sect1>
diff --git a/BOOK/cross-tools/mips64-chapter.xml b/BOOK/cross-tools/mips64-chapter.xml
index 179eb4b..3d1bcce 100644
--- a/BOOK/cross-tools/mips64-chapter.xml
+++ b/BOOK/cross-tools/mips64-chapter.xml
@@ -12,8 +12,6 @@
<title>Constructing Cross-Compile Tools</title>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/variables.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/flags.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/linux-headers.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
diff --git a/BOOK/cross-tools/mips64/flags.xml b/BOOK/cross-tools/mips64/flags.xml
deleted file mode 100644
index 1f31a0a..0000000
--- a/BOOK/cross-tools/mips64/flags.xml
+++ /dev/null
@@ -1,31 +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-cross-tools-flags">
- <?dbhtml filename="flags.html"?>
-
- <title>Build Flags</title>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../multilib/flags.xml"
- xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>export BUILD32="-mabi=32"
-export BUILDN32="-mabi=n32"
-export BUILD64="-mabi=64"</userinput></screen>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../multilib/flags.xml"
- xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>cat >> ~/.bashrc << EOF
-export BUILD32="${BUILD32}"
-export BUILDN32="${BUILDN32}"
-export BUILD64="${BUILD64}"
-EOF</userinput></screen>
-
-</sect1>
diff --git a/BOOK/cross-tools/multilib/flags.xml b/BOOK/cross-tools/multilib/flags.xml
deleted file mode 100644
index 785f8f1..0000000
--- a/BOOK/cross-tools/multilib/flags.xml
+++ /dev/null
@@ -1,27 +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-cross-tools-flags">
- <?dbhtml filename="flags.html"?>
-
- <title>Build Flags</title>
-
- <para os="a">We will need to setup target specific flags for the compiler
- and linker:</para>
-
-<screen os="b"><userinput>export BUILD32="-m32"
-export BUILD64="-m64"</userinput></screen>
-
- <para os="c">Now add the build flags to <filename>~/.bashrc</filename> to
- prevent issues if we stop and come back later:</para>
-
-<screen os="d"><userinput>cat >> ~/.bashrc << EOF
-export BUILD32="${BUILD32}"
-export BUILD64="${BUILD64}"
-EOF</userinput></screen>
-
-</sect1>
diff --git a/BOOK/cross-tools/ppc-chapter.xml b/BOOK/cross-tools/ppc-chapter.xml
index e3175a1..56ead83 100644
--- a/BOOK/cross-tools/ppc-chapter.xml
+++ b/BOOK/cross-tools/ppc-chapter.xml
@@ -12,7 +12,6 @@
<title>Constructing Cross-Compile Tools</title>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/variables.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/linux-headers.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
diff --git a/BOOK/cross-tools/ppc64-64-chapter.xml b/BOOK/cross-tools/ppc64-64-chapter.xml
index 75c6023..f4833bd 100644
--- a/BOOK/cross-tools/ppc64-64-chapter.xml
+++ b/BOOK/cross-tools/ppc64-64-chapter.xml
@@ -12,8 +12,6 @@
<title>Constructing Cross-Compile Tools</title>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/flags.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64-64/variables.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/linux-headers.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
diff --git a/BOOK/cross-tools/ppc64-64/variables.xml b/BOOK/cross-tools/ppc64-64/variables.xml
deleted file mode 100644
index d8e2941..0000000
--- a/BOOK/cross-tools/ppc64-64/variables.xml
+++ /dev/null
@@ -1,37 +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-cross-tools-variables">
- <?dbhtml filename="variables.html"?>
-
- <title>Build Variables</title>
-
- <bridgehead renderas="sect4">Setting Host and Target</bridgehead>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../x86/variables.xml"
- xpointer="xpointer(//*[@os='a'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../x86/variables.xml"
- xpointer="xpointer(//*[@os='b'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../x86/variables.xml"
- xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>export CLFS_TARGET="powerpc64-unknown-linux-gnu"</userinput></screen>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../x86_64/variables.xml"
- xpointer="xpointer(//*[@os='e'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../x86/variables.xml"
- xpointer="xpointer(//*[@os='f'])"/>
-
-</sect1>
diff --git a/BOOK/cross-tools/ppc64-chapter.xml b/BOOK/cross-tools/ppc64-chapter.xml
index 0220cb9..44fbd70 100644
--- a/BOOK/cross-tools/ppc64-chapter.xml
+++ b/BOOK/cross-tools/ppc64-chapter.xml
@@ -12,8 +12,6 @@
<title>Constructing Cross-Compile Tools</title>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/variables.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flags.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/linux-headers.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
diff --git a/BOOK/cross-tools/sparc-chapter.xml b/BOOK/cross-tools/sparc-chapter.xml
index ffad18b..e6e38da 100644
--- a/BOOK/cross-tools/sparc-chapter.xml
+++ b/BOOK/cross-tools/sparc-chapter.xml
@@ -12,7 +12,6 @@
<title>Constructing Cross-Compile Tools</title>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/variables.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/linux-headers.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
diff --git a/BOOK/cross-tools/sparc64-64-chapter.xml b/BOOK/cross-tools/sparc64-64-chapter.xml
index 2e67dc6..1ee9a06 100644
--- a/BOOK/cross-tools/sparc64-64-chapter.xml
+++ b/BOOK/cross-tools/sparc64-64-chapter.xml
@@ -12,8 +12,6 @@
<title>Constructing Cross-Compile Tools</title>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64-64/variables.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64-64/flags.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/linux-headers.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
diff --git a/BOOK/cross-tools/sparc64-64/flags.xml b/BOOK/cross-tools/sparc64-64/flags.xml
deleted file mode 100644
index 839c689..0000000
--- a/BOOK/cross-tools/sparc64-64/flags.xml
+++ /dev/null
@@ -1,68 +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-cross-tools-flags">
- <title>Build Flags</title>
- <?dbhtml filename="flags.html"?>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../64/flags.xml"
- xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>export BUILD64="<replaceable>[BUILD64 entries]</replaceable>"
-export GCCTARGET="<replaceable>[GCCTARGET entries]</replaceable>"</userinput></screen>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../64/flags.xml"
- xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>cat >> ~/.bashrc << EOF
-export BUILD64="${BUILD64}"
-export GCCTARGET="${GCCTARGET}"
-EOF</userinput></screen>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../sparc64/flags.xml"
- xpointer="xpointer(//*[@os='e'])"/>
-
- <table os="f">
- <title>List of architectures, target triplets, and recommended book</title>
- <?dbfo table-width="7in" ?>
-
- <tgroup cols="3">
-
- <colspec colnum="1" colwidth="1in" colname="Processor"/>
- <colspec colnum="2" colwidth="3.2in" colname="Build64"/>
- <colspec colnum="3" colwidth="2.8in" colname="GCC"/>
-
- <thead>
- <row>
- <entry>Processor</entry>
- <entry>BUILD64</entry>
- <entry>GCCTARGET</entry>
- </row>
- </thead>
-
- <tbody>
- <row>
- <entry>Ultrasparc and Ultrasparc2</entry>
- <entry>-m64 -mcpu=ultrasparc -mtune=ultrasparc</entry>
- <entry>-mcpu=ultrasparc -mtune=ultrasparc</entry>
- </row>
- <row>
- <entry>Ultrasparc3</entry>
- <entry>-m64 -mcpu=ultrasparc3 -mtune=ultrasparc3</entry>
- <entry>-mcpu=ultrasparc3 -mtune=ultrasparc3</entry>
- </row>
- </tbody>
-
- </tgroup>
-
- </table>
-
-</sect1>
-
diff --git a/BOOK/cross-tools/sparc64-64/variables.xml b/BOOK/cross-tools/sparc64-64/variables.xml
deleted file mode 100644
index f1729c3..0000000
--- a/BOOK/cross-tools/sparc64-64/variables.xml
+++ /dev/null
@@ -1,41 +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-cross-tools-variables">
- <?dbhtml filename="variables.html"?>
-
- <title>Build Variables</title>
-
- <bridgehead renderas="sect4">Setting Host and Target</bridgehead>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../x86/variables.xml"
- xpointer="xpointer(//*[@os='a'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../x86/variables.xml"
- xpointer="xpointer(//*[@os='b'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../x86/variables.xml"
- xpointer="xpointer(//*[@os='c'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../sparc64/variables.xml"
- xpointer="xpointer(//*[@os='d'])"/>
-
- <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../x86/variables.xml"
- xpointer="xpointer(//*[@os='e'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../x86/variables.xml"
- xpointer="xpointer(//*[@os='f'])"/>
-
-</sect1>
diff --git a/BOOK/cross-tools/sparc64-chapter.xml b/BOOK/cross-tools/sparc64-chapter.xml
index 6c9d0af..96f1e9e 100644
--- a/BOOK/cross-tools/sparc64-chapter.xml
+++ b/BOOK/cross-tools/sparc64-chapter.xml
@@ -12,8 +12,6 @@
<title>Constructing Cross-Compile Tools</title>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/variables.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/flags.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/linux-headers.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
diff --git a/BOOK/cross-tools/x86-chapter.xml b/BOOK/cross-tools/x86-chapter.xml
index 35a282d..b7d4a75 100644
--- a/BOOK/cross-tools/x86-chapter.xml
+++ b/BOOK/cross-tools/x86-chapter.xml
@@ -12,7 +12,6 @@
<title>Constructing Cross-Compile Tools</title>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/variables.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/linux-headers.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
diff --git a/BOOK/cross-tools/x86_64-64-chapter.xml b/BOOK/cross-tools/x86_64-64-chapter.xml
index 7fccc50..91f126e 100644
--- a/BOOK/cross-tools/x86_64-64-chapter.xml
+++ b/BOOK/cross-tools/x86_64-64-chapter.xml
@@ -12,8 +12,6 @@
<title>Constructing Cross-Compile Tools</title>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/flags.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/variables.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/linux-headers.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
diff --git a/BOOK/cross-tools/x86_64-chapter.xml b/BOOK/cross-tools/x86_64-chapter.xml
index 09f5186..0343b20 100644
--- a/BOOK/cross-tools/x86_64-chapter.xml
+++ b/BOOK/cross-tools/x86_64-chapter.xml
@@ -12,8 +12,6 @@
<title>Constructing Cross-Compile Tools</title>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/introduction.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/variables.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/flags.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/bc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/linux-headers.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/file.xml"/>
diff --git a/BOOK/final-preps/aboutclfs.xml b/BOOK/final-preps/common/aboutclfs.xml
similarity index 96%
rename from BOOK/final-preps/aboutclfs.xml
rename to BOOK/final-preps/common/aboutclfs.xml
index b3124ef..3cf2124 100644
--- a/BOOK/final-preps/aboutclfs.xml
+++ b/BOOK/final-preps/common/aboutclfs.xml
@@ -1,7 +1,7 @@
<?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">
+ <!ENTITY % general-entities SYSTEM "../../general.ent">
%general-entities;
]>
diff --git a/BOOK/final-preps/abouttestsuites.xml b/BOOK/final-preps/common/abouttestsuites.xml
similarity index 92%
rename from BOOK/final-preps/abouttestsuites.xml
rename to BOOK/final-preps/common/abouttestsuites.xml
index a597a44..8f40563 100644
--- a/BOOK/final-preps/abouttestsuites.xml
+++ b/BOOK/final-preps/common/abouttestsuites.xml
@@ -1,7 +1,7 @@
<?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">
+ <!ENTITY % general-entities SYSTEM "../../general.ent">
%general-entities;
]>
diff --git a/BOOK/final-preps/addinguser.xml b/BOOK/final-preps/common/addinguser.xml
similarity index 98%
rename from BOOK/final-preps/addinguser.xml
rename to BOOK/final-preps/common/addinguser.xml
index 262500e..f4c499a 100644
--- a/BOOK/final-preps/addinguser.xml
+++ b/BOOK/final-preps/common/addinguser.xml
@@ -1,7 +1,7 @@
<?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">
+ <!ENTITY % general-entities SYSTEM "../../general.ent">
%general-entities;
]>
diff --git a/BOOK/final-preps/creatingcrossdir.xml b/BOOK/final-preps/common/creatingcrossdir.xml
similarity index 95%
rename from BOOK/final-preps/creatingcrossdir.xml
rename to BOOK/final-preps/common/creatingcrossdir.xml
index f0fdc2a..4b2f00d 100644
--- a/BOOK/final-preps/creatingcrossdir.xml
+++ b/BOOK/final-preps/common/creatingcrossdir.xml
@@ -1,7 +1,7 @@
<?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">
+ <!ENTITY % general-entities SYSTEM "../../general.ent">
%general-entities;
]>
diff --git a/BOOK/final-preps/creatingtoolsdir.xml b/BOOK/final-preps/common/creatingtoolsdir.xml
similarity index 97%
rename from BOOK/final-preps/creatingtoolsdir.xml
rename to BOOK/final-preps/common/creatingtoolsdir.xml
index ec27f39..ee3b7b3 100644
--- a/BOOK/final-preps/creatingtoolsdir.xml
+++ b/BOOK/final-preps/common/creatingtoolsdir.xml
@@ -1,7 +1,7 @@
<?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">
+ <!ENTITY % general-entities SYSTEM "../../general.ent">
%general-entities;
]>
diff --git a/BOOK/final-preps/settingenviron.xml b/BOOK/final-preps/common/settingenviron.xml
similarity index 98%
rename from BOOK/final-preps/settingenviron.xml
rename to BOOK/final-preps/common/settingenviron.xml
index 0dfe24b..a0ae49b 100644
--- a/BOOK/final-preps/settingenviron.xml
+++ b/BOOK/final-preps/common/settingenviron.xml
@@ -1,7 +1,7 @@
<?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">
+ <!ENTITY % general-entities SYSTEM "../../general.ent">
%general-entities;
]>
diff --git a/BOOK/final-preps/chapter.xml b/BOOK/final-preps/mips-chapter.xml
similarity index 52%
copy from BOOK/final-preps/chapter.xml
copy to BOOK/final-preps/mips-chapter.xml
index a1379f0..0c81e9d 100644
--- a/BOOK/final-preps/chapter.xml
+++ b/BOOK/final-preps/mips-chapter.xml
@@ -10,11 +10,12 @@
<?dbhtml filename="chapter.html"?>
<title>Final Preparations</title>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="aboutclfs.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="creatingtoolsdir.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="creatingcrossdir.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="addinguser.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="settingenviron.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="abouttestsuites.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/aboutclfs.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingtoolsdir.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingcrossdir.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/addinguser.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips/variables.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/abouttestsuites.xml"/>
</chapter>
diff --git a/BOOK/cross-tools/mips/variables.xml b/BOOK/final-preps/mips/variables.xml
similarity index 92%
rename from BOOK/cross-tools/mips/variables.xml
rename to BOOK/final-preps/mips/variables.xml
index 601b8d0..1acea46 100644
--- a/BOOK/cross-tools/mips/variables.xml
+++ b/BOOK/final-preps/mips/variables.xml
@@ -32,8 +32,10 @@
<screen os="ad"><userinput>export CLFS_TARGET="mips-unknown-linux-gnu"</userinput></screen>
+ <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
+
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../x86_64/variables.xml"
+ href="../x86/variables.xml"
xpointer="xpointer(//*[@os='e'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-preps/chapter.xml b/BOOK/final-preps/mips64-64-chapter.xml
similarity index 52%
copy from BOOK/final-preps/chapter.xml
copy to BOOK/final-preps/mips64-64-chapter.xml
index a1379f0..983f35e 100644
--- a/BOOK/final-preps/chapter.xml
+++ b/BOOK/final-preps/mips64-64-chapter.xml
@@ -10,11 +10,12 @@
<?dbhtml filename="chapter.html"?>
<title>Final Preparations</title>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="aboutclfs.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="creatingtoolsdir.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="creatingcrossdir.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="addinguser.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="settingenviron.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="abouttestsuites.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/aboutclfs.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingtoolsdir.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingcrossdir.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/addinguser.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64-64/variables.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/abouttestsuites.xml"/>
</chapter>
diff --git a/BOOK/cross-tools/mips64-64/variables.xml b/BOOK/final-preps/mips64-64/variables.xml
similarity index 77%
rename from BOOK/cross-tools/mips64-64/variables.xml
rename to BOOK/final-preps/mips64-64/variables.xml
index 2209bfc..7ff10a0 100644
--- a/BOOK/cross-tools/mips64-64/variables.xml
+++ b/BOOK/final-preps/mips64-64/variables.xml
@@ -41,11 +41,19 @@
xpointer="xpointer(//*[@os='ad'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../x86_64/variables.xml"
- xpointer="xpointer(//*[@os='e'])"/>
+ href="../x86_64-64/variables.xml"
+ xpointer="xpointer(//*[@os='g'])"/>
+
+<screen os="h"><userinput>export BUILD64="-mabi=64"</userinput></screen>
+
+ <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../x86/variables.xml"
- xpointer="xpointer(//*[@os='f'])"/>
+ href="../x86_64-64/variables.xml"
+ xpointer="xpointer(//*[@os='i'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../x86_64-64/variables.xml"
+ xpointer="xpointer(//*[@os='j'])"/>
</sect1>
diff --git a/BOOK/final-preps/chapter.xml b/BOOK/final-preps/mips64-chapter.xml
similarity index 52%
copy from BOOK/final-preps/chapter.xml
copy to BOOK/final-preps/mips64-chapter.xml
index a1379f0..5d5fa67 100644
--- a/BOOK/final-preps/chapter.xml
+++ b/BOOK/final-preps/mips64-chapter.xml
@@ -10,11 +10,12 @@
<?dbhtml filename="chapter.html"?>
<title>Final Preparations</title>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="aboutclfs.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="creatingtoolsdir.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="creatingcrossdir.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="addinguser.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="settingenviron.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="abouttestsuites.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/aboutclfs.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingtoolsdir.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingcrossdir.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/addinguser.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/variables.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/abouttestsuites.xml"/>
</chapter>
diff --git a/BOOK/cross-tools/mips64/variables.xml b/BOOK/final-preps/mips64/variables.xml
similarity index 72%
rename from BOOK/cross-tools/mips64/variables.xml
rename to BOOK/final-preps/mips64/variables.xml
index 0edd527..1df8dcf 100644
--- a/BOOK/cross-tools/mips64/variables.xml
+++ b/BOOK/final-preps/mips64/variables.xml
@@ -38,18 +38,31 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../x86_64/variables.xml"
- xpointer="xpointer(//*[@os='m1'])"/>
-
-<screen os="m2"><userinput>export CLFS_TARGET32="$(echo ${CLFS_TARGET}| sed -e 's/64//g')"</userinput></screen>
+ xpointer="xpointer(//*[@os='e'])"/>
- <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
+<screen os="f"><userinput>export CLFS_TARGET32="$(echo ${CLFS_TARGET}| sed -e 's/64//g')"</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../x86/variables.xml"
- xpointer="xpointer(//*[@os='e'])"/>
+ href="../x86_64/variables.xml"
+ xpointer="xpointer(//*[@os='g'])"/>
+
+<screen os="h"><userinput>export BUILD32="-mabi=32"
+export BUILDN32="-mabi=n32"
+export BUILD64="-mabi=64"</userinput></screen>
+
+ <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../x86_64/variables.xml"
- xpointer="xpointer(//*[@os='f'])"/>
+ xpointer="xpointer(//*[@os='i'])"/>
+
+<screen os="j"><userinput>cat >> ~/.bashrc << EOF
+export CLFS_HOST="${CLFS_HOST}"
+export CLFS_TARGET="${CLFS_TARGET}"
+export CLFS_TARGET32="${CLFS_TARGET32}"
+export BUILD32="${BUILD32}"
+export BUILDN32="${BUILDN32}"
+export BUILD64="${BUILD64}"
+EOF</userinput></screen>
</sect1>
diff --git a/BOOK/final-preps/chapter.xml b/BOOK/final-preps/ppc-chapter.xml
similarity index 52%
copy from BOOK/final-preps/chapter.xml
copy to BOOK/final-preps/ppc-chapter.xml
index a1379f0..a1d1729 100644
--- a/BOOK/final-preps/chapter.xml
+++ b/BOOK/final-preps/ppc-chapter.xml
@@ -10,11 +10,12 @@
<?dbhtml filename="chapter.html"?>
<title>Final Preparations</title>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="aboutclfs.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="creatingtoolsdir.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="creatingcrossdir.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="addinguser.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="settingenviron.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="abouttestsuites.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/aboutclfs.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingtoolsdir.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingcrossdir.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/addinguser.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc/variables.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/abouttestsuites.xml"/>
</chapter>
diff --git a/BOOK/cross-tools/ppc/variables.xml b/BOOK/final-preps/ppc/variables.xml
similarity index 91%
rename from BOOK/cross-tools/ppc/variables.xml
rename to BOOK/final-preps/ppc/variables.xml
index e12e8ca..862ac58 100644
--- a/BOOK/cross-tools/ppc/variables.xml
+++ b/BOOK/final-preps/ppc/variables.xml
@@ -26,8 +26,10 @@
<screen os="d"><userinput>export CLFS_TARGET="powerpc-unknown-linux-gnu"</userinput></screen>
+ <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
+
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../x86_64/variables.xml"
+ href="../x86/variables.xml"
xpointer="xpointer(//*[@os='e'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-preps/chapter.xml b/BOOK/final-preps/ppc64-64-chapter.xml
similarity index 52%
copy from BOOK/final-preps/chapter.xml
copy to BOOK/final-preps/ppc64-64-chapter.xml
index a1379f0..efe5c1e 100644
--- a/BOOK/final-preps/chapter.xml
+++ b/BOOK/final-preps/ppc64-64-chapter.xml
@@ -10,11 +10,12 @@
<?dbhtml filename="chapter.html"?>
<title>Final Preparations</title>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="aboutclfs.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="creatingtoolsdir.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="creatingcrossdir.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="addinguser.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="settingenviron.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="abouttestsuites.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/aboutclfs.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingtoolsdir.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingcrossdir.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/addinguser.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64-64/variables.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/abouttestsuites.xml"/>
</chapter>
diff --git a/BOOK/cross-tools/ppc64/variables.xml b/BOOK/final-preps/ppc64-64/variables.xml
similarity index 71%
rename from BOOK/cross-tools/ppc64/variables.xml
rename to BOOK/final-preps/ppc64-64/variables.xml
index 8a1584a..0cea81e 100644
--- a/BOOK/cross-tools/ppc64/variables.xml
+++ b/BOOK/final-preps/ppc64-64/variables.xml
@@ -27,17 +27,21 @@
<screen os="d"><userinput>export CLFS_TARGET="powerpc64-unknown-linux-gnu"</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../x86_64/variables.xml"
- xpointer="xpointer(//*[@os='m1'])"/>
+ href="../x86_64-64/variables.xml"
+ xpointer="xpointer(//*[@os='g'])"/>
-<screen os="m2"><userinput>export CLFS_TARGET32="powerpc-unknown-linux-gnu"</userinput></screen>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../x86_64-64/variables.xml"
+ xpointer="xpointer(//*[@os='h'])"/>
+
+ <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../x86_64/variables.xml"
- xpointer="xpointer(//*[@os='e'])"/>
+ href="../x86_64-64/variables.xml"
+ xpointer="xpointer(//*[@os='i'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../x86_64/variables.xml"
- xpointer="xpointer(//*[@os='f'])"/>
+ href="../x86_64-64/variables.xml"
+ xpointer="xpointer(//*[@os='j'])"/>
</sect1>
diff --git a/BOOK/final-preps/chapter.xml b/BOOK/final-preps/ppc64-chapter.xml
similarity index 52%
copy from BOOK/final-preps/chapter.xml
copy to BOOK/final-preps/ppc64-chapter.xml
index a1379f0..ca9cb6f 100644
--- a/BOOK/final-preps/chapter.xml
+++ b/BOOK/final-preps/ppc64-chapter.xml
@@ -10,11 +10,12 @@
<?dbhtml filename="chapter.html"?>
<title>Final Preparations</title>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="aboutclfs.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="creatingtoolsdir.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="creatingcrossdir.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="addinguser.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="settingenviron.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="abouttestsuites.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/aboutclfs.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingtoolsdir.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingcrossdir.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/addinguser.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/variables.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/abouttestsuites.xml"/>
</chapter>
diff --git a/BOOK/cross-tools/sparc64/variables.xml b/BOOK/final-preps/ppc64/variables.xml
similarity index 67%
rename from BOOK/cross-tools/sparc64/variables.xml
rename to BOOK/final-preps/ppc64/variables.xml
index cc2f845..56cedc8 100644
--- a/BOOK/cross-tools/sparc64/variables.xml
+++ b/BOOK/final-preps/ppc64/variables.xml
@@ -24,22 +24,30 @@
href="../x86/variables.xml"
xpointer="xpointer(//*[@os='c'])"/>
-<screen os="d"><userinput>export CLFS_TARGET="sparc64-unknown-linux-gnu"</userinput></screen>
+<screen os="d"><userinput>export CLFS_TARGET="powerpc64-unknown-linux-gnu"</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../x86_64/variables.xml"
- xpointer="xpointer(//*[@os='m1'])"/>
+ xpointer="xpointer(//*[@os='e'])"/>
+
+<screen os="f"><userinput>export CLFS_TARGET32="powerpc-unknown-linux-gnu"</userinput></screen>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../x86_64/variables.xml"
+ xpointer="xpointer(//*[@os='g'])"/>
-<screen os="m2"><userinput>export CLFS_TARGET32="sparcv9-unknown-linux-gnu"</userinput></screen>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../x86_64/variables.xml"
+ xpointer="xpointer(//*[@os='h'])"/>
<bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../x86/variables.xml"
- xpointer="xpointer(//*[@os='e'])"/>
+ href="../x86_64/variables.xml"
+ xpointer="xpointer(//*[@os='i'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
href="../x86_64/variables.xml"
- xpointer="xpointer(//*[@os='f'])"/>
+ xpointer="xpointer(//*[@os='j'])"/>
</sect1>
diff --git a/BOOK/final-preps/chapter.xml b/BOOK/final-preps/sparc-chapter.xml
similarity index 58%
copy from BOOK/final-preps/chapter.xml
copy to BOOK/final-preps/sparc-chapter.xml
index a1379f0..6ff03aa 100644
--- a/BOOK/final-preps/chapter.xml
+++ b/BOOK/final-preps/sparc-chapter.xml
@@ -10,11 +10,12 @@
<?dbhtml filename="chapter.html"?>
<title>Final Preparations</title>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="aboutclfs.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="creatingtoolsdir.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="creatingcrossdir.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="addinguser.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="settingenviron.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="abouttestsuites.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/aboutclfs.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingtoolsdir.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingcrossdir.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/addinguser.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc/variables.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/abouttestsuites.xml"/>
</chapter>
diff --git a/BOOK/cross-tools/sparc/variables.xml b/BOOK/final-preps/sparc/variables.xml
similarity index 91%
rename from BOOK/cross-tools/sparc/variables.xml
rename to BOOK/final-preps/sparc/variables.xml
index 063b756..a956b5e 100644
--- a/BOOK/cross-tools/sparc/variables.xml
+++ b/BOOK/final-preps/sparc/variables.xml
@@ -26,8 +26,10 @@
<screen os="d"><userinput>export CLFS_TARGET="sparc-unknown-linux-gnu"</userinput></screen>
+ <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
+
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../x86_64/variables.xml"
+ href="../x86/variables.xml"
xpointer="xpointer(//*[@os='e'])"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
diff --git a/BOOK/final-preps/chapter.xml b/BOOK/final-preps/sparc64-64-chapter.xml
similarity index 58%
copy from BOOK/final-preps/chapter.xml
copy to BOOK/final-preps/sparc64-64-chapter.xml
index a1379f0..4846bc4 100644
--- a/BOOK/final-preps/chapter.xml
+++ b/BOOK/final-preps/sparc64-64-chapter.xml
@@ -10,11 +10,12 @@
<?dbhtml filename="chapter.html"?>
<title>Final Preparations</title>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="aboutclfs.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="creatingtoolsdir.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="creatingcrossdir.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="addinguser.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="settingenviron.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="abouttestsuites.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/aboutclfs.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingtoolsdir.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingcrossdir.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/addinguser.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64-64/variables.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/abouttestsuites.xml"/>
</chapter>
diff --git a/BOOK/final-preps/sparc64-64/variables.xml b/BOOK/final-preps/sparc64-64/variables.xml
new file mode 100644
index 0000000..4c58d49
--- /dev/null
+++ b/BOOK/final-preps/sparc64-64/variables.xml
@@ -0,0 +1,90 @@
+<?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-cross-tools-variables">
+ <?dbhtml filename="variables.html"?>
+
+ <title>Build Variables</title>
+
+ <bridgehead renderas="sect4">Setting Host and Target</bridgehead>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../x86/variables.xml"
+ xpointer="xpointer(//*[@os='a'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../x86/variables.xml"
+ xpointer="xpointer(//*[@os='b'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../x86/variables.xml"
+ xpointer="xpointer(//*[@os='c'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../sparc64/variables.xml"
+ xpointer="xpointer(//*[@os='d'])"/>
+
+ <para os="g">We will need to setup target specific flags for the compiler
+ and linkers. You can choose the appropriate BUILD64 and GCCTARGET
+ from the table at the bottom of the page.</para>
+
+<screen os="h"><userinput>export BUILD64="<replaceable>[BUILD64 entries]</replaceable>"
+export GCCTARGET="<replaceable>[GCCTARGET entries]</replaceable>"</userinput></screen>
+
+ <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../x86_64-64/variables.xml"
+ xpointer="xpointer(//*[@os='i'])"/>
+
+<screen os="j"><userinput>cat >> ~/.bashrc << EOF
+export CLFS_HOST="${CLFS_HOST}"
+export CLFS_TARGET="${CLFS_TARGET}"
+export BUILD64="${BUILD64}"
+export GCCTARGET="${GCCTARGET}"
+EOF</userinput></screen>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../sparc64/variables.xml"
+ xpointer="xpointer(//*[@os='k'])"/>
+
+ <table os="l">
+ <title>List of architectures, target triplets, and recommended book</title>
+ <?dbfo table-width="7in" ?>
+
+ <tgroup cols="3">
+
+ <colspec colnum="1" colwidth="1in" colname="Processor"/>
+ <colspec colnum="2" colwidth="3.2in" colname="Build64"/>
+ <colspec colnum="3" colwidth="2.8in" colname="GCC"/>
+
+ <thead>
+ <row>
+ <entry>Processor</entry>
+ <entry>BUILD64</entry>
+ <entry>GCCTARGET</entry>
+ </row>
+ </thead>
+
+ <tbody>
+ <row>
+ <entry>Ultrasparc and Ultrasparc2</entry>
+ <entry>-m64 -mcpu=ultrasparc -mtune=ultrasparc</entry>
+ <entry>-mcpu=ultrasparc -mtune=ultrasparc</entry>
+ </row>
+ <row>
+ <entry>Ultrasparc3</entry>
+ <entry>-m64 -mcpu=ultrasparc3 -mtune=ultrasparc3</entry>
+ <entry>-mcpu=ultrasparc3 -mtune=ultrasparc3</entry>
+ </row>
+ </tbody>
+
+ </tgroup>
+
+ </table>
+
+</sect1>
diff --git a/BOOK/final-preps/chapter.xml b/BOOK/final-preps/sparc64-chapter.xml
similarity index 58%
copy from BOOK/final-preps/chapter.xml
copy to BOOK/final-preps/sparc64-chapter.xml
index a1379f0..0ee7765 100644
--- a/BOOK/final-preps/chapter.xml
+++ b/BOOK/final-preps/sparc64-chapter.xml
@@ -10,11 +10,12 @@
<?dbhtml filename="chapter.html"?>
<title>Final Preparations</title>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="aboutclfs.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="creatingtoolsdir.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="creatingcrossdir.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="addinguser.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="settingenviron.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="abouttestsuites.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/aboutclfs.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingtoolsdir.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingcrossdir.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/addinguser.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sparc64/variables.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/abouttestsuites.xml"/>
</chapter>
diff --git a/BOOK/cross-tools/sparc64/flags.xml b/BOOK/final-preps/sparc64/variables.xml
similarity index 55%
rename from BOOK/cross-tools/sparc64/flags.xml
rename to BOOK/final-preps/sparc64/variables.xml
index 13ed98d..f26fa17 100644
--- a/BOOK/cross-tools/sparc64/flags.xml
+++ b/BOOK/final-preps/sparc64/variables.xml
@@ -5,34 +5,62 @@
%general-entities;
]>
-<sect1 id="ch-cross-tools-flags">
- <title>Build Flags</title>
- <?dbhtml filename="flags.html"?>
+<sect1 id="ch-cross-tools-variables">
+ <?dbhtml filename="variables.html"?>
- <para os="a">We will need to setup target specific flags for the compiler
- and linkers. You can choose the appropriate BUILD32 and BUILD64
+ <title>Build Variables</title>
+
+ <bridgehead renderas="sect4">Setting Host and Target</bridgehead>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../x86/variables.xml"
+ xpointer="xpointer(//*[@os='a'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../x86/variables.xml"
+ xpointer="xpointer(//*[@os='b'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../x86/variables.xml"
+ xpointer="xpointer(//*[@os='c'])"/>
+
+<screen os="d"><userinput>export CLFS_TARGET="sparc64-unknown-linux-gnu"</userinput></screen>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../x86_64/variables.xml"
+ xpointer="xpointer(//*[@os='e'])"/>
+
+<screen os="f"><userinput>export CLFS_TARGET32="sparcv9-unknown-linux-gnu"</userinput></screen>
+
+ <para os="g">We will need to setup target specific flags for the compiler
+ and linkers. You can choose the appropriate BUILD32, BUILD64, and GCCTARGET
from the table at the bottom of the page.</para>
-<screen os="b"><userinput>export BUILD32="<replaceable>[BUILD32 entries]</replaceable>"
+<screen os="h"><userinput>export BUILD32="<replaceable>[BUILD32 entries]</replaceable>"
export BUILD64="<replaceable>[BUILD64 entries]</replaceable>"
export GCCTARGET="<replaceable>[GCCTARGET entries]</replaceable>"</userinput></screen>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../multilib/flags.xml"
- xpointer="xpointer(//*[@os='c'])"/>
+ <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../x86_64/variables.xml"
+ xpointer="xpointer(//*[@os='i'])"/>
-<screen os="d"><userinput>cat >> ~/.bashrc << EOF
+<screen os="j"><userinput>cat >> ~/.bashrc << EOF
+export CLFS_HOST="${CLFS_HOST}"
+export CLFS_TARGET="${CLFS_TARGET}"
+export CLFS_TARGET32="${CLFS_TARGET32}"
export BUILD32="${BUILD32}"
export BUILD64="${BUILD64}"
export GCCTARGET="${GCCTARGET}"
EOF</userinput></screen>
- <para os="e">The following table gives the entires for different Sparc 64 capable
+ <para os="k">The following table gives the entries for different Sparc 64 capable
processors. Pick the processor that matches your system. Note: GCC settings are
only needed in the early sections of the book, and will not be used in the final-system
builds.</para>
- <table os="f">
+ <table os="l">
<title>List of 32-Bit settings, 64-Bit Build settings, and GCC setting</title>
<?dbfo table-width="7in" ?>
diff --git a/BOOK/final-preps/chapter.xml b/BOOK/final-preps/x86-chapter.xml
similarity index 52%
copy from BOOK/final-preps/chapter.xml
copy to BOOK/final-preps/x86-chapter.xml
index a1379f0..40585b8 100644
--- a/BOOK/final-preps/chapter.xml
+++ b/BOOK/final-preps/x86-chapter.xml
@@ -10,11 +10,12 @@
<?dbhtml filename="chapter.html"?>
<title>Final Preparations</title>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="aboutclfs.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="creatingtoolsdir.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="creatingcrossdir.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="addinguser.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="settingenviron.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="abouttestsuites.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/aboutclfs.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingtoolsdir.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingcrossdir.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/addinguser.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86/variables.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/abouttestsuites.xml"/>
</chapter>
diff --git a/BOOK/cross-tools/x86/variables.xml b/BOOK/final-preps/x86/variables.xml
similarity index 100%
rename from BOOK/cross-tools/x86/variables.xml
rename to BOOK/final-preps/x86/variables.xml
diff --git a/BOOK/final-preps/chapter.xml b/BOOK/final-preps/x86_64-64-chapter.xml
similarity index 52%
copy from BOOK/final-preps/chapter.xml
copy to BOOK/final-preps/x86_64-64-chapter.xml
index a1379f0..c832352 100644
--- a/BOOK/final-preps/chapter.xml
+++ b/BOOK/final-preps/x86_64-64-chapter.xml
@@ -10,11 +10,12 @@
<?dbhtml filename="chapter.html"?>
<title>Final Preparations</title>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="aboutclfs.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="creatingtoolsdir.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="creatingcrossdir.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="addinguser.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="settingenviron.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="abouttestsuites.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/aboutclfs.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingtoolsdir.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingcrossdir.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/addinguser.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/variables.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/abouttestsuites.xml"/>
</chapter>
diff --git a/BOOK/cross-tools/x86_64-64/variables.xml b/BOOK/final-preps/x86_64-64/variables.xml
similarity index 74%
rename from BOOK/cross-tools/x86_64-64/variables.xml
rename to BOOK/final-preps/x86_64-64/variables.xml
index 6d24567..05a3f0e 100644
--- a/BOOK/cross-tools/x86_64-64/variables.xml
+++ b/BOOK/final-preps/x86_64-64/variables.xml
@@ -28,14 +28,22 @@
href="../x86_64/variables.xml"
xpointer="xpointer(//*[@os='d'])"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+ href="../x86_64/variables.xml"
+ xpointer="xpointer(//*[@os='g'])"/>
+
+<screen os="h"><userinput>export BUILD64="-m64"</userinput></screen>
+
<bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../x86/variables.xml"
- xpointer="xpointer(//*[@os='e'])"/>
+ href="../x86_64/variables.xml"
+ xpointer="xpointer(//*[@os='i'])"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../x86/variables.xml"
- xpointer="xpointer(//*[@os='f'])"/>
+<screen os="j"><userinput>cat >> ~/.bashrc << EOF
+export CLFS_HOST="${CLFS_HOST}"
+export CLFS_TARGET="${CLFS_TARGET}"
+export BUILD64="${BUILD64}"
+EOF</userinput></screen>
</sect1>
diff --git a/BOOK/final-preps/chapter.xml b/BOOK/final-preps/x86_64-chapter.xml
similarity index 52%
rename from BOOK/final-preps/chapter.xml
rename to BOOK/final-preps/x86_64-chapter.xml
index a1379f0..448f6d9 100644
--- a/BOOK/final-preps/chapter.xml
+++ b/BOOK/final-preps/x86_64-chapter.xml
@@ -10,11 +10,12 @@
<?dbhtml filename="chapter.html"?>
<title>Final Preparations</title>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="aboutclfs.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="creatingtoolsdir.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="creatingcrossdir.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="addinguser.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="settingenviron.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="abouttestsuites.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/aboutclfs.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingtoolsdir.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/creatingcrossdir.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/addinguser.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/settingenviron.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/variables.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/abouttestsuites.xml"/>
</chapter>
diff --git a/BOOK/cross-tools/x86_64/variables.xml b/BOOK/final-preps/x86_64/variables.xml
similarity index 63%
rename from BOOK/cross-tools/x86_64/variables.xml
rename to BOOK/final-preps/x86_64/variables.xml
index 1828f6a..fad111c 100644
--- a/BOOK/cross-tools/x86_64/variables.xml
+++ b/BOOK/final-preps/x86_64/variables.xml
@@ -26,20 +26,28 @@
<screen os="d"><userinput>export CLFS_TARGET="x86_64-unknown-linux-gnu"</userinput></screen>
- <para os="m1">Now set the target triplet for 32 bits:</para>
+ <para os="e">Now set the target triplet for 32 bits:</para>
-<screen os="m2"><userinput>export CLFS_TARGET32="i686-pc-linux-gnu"</userinput></screen>
+<screen os="f"><userinput>export CLFS_TARGET32="i686-pc-linux-gnu"</userinput></screen>
+
+ <para os="g">We will need to setup target-specific flags for the compiler
+ and linker:</para>
+
+<screen os="h"><userinput>export BUILD32="-m32"
+export BUILD64="-m64"</userinput></screen>
<bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="../x86/variables.xml"
- xpointer="xpointer(//*[@os='e'])"/>
+ <para os="i">Now add the host and target variables, and compiler and linker
+ flags, to <filename>~/.bashrc</filename>, just in case you have to exit and
+ restart building later:</para>
-<screen os="f"><userinput>cat >> ~/.bashrc << EOF
+<screen os="j"><userinput>cat >> ~/.bashrc << EOF
export CLFS_HOST="${CLFS_HOST}"
export CLFS_TARGET="${CLFS_TARGET}"
export CLFS_TARGET32="${CLFS_TARGET32}"
+export BUILD32="${BUILD32}"
+export BUILD64="${BUILD64}"
EOF</userinput></screen>
</sect1>
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index b671b0e..a24f67b 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -44,6 +44,11 @@
clfs user's default .bashrc, and removed the separate page where
this was done.</para>
</listitem>
+ <listitem>
+ <para>[Chris] - Removed separate "Build flags" pages and moved that
+ info to "Build Variables" pages, and moved those from cross-tools
+ to final-preps.</para>
+ </listitem>
</itemizedlist>
</listitem>
diff --git a/BOOK/mips-index.xml b/BOOK/mips-index.xml
index 3abbf70..5d23a9b 100644
--- a/BOOK/mips-index.xml
+++ b/BOOK/mips-index.xml
@@ -27,7 +27,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="partitioning/mips-chapter.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="materials/mips-chapter.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/chapter.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/mips-chapter.xml"/>
</part>
diff --git a/BOOK/mips64-64-index.xml b/BOOK/mips64-64-index.xml
index 3052366..a5bc28d 100644
--- a/BOOK/mips64-64-index.xml
+++ b/BOOK/mips64-64-index.xml
@@ -27,7 +27,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="partitioning/mips-chapter.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="materials/mips64-64-chapter.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/chapter.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/mips64-64-chapter.xml"/>
</part>
diff --git a/BOOK/mips64-index.xml b/BOOK/mips64-index.xml
index 078c675..31c2e00 100644
--- a/BOOK/mips64-index.xml
+++ b/BOOK/mips64-index.xml
@@ -27,7 +27,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="partitioning/mips-chapter.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="materials/mips64-chapter.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/chapter.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/mips64-chapter.xml"/>
</part>
diff --git a/BOOK/ppc-index.xml b/BOOK/ppc-index.xml
index f6d8865..0140725 100644
--- a/BOOK/ppc-index.xml
+++ b/BOOK/ppc-index.xml
@@ -29,7 +29,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="partitioning/ppc-chapter.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="materials/ppc-chapter.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/chapter.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/ppc-chapter.xml"/>
</part>
diff --git a/BOOK/ppc64-64-index.xml b/BOOK/ppc64-64-index.xml
index 98965a0..996c99c 100644
--- a/BOOK/ppc64-64-index.xml
+++ b/BOOK/ppc64-64-index.xml
@@ -29,7 +29,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="partitioning/ppc-chapter.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="materials/ppc64-64-chapter.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/chapter.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/ppc64-64-chapter.xml"/>
</part>
diff --git a/BOOK/ppc64-index.xml b/BOOK/ppc64-index.xml
index d684877..28d0bf1 100644
--- a/BOOK/ppc64-index.xml
+++ b/BOOK/ppc64-index.xml
@@ -29,7 +29,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="partitioning/ppc64-chapter.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="materials/ppc64-chapter.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/chapter.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/ppc64-chapter.xml"/>
</part>
diff --git a/BOOK/sparc-index.xml b/BOOK/sparc-index.xml
index a3085db..dfd5417 100644
--- a/BOOK/sparc-index.xml
+++ b/BOOK/sparc-index.xml
@@ -29,7 +29,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="partitioning/sparc-chapter.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="materials/sparc-chapter.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/chapter.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/sparc-chapter.xml"/>
</part>
diff --git a/BOOK/sparc64-64-index.xml b/BOOK/sparc64-64-index.xml
index acf043b..993ac29 100644
--- a/BOOK/sparc64-64-index.xml
+++ b/BOOK/sparc64-64-index.xml
@@ -29,7 +29,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="partitioning/sparc64-chapter.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="materials/sparc64-64-chapter.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/chapter.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/sparc64-64-chapter.xml"/>
</part>
diff --git a/BOOK/sparc64-index.xml b/BOOK/sparc64-index.xml
index fa9ffe6..064b74c 100644
--- a/BOOK/sparc64-index.xml
+++ b/BOOK/sparc64-index.xml
@@ -29,7 +29,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="partitioning/sparc64-chapter.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="materials/sparc64-chapter.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/chapter.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/sparc64-chapter.xml"/>
</part>
diff --git a/BOOK/x86-index.xml b/BOOK/x86-index.xml
index e8a7268..7253677 100644
--- a/BOOK/x86-index.xml
+++ b/BOOK/x86-index.xml
@@ -29,7 +29,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="partitioning/x86-chapter.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="materials/x86-chapter.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/chapter.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/x86-chapter.xml"/>
</part>
diff --git a/BOOK/x86_64-64-index.xml b/BOOK/x86_64-64-index.xml
index dd4a50a..757bf35 100644
--- a/BOOK/x86_64-64-index.xml
+++ b/BOOK/x86_64-64-index.xml
@@ -29,7 +29,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="partitioning/x86-chapter.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="materials/x86_64-64-chapter.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/chapter.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/x86_64-64-chapter.xml"/>
</part>
diff --git a/BOOK/x86_64-index.xml b/BOOK/x86_64-index.xml
index 81dce16..0237416 100644
--- a/BOOK/x86_64-index.xml
+++ b/BOOK/x86_64-index.xml
@@ -29,7 +29,7 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="partitioning/x86-chapter.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="materials/x86_64-chapter.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/chapter.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="final-preps/x86_64-chapter.xml"/>
</part>
commit 9a6583371b9d0bfbefa8f6cd70b1c94e4b92d266
Author: Chris Staub <chris at beaker67.com>
Date: Tue May 20 05:36:03 2014 -0400
Fixed another occurence of testsuite
diff --git a/BOOK/testsuite-tools/common/introduction.xml b/BOOK/testsuite-tools/common/introduction.xml
index a97ace8..a09ff59 100644
--- a/BOOK/testsuite-tools/common/introduction.xml
+++ b/BOOK/testsuite-tools/common/introduction.xml
@@ -12,7 +12,7 @@
<para>This chapter builds the tools needed by some packages to run the tests
that they have. I.e., <command>make check</command>. Tcl, Expect,
- and DejaGNU are needed for the GCC, Binutils, and Findutils testsuites.
+ and DejaGNU are needed for the GCC, Binutils, and Findutils test suites.
Installing three packages for testing purposes may seem excessive, but it is
very reassuring, if not essential, to know that the most important tools are
working properly.</para>
commit 33346dd55f8dbcda977621aa7d4b94f7dfaa60dd
Author: Chris Staub <chris at beaker67.com>
Date: Tue May 20 05:30:28 2014 -0400
More consistently use 'test suite' rather than 'testsuite'
Conflicts:
BOOK/appendices/dependencies/common.xml
BOOK/final-system/common/dbus.xml
diff --git a/BOOK/appendices/dependencies/common.xml b/BOOK/appendices/dependencies/common.xml
index 0c687c8..2daa600 100644
--- a/BOOK/appendices/dependencies/common.xml
+++ b/BOOK/appendices/dependencies/common.xml
@@ -22,7 +22,7 @@
The first lists what other packages need to be available in order to compile
and install the package in question. The second lists what packages, in
addition to those on the first list, need to be available in order to run the
- testsuites. The last list of dependencies are packages that require this
+ test suites. The last list of dependencies are packages that require this
package to be built and installed in its final location before they are built
and installed. In most cases, this is because these packages will hardcode
paths to binaries within their scripts. If not built in a certain order,
@@ -378,7 +378,7 @@
<segtitle>&testsuites;</segtitle>
<seglistitem>
- <seg>No testsuite available</seg>
+ <seg>No test suite available</seg>
</seglistitem>
</segmentedlist>
@@ -406,7 +406,7 @@
<segtitle>&testsuites;</segtitle>
<seglistitem>
- <seg>No testsuite available</seg>
+ <seg>No test suite available</seg>
</seglistitem>
</segmentedlist>
@@ -434,7 +434,7 @@
<segtitle>&testsuites;</segtitle>
<seglistitem>
- <seg>No testsuite available</seg>
+ <seg>No test suite available</seg>
</seglistitem>
</segmentedlist>
@@ -518,7 +518,7 @@
<segtitle>&testsuites;</segtitle>
<seglistitem>
- <seg>No testsuite available</seg>
+ <seg>No test suite available</seg>
</seglistitem>
</segmentedlist>
@@ -824,7 +824,7 @@
<segtitle>&testsuites;</segtitle>
<seglistitem>
- <seg>No testsuite available</seg>
+ <seg>No test suite available</seg>
</seglistitem>
</segmentedlist>
@@ -879,7 +879,7 @@
<segtitle>&testsuites;</segtitle>
<seglistitem>
- <seg>No testsuite available</seg>
+ <seg>No test suite available</seg>
</seglistitem>
</segmentedlist>
@@ -907,7 +907,7 @@
<segtitle>&testsuites;</segtitle>
<seglistitem>
- <seg>No testsuite available</seg>
+ <seg>No test suite available</seg>
</seglistitem>
</segmentedlist>
@@ -934,7 +934,7 @@
<segtitle>&testsuites;</segtitle>
<seglistitem>
- <seg>No testsuite available</seg>
+ <seg>No test suite available</seg>
</seglistitem>
</segmentedlist>
@@ -990,7 +990,7 @@
<segtitle>&testsuites;</segtitle>
<seglistitem>
- <seg>No testsuite available</seg>
+ <seg>No test suite available</seg>
</seglistitem>
</segmentedlist>
@@ -1019,7 +1019,7 @@
<segtitle>&testsuites;</segtitle>
<seglistitem>
- <seg>No testsuite available</seg>
+ <seg>No test suite available</seg>
</seglistitem>
</segmentedlist>
@@ -1047,7 +1047,7 @@
<segtitle>&testsuites;</segtitle>
<seglistitem>
- <seg>No testsuite available</seg>
+ <seg>No test suite available</seg>
</seglistitem>
</segmentedlist>
@@ -1075,7 +1075,7 @@
<segtitle>&testsuites;</segtitle>
<seglistitem>
- <seg>None</seg>
+ <seg>No test suite available</seg>
</seglistitem>
</segmentedlist>
@@ -1186,7 +1186,7 @@
<segtitle>&testsuites;</segtitle>
<seglistitem>
- <seg>No testsuite available</seg>
+ <seg>No test suite available</seg>
</seglistitem>
</segmentedlist>
@@ -1214,7 +1214,7 @@
<segtitle>&testsuites;</segtitle>
<seglistitem>
- <seg>No testsuite available</seg>
+ <seg>No test suite available</seg>
</seglistitem>
</segmentedlist>
@@ -1298,7 +1298,7 @@
<segtitle>&testsuites;</segtitle>
<seglistitem>
- <seg>No testsuite available</seg>
+ <seg>No test suite available</seg>
</seglistitem>
</segmentedlist>
@@ -1325,7 +1325,7 @@
<segtitle>&testsuites;</segtitle>
<seglistitem>
- <seg>No testsuite available</seg>
+ <seg>No test suite available</seg>
</seglistitem>
</segmentedlist>
@@ -1437,7 +1437,7 @@
<segtitle>&testsuites;</segtitle>
<seglistitem>
- <seg>No testsuite available</seg>
+ <seg>No test suite available</seg>
</seglistitem>
</segmentedlist>
@@ -1465,7 +1465,7 @@
<segtitle>&testsuites;</segtitle>
<seglistitem>
- <seg>No testsuite available</seg>
+ <seg>No test suite available</seg>
</seglistitem>
</segmentedlist>
@@ -1548,7 +1548,7 @@
<segtitle>&testsuites;</segtitle>
<seglistitem>
- <seg>No testsuite available</seg>
+ <seg>No test suite available</seg>
</seglistitem>
</segmentedlist>
@@ -1576,7 +1576,7 @@
<segtitle>&testsuites;</segtitle>
<seglistitem>
- <seg>No testsuite available</seg>
+ <seg>No test suite available</seg>
</seglistitem>
</segmentedlist>
@@ -1604,7 +1604,7 @@
<segtitle>&testsuites;</segtitle>
<seglistitem>
- <seg>No testsuite available</seg>
+ <seg>No test suite available</seg>
</seglistitem>
</segmentedlist>
@@ -1688,7 +1688,7 @@
<segtitle>&testsuites;</segtitle>
<seglistitem>
- <seg>No testsuite available</seg>
+ <seg>No test suite available</seg>
</seglistitem>
</segmentedlist>
@@ -1715,7 +1715,7 @@
<segtitle>&testsuites;</segtitle>
<seglistitem>
- <seg>No testsuite available</seg>
+ <seg>No test suite available</seg>
</seglistitem>
</segmentedlist>
@@ -1827,7 +1827,7 @@
<segtitle>&testsuites;</segtitle>
<seglistitem>
- <seg>No testsuite available</seg>
+ <seg>No test suite available</seg>
</seglistitem>
</segmentedlist>
diff --git a/BOOK/appendices/rationale/common.xml b/BOOK/appendices/rationale/common.xml
index 137f43e..00dbd40 100644
--- a/BOOK/appendices/rationale/common.xml
+++ b/BOOK/appendices/rationale/common.xml
@@ -87,7 +87,7 @@
<listitem>
<para>Check</para>
<para>This package contains a test harness for other programs. It is
- used for some packages' testsuites.</para>
+ used for some packages' test suites.</para>
</listitem>
<listitem>
@@ -109,7 +109,7 @@
<listitem>
<para>DejaGNU</para>
- <para>This package is needed for the testsuites of several packages,
+ <para>This package is needed for the test suites of several packages,
especially GCC and Binutils.</para>
</listitem>
@@ -143,7 +143,7 @@
<listitem>
<para>Expect</para>
- <para>This package is needed for the testsuites for several packages.</para>
+ <para>This package is needed for the test suites for several packages.</para>
</listitem>
<listitem>
@@ -399,7 +399,7 @@
<listitem>
<para>Tcl</para>
- <para>Needed for the testsuites of several packages</para>
+ <para>Needed for the test suites of several packages</para>
</listitem>
<listitem>
diff --git a/BOOK/boot/64/createfiles.xml b/BOOK/boot/64/createfiles.xml
index 7e689f6..63214e6 100644
--- a/BOOK/boot/64/createfiles.xml
+++ b/BOOK/boot/64/createfiles.xml
@@ -24,7 +24,7 @@
href="../common/createfiles.xml"
xpointer="xpointer(//*[@os='c'])"/>
- <para os="f">To enable some C++ tests in the Glibc and Binutils testsuites
+ <para os="f">To enable some C++ tests in the Glibc and Binutils test suites
to link, create a directory and make some symbolic links:</para>
<screen os="g"><userinput>mkdir -pv ${CLFS}/usr/lib64
diff --git a/BOOK/boot/common/createfiles.xml b/BOOK/boot/common/createfiles.xml
index 4f35457..1d7e3ba 100644
--- a/BOOK/boot/common/createfiles.xml
+++ b/BOOK/boot/common/createfiles.xml
@@ -46,7 +46,7 @@ ln -sv /tools/etc/{login.{access,defs},limits} ${CLFS}/etc</userinput></screen>
<varlistentry os="c3">
<term><parameter><filename>/bin/echo</filename></parameter></term>
<listitem>
- <para>This is to satisfy one of the tests in Glibc's testsuite, which
+ <para>This is to satisfy one of the tests in Glibc's test suite, which
will fail in <command>echo</command> is not found in
<filename class="directory">/bin</filename>.</para>
</listitem>
@@ -80,7 +80,7 @@ ln -sv /tools/etc/{login.{access,defs},limits} ${CLFS}/etc</userinput></screen>
<term><parameter><filename>/bin/stty</filename></parameter></term>
<listitem>
<para>This pathname is hard-coded into Expect, therefore it is needed
- for Binutils and GCC testsuites to pass.</para>
+ for Binutils and GCC test suites to pass.</para>
</listitem>
</varlistentry>
@@ -102,7 +102,7 @@ ln -sv /tools/etc/{login.{access,defs},limits} ${CLFS}/etc</userinput></screen>
<varlistentry os="c10">
<term><parameter><filename>/usr/lib/libstdc++{,.6}</filename></parameter></term>
<listitem>
- <para>This is needed by several tests in Glibc's testsuite, as well as
+ <para>This is needed by several tests in Glibc's test suite, as well as
for C++ support in GMP.</para>
</listitem>
</varlistentry>
diff --git a/BOOK/final-system/common/coreutils.xml b/BOOK/final-system/common/coreutils.xml
index 0b2e5ad..effc02c 100644
--- a/BOOK/final-system/common/coreutils.xml
+++ b/BOOK/final-system/common/coreutils.xml
@@ -61,7 +61,7 @@
<screen os="h"><userinput remap="test">make NON_ROOT_USERNAME=nobody check-root</userinput></screen>
- <para os="i">The testsuite will now be run as the
+ <para os="i">The test suite will now be run as the
<systemitem class="username">nobody</systemitem> user. Some tests require
that the user be a member of more than one group. Add a temporary group
and make the user <systemitem class="username">nobody</systemitem> a part
diff --git a/BOOK/final-system/common/glibc.xml b/BOOK/final-system/common/glibc.xml
index eefb4c8..9aa723d 100644
--- a/BOOK/final-system/common/glibc.xml
+++ b/BOOK/final-system/common/glibc.xml
@@ -102,7 +102,7 @@ cd ../glibc-build</userinput></screen>
Do not skip it under any circumstance.</para>
</important>
- <para os="m">Use the following commands to run the testsuite and output
+ <para os="m">Use the following commands to run the test suite and output
any test failures:</para>
<!-- items n,o,p no longer the master, use x86_64 which has no failures -->
diff --git a/BOOK/final-system/common/perl.xml b/BOOK/final-system/common/perl.xml
index a437c08..1a4f9cf 100644
--- a/BOOK/final-system/common/perl.xml
+++ b/BOOK/final-system/common/perl.xml
@@ -43,7 +43,7 @@
<para os="a01">Before starting to configure, create a basic
<filename>/etc/hosts</filename> file which will be referenced by one
- of Perl's configuration files as well as used by the testsuite:</para>
+ of Perl's configuration files as well as used by the test suite:</para>
<screen os="a02"><userinput remap="test">echo "127.0.0.1 localhost $(hostname)" > /etc/hosts</userinput></screen>
diff --git a/BOOK/final-system/common/testsuitesagain.xml b/BOOK/final-system/common/testsuitesagain.xml
index 64c20a9..96badf6 100644
--- a/BOOK/final-system/common/testsuitesagain.xml
+++ b/BOOK/final-system/common/testsuitesagain.xml
@@ -11,7 +11,7 @@
<title>About Test Suites, Again</title>
<para>In the final-system build, you are no longer cross-compiling so it
- is possible to run package testsuites. Running the test suite for a
+ is possible to run package test suites. Running the test suite for a
newly built package is a good idea because it can provide a <quote>sanity
check</quote> indicating that everything compiled correctly. A test suite
that passes its set of checks usually proves that the package is
diff --git a/BOOK/temp-system/common/bzip2.xml b/BOOK/temp-system/common/bzip2.xml
index bdd49a8..4b8571c 100644
--- a/BOOK/temp-system/common/bzip2.xml
+++ b/BOOK/temp-system/common/bzip2.xml
@@ -23,7 +23,7 @@
<title>Installation of Bzip2</title>
<para os="ca">Bzip2's default <filename>Makefile</filename> target
- automatically runs the testsuite as well. Disable the tests since they
+ automatically runs the test suite as well. Disable the tests since they
won't work on a multi-architecture build:</para>
<screen os="cb"><userinput>cp -v Makefile{,.orig}
diff --git a/BOOK/temp-system/common/coreutils.xml b/BOOK/temp-system/common/coreutils.xml
index 5b29524..445cb36 100644
--- a/BOOK/temp-system/common/coreutils.xml
+++ b/BOOK/temp-system/common/coreutils.xml
@@ -49,7 +49,7 @@ EOF</userinput></screen>
<term><parameter>--enable-install-program=hostname</parameter></term>
<listitem>
<para>Tells Coreutils to install <command>hostname</command>,
- which is needed for the Perl testsuite.</para>
+ which is needed for the Perl test suite.</para>
</listitem>
</varlistentry>
diff --git a/BOOK/temp-system/multilib/bzip2.xml b/BOOK/temp-system/multilib/bzip2.xml
index 2b3d05b..182b53a 100644
--- a/BOOK/temp-system/multilib/bzip2.xml
+++ b/BOOK/temp-system/multilib/bzip2.xml
@@ -23,7 +23,7 @@
<title>Installation of Bzip2</title>
<para os="m1">Bzip2's default Makefile target automatically runs the
- testsuite as well. We need to remove the tests since they won't work on
+ test suite as well. We need to remove the tests since they won't work on
a multi-architecture build, and change the default lib path
to <filename class="directory">lib64</filename>:</para>
commit 1de8183e195dc82b0076536fe368c8053c8a8ef2
Author: Chris Staub <chris at beaker67.com>
Date: Tue May 20 04:18:00 2014 -0400
Put archs in top-index in alphabetical order
diff --git a/BOOK/stylesheets/top-index.xsl b/BOOK/stylesheets/top-index.xsl
index b36d814..5e9436d 100644
--- a/BOOK/stylesheets/top-index.xsl
+++ b/BOOK/stylesheets/top-index.xsl
@@ -111,15 +111,15 @@ hr {
</li>
<li>
<h4>
- <a href="ppc">
- <xsl:text>PowerPC</xsl:text>
+ <a href="mips">
+ <xsl:text>MIPS</xsl:text>
</a>
</h4>
</li>
<li>
<h4>
- <a href="mips">
- <xsl:text>MIPS</xsl:text>
+ <a href="ppc">
+ <xsl:text>PowerPC</xsl:text>
</a>
</h4>
</li>
@@ -147,16 +147,15 @@ hr {
</li>
<li>
<h4>
- <a href="ppc64-64">
- <xsl:text>PowerPC64</xsl:text>
+ <a href="mips64-64">
+ <xsl:text>MIPS</xsl:text>
</a>
</h4>
</li>
-
<li>
<h4>
- <a href="mips64-64">
- <xsl:text>MIPS</xsl:text>
+ <a href="ppc64-64">
+ <xsl:text>PowerPC64</xsl:text>
</a>
</h4>
</li>
@@ -191,16 +190,16 @@ hr {
</li>
<li>
<h4>
- <a href="sparc64">
- <xsl:text>Sparc v9/Ultrasparc</xsl:text>
- </a>
+ <a href="ppc64">
+ <xsl:text>PowerPC64</xsl:text>
+ </a>
</h4>
</li>
<li>
<h4>
- <a href="ppc64">
- <xsl:text>PowerPC64</xsl:text>
- </a>
+ <a href="sparc64">
+ <xsl:text>Sparc v9/Ultrasparc</xsl:text>
+ </a>
</h4>
</li>
</ul>
-----------------------------------------------------------------------
Summary of changes:
BOOK/chroot/sparc64-64/flags.xml | 8 +-
BOOK/chroot/sparc64/flags.xml | 8 +-
BOOK/cross-tools/64/flags.xml | 23 -----
BOOK/cross-tools/mips-chapter.xml | 1 -
BOOK/cross-tools/mips64-64-chapter.xml | 2 -
BOOK/cross-tools/mips64-64/flags.xml | 27 ------
BOOK/cross-tools/mips64-chapter.xml | 2 -
BOOK/cross-tools/mips64/flags.xml | 31 -------
BOOK/cross-tools/multilib/flags.xml | 27 ------
BOOK/cross-tools/ppc-chapter.xml | 1 -
BOOK/cross-tools/ppc64-64-chapter.xml | 2 -
BOOK/cross-tools/ppc64-64/variables.xml | 37 --------
BOOK/cross-tools/ppc64-chapter.xml | 2 -
BOOK/cross-tools/sparc-chapter.xml | 1 -
BOOK/cross-tools/sparc64-64-chapter.xml | 2 -
BOOK/cross-tools/sparc64-64/flags.xml | 68 ---------------
BOOK/cross-tools/sparc64-64/variables.xml | 41 ---------
BOOK/cross-tools/sparc64-chapter.xml | 2 -
BOOK/cross-tools/x86-chapter.xml | 1 -
BOOK/cross-tools/x86_64-64-chapter.xml | 2 -
BOOK/cross-tools/x86_64-chapter.xml | 2 -
BOOK/final-preps/chapter.xml | 20 -----
BOOK/final-preps/{ => common}/aboutclfs.xml | 2 +-
BOOK/final-preps/{ => common}/abouttestsuites.xml | 2 +-
BOOK/final-preps/{ => common}/addinguser.xml | 2 +-
BOOK/final-preps/{ => common}/creatingcrossdir.xml | 2 +-
BOOK/final-preps/{ => common}/creatingtoolsdir.xml | 2 +-
BOOK/final-preps/{ => common}/settingenviron.xml | 2 +-
BOOK/{network => final-preps}/mips-chapter.xml | 20 ++--
.../mips/variables.xml | 4 +-
.../{network => final-preps}/mips64-64-chapter.xml | 20 ++--
.../mips64-64/variables.xml | 16 +++-
BOOK/{network => final-preps}/mips64-chapter.xml | 20 ++--
.../mips64/variables.xml | 27 +++++--
BOOK/{introduction => final-preps}/ppc-chapter.xml | 24 ++---
.../{cross-tools => final-preps}/ppc/variables.xml | 4 +-
.../ppc64-64-chapter.xml} | 24 ++---
.../ppc64 => final-preps/ppc64-64}/variables.xml | 18 +++--
.../ppc64-chapter.xml} | 24 ++---
.../sparc64 => final-preps/ppc64}/variables.xml | 20 +++--
.../sparc-chapter.xml} | 24 ++---
.../sparc/variables.xml | 4 +-
.../sparc64-64-chapter.xml} | 24 ++---
BOOK/final-preps/sparc64-64/variables.xml | 90 ++++++++++++++++++++
.../sparc64-chapter.xml | 24 ++---
.../sparc64/variables.xml} | 52 +++++++++---
BOOK/{network => final-preps}/x86-chapter.xml | 20 ++--
.../{cross-tools => final-preps}/x86/variables.xml | 0
.../{network => final-preps}/x86_64-64-chapter.xml | 20 ++--
.../x86_64-64/variables.xml | 18 +++-
.../x86_64-chapter.xml} | 20 ++--
.../x86_64/variables.xml | 20 +++--
BOOK/introduction/common/changelog.xml | 5 +
BOOK/mips-index.xml | 2 +-
BOOK/mips64-64-index.xml | 2 +-
BOOK/mips64-index.xml | 2 +-
BOOK/ppc-index.xml | 2 +-
BOOK/ppc64-64-index.xml | 2 +-
BOOK/ppc64-index.xml | 2 +-
BOOK/sparc-index.xml | 2 +-
BOOK/sparc64-64-index.xml | 2 +-
BOOK/sparc64-index.xml | 2 +-
BOOK/x86-index.xml | 2 +-
BOOK/x86_64-64-index.xml | 2 +-
BOOK/x86_64-index.xml | 2 +-
65 files changed, 374 insertions(+), 514 deletions(-)
delete mode 100644 BOOK/cross-tools/64/flags.xml
delete mode 100644 BOOK/cross-tools/mips64-64/flags.xml
delete mode 100644 BOOK/cross-tools/mips64/flags.xml
delete mode 100644 BOOK/cross-tools/multilib/flags.xml
delete mode 100644 BOOK/cross-tools/ppc64-64/variables.xml
delete mode 100644 BOOK/cross-tools/sparc64-64/flags.xml
delete mode 100644 BOOK/cross-tools/sparc64-64/variables.xml
delete mode 100644 BOOK/final-preps/chapter.xml
rename BOOK/final-preps/{ => common}/aboutclfs.xml (96%)
rename BOOK/final-preps/{ => common}/abouttestsuites.xml (92%)
rename BOOK/final-preps/{ => common}/addinguser.xml (98%)
rename BOOK/final-preps/{ => common}/creatingcrossdir.xml (95%)
rename BOOK/final-preps/{ => common}/creatingtoolsdir.xml (97%)
rename BOOK/final-preps/{ => common}/settingenviron.xml (98%)
copy BOOK/{network => final-preps}/mips-chapter.xml (64%)
rename BOOK/{cross-tools => final-preps}/mips/variables.xml (92%)
copy BOOK/{network => final-preps}/mips64-64-chapter.xml (63%)
rename BOOK/{cross-tools => final-preps}/mips64-64/variables.xml (77%)
copy BOOK/{network => final-preps}/mips64-chapter.xml (63%)
rename BOOK/{cross-tools => final-preps}/mips64/variables.xml (72%)
copy BOOK/{introduction => final-preps}/ppc-chapter.xml (64%)
rename BOOK/{cross-tools => final-preps}/ppc/variables.xml (91%)
copy BOOK/{introduction/ppc-chapter.xml => final-preps/ppc64-64-chapter.xml} (64%)
rename BOOK/{cross-tools/ppc64 => final-preps/ppc64-64}/variables.xml (71%)
copy BOOK/{introduction/ppc-chapter.xml => final-preps/ppc64-chapter.xml} (64%)
rename BOOK/{cross-tools/sparc64 => final-preps/ppc64}/variables.xml (67%)
copy BOOK/{introduction/sparc64-chapter.xml => final-preps/sparc-chapter.xml} (64%)
rename BOOK/{cross-tools => final-preps}/sparc/variables.xml (91%)
copy BOOK/{introduction/sparc64-chapter.xml => final-preps/sparc64-64-chapter.xml} (64%)
create mode 100644 BOOK/final-preps/sparc64-64/variables.xml
copy BOOK/{introduction => final-preps}/sparc64-chapter.xml (64%)
rename BOOK/{cross-tools/sparc64/flags.xml => final-preps/sparc64/variables.xml} (55%)
copy BOOK/{network => final-preps}/x86-chapter.xml (64%)
rename BOOK/{cross-tools => final-preps}/x86/variables.xml (100%)
copy BOOK/{network => final-preps}/x86_64-64-chapter.xml (63%)
rename BOOK/{cross-tools => final-preps}/x86_64-64/variables.xml (74%)
copy BOOK/{network/mips-chapter.xml => final-preps/x86_64-chapter.xml} (63%)
rename BOOK/{cross-tools => final-preps}/x86_64/variables.xml (63%)
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list