Author: jciccone
Date: 2006-06-09 18:17:08 -0600 (Fri, 09 Jun 2006)
New Revision: 1758
Removed:
branches/clfs-2.0/BOOK/final-preps/creatingcrossdir.xml
Modified:
branches/clfs-2.0/BOOK/cross-tools/common/binutils.xml
branches/clfs-2.0/BOOK/cross-tools/common/file.xml
branches/clfs-2.0/BOOK/cross-tools/common/gcc-final.xml
branches/clfs-2.0/BOOK/cross-tools/common/gcc-static.xml
branches/clfs-2.0/BOOK/cross-tools/common/glibc.xml
branches/clfs-2.0/BOOK/final-preps/chapter.xml
branches/clfs-2.0/BOOK/final-preps/settingenviron.xml
branches/clfs-2.0/BOOK/introduction/common/how.xml
Log:
Removed the need for /cross-tools, using /cross-tools now.
Modified: branches/clfs-2.0/BOOK/cross-tools/common/binutils.xml
===================================================================
--- branches/clfs-2.0/BOOK/cross-tools/common/binutils.xml 2006-06-10
00:11:23 UTC (rev 1757)
+++ branches/clfs-2.0/BOOK/cross-tools/common/binutils.xml 2006-06-10
00:17:08 UTC (rev 1758)
@@ -47,7 +47,7 @@
href="../../final-system/common/binutils.xml"
xpointer="xpointer(//[EMAIL PROTECTED]'c'])"/>
-<screen os="bc"><userinput>../binutils-&binutils-version;/configure
--prefix=/cross-tools \
+<screen os="bc"><userinput>../binutils-&binutils-version;/configure
--prefix=${LFS}/cross-tools \
--host=${LFS_HOST} --target=${LFS_TARGET} --with-sysroot=${LFS} \
--disable-nls --enable-shared --disable-multilib</userinput></screen>
@@ -55,10 +55,10 @@
<title>The meaning of the configure options:</title>
<varlistentry os="bd1">
- <term><parameter>--prefix=/cross-tools</parameter></term>
+ <term><parameter>--prefix=${LFS}/cross-tools</parameter></term>
<listitem>
<para>This tells the configure script to prepare to install the
- package in the <filename class="directory">/cross-tools</filename>
+ package in the <filename
class="directory">${LFS}/cross-tools</filename>
directory.</para>
</listitem>
</varlistentry>
Modified: branches/clfs-2.0/BOOK/cross-tools/common/file.xml
===================================================================
--- branches/clfs-2.0/BOOK/cross-tools/common/file.xml 2006-06-10 00:11:23 UTC
(rev 1757)
+++ branches/clfs-2.0/BOOK/cross-tools/common/file.xml 2006-06-10 00:17:08 UTC
(rev 1758)
@@ -18,7 +18,7 @@
<para>Prepare File for compilation:</para>
-<screen><userinput>./configure --prefix=/cross-tools</userinput></screen>
+<screen><userinput>./configure --prefix=${LFS}/cross-tools</userinput></screen>
<para>Compile the Package:</para>
Modified: branches/clfs-2.0/BOOK/cross-tools/common/gcc-final.xml
===================================================================
--- branches/clfs-2.0/BOOK/cross-tools/common/gcc-final.xml 2006-06-10
00:11:23 UTC (rev 1757)
+++ branches/clfs-2.0/BOOK/cross-tools/common/gcc-final.xml 2006-06-10
00:17:08 UTC (rev 1758)
@@ -58,7 +58,7 @@
href="gcc-static.xml"
xpointer="xpointer(//[EMAIL PROTECTED]'e'])"/>
-<screen os="ae"><userinput>../gcc-&gcc-version;/configure
--prefix=/cross-tools \
+<screen os="ae"><userinput>../gcc-&gcc-version;/configure
--prefix=${LFS}/cross-tools \
--host=${LFS_HOST} --target=${LFS_TARGET} --disable-multilib \
--with-sysroot=${LFS} --disable-nls --enable-shared \
--enable-languages=c,c++ --enable-__cxa_atexit \
Modified: branches/clfs-2.0/BOOK/cross-tools/common/gcc-static.xml
===================================================================
--- branches/clfs-2.0/BOOK/cross-tools/common/gcc-static.xml 2006-06-10
00:11:23 UTC (rev 1757)
+++ branches/clfs-2.0/BOOK/cross-tools/common/gcc-static.xml 2006-06-10
00:17:08 UTC (rev 1758)
@@ -50,7 +50,7 @@
href="../../final-system/common/gcc.xml"
xpointer="xpointer(//[EMAIL PROTECTED]'e'])"/>
-<screen os="ae"><userinput>../gcc-&gcc-version;/configure
--prefix=/cross-tools \
+<screen os="ae"><userinput>../gcc-&gcc-version;/configure
--prefix=${LFS}/cross-tools \
--host=${LFS_HOST} --target=${LFS_TARGET} --disable-multilib \
--with-sysroot=${LFS} --disable-nls --disable-shared \
--enable-languages=c</userinput></screen>
Modified: branches/clfs-2.0/BOOK/cross-tools/common/glibc.xml
===================================================================
--- branches/clfs-2.0/BOOK/cross-tools/common/glibc.xml 2006-06-10 00:11:23 UTC
(rev 1757)
+++ branches/clfs-2.0/BOOK/cross-tools/common/glibc.xml 2006-06-10 00:17:08 UTC
(rev 1758)
@@ -73,7 +73,7 @@
--host=${LFS_TARGET} --build=${LFS_HOST} \
--disable-profile --enable-add-ons \
--with-tls --enable-kernel=2.6.0 --with-__thread \
- --with-binutils=/cross-tools/bin --with-headers=${LFS}/usr/include \
+ --with-binutils=${LFS}/cross-tools/bin --with-headers=${LFS}/usr/include \
--cache-file=config.cache</userinput></screen>
<variablelist os="j">
@@ -143,7 +143,7 @@
</varlistentry>
<varlistentry os="j9">
- <term><parameter>--with-binutils=/cross-tools/bin</parameter></term>
+
<term><parameter>--with-binutils=${LFS}/cross-tools/bin</parameter></term>
<listitem>
<para>This tells Glibc to use the Binutils that are specific to
our target architecture.</para>
Modified: branches/clfs-2.0/BOOK/final-preps/chapter.xml
===================================================================
--- branches/clfs-2.0/BOOK/final-preps/chapter.xml 2006-06-10 00:11:23 UTC
(rev 1757)
+++ branches/clfs-2.0/BOOK/final-preps/chapter.xml 2006-06-10 00:17:08 UTC
(rev 1758)
@@ -12,7 +12,6 @@
<title>Final Preparations</title>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="aboutlfs.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
href="creatingcrossdir.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
href="addinguser.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
href="settingenviron.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude";
href="creatingdirs.xml"/>
Deleted: branches/clfs-2.0/BOOK/final-preps/creatingcrossdir.xml
===================================================================
--- branches/clfs-2.0/BOOK/final-preps/creatingcrossdir.xml 2006-06-10
00:11:23 UTC (rev 1757)
+++ branches/clfs-2.0/BOOK/final-preps/creatingcrossdir.xml 2006-06-10
00:17:08 UTC (rev 1758)
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
- "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"; [
- <!ENTITY % general-entities SYSTEM "../general.ent">
- %general-entities;
-]>
-
-<sect1 id="ch-final-preps-creatingcrossdir">
- <?dbhtml filename="creatingcrossdir.html"?>
-
- <title>Creating the $LFS/cross-tools Directory</title>
-
- <para>The cross-binutils and cross-compiler built in
- <xref linkend="chapter-cross-tools"/> will be installed under
- <filename class="directory">$LFS/cross-tools</filename> to keep them
- separate from the host programs. The programs compiled here are
- cross-tools and will not be a part of the final CLFS system or the
- temp-system. By keeping these programs in a separate directory, they
- can easily be discarded later after their use.</para>
-
- <para>Create the required directory by running the following as
- <systemitem class="username">root</systemitem>:</para>
-
-<screen><userinput>install -dv $LFS/cross-tools</userinput></screen>
-
- <para>The next step is to create a <filename
- class="symlink">/cross-tools</filename> symlink on the host system.
- This will point to the newly-created directory on the CLFS partition.
- Run this command as <systemitem class="username">root</systemitem> as
well:</para>
-
-<screen><userinput>ln -sv $LFS/cross-tools /</userinput></screen>
-
- <para>The symlink isn't technically necessary (though the book's
- instructions do assume its existence), but is there mainly for
- consistency (because /tools is also symlinked to $LFS/tools) and to
- simplify the installation of the cross-compile tools.</para>
-
-</sect1>
Modified: branches/clfs-2.0/BOOK/final-preps/settingenviron.xml
===================================================================
--- branches/clfs-2.0/BOOK/final-preps/settingenviron.xml 2006-06-10
00:11:23 UTC (rev 1757)
+++ branches/clfs-2.0/BOOK/final-preps/settingenviron.xml 2006-06-10
00:17:08 UTC (rev 1758)
@@ -43,7 +43,7 @@
umask 022
LFS=/mnt/lfs
LC_ALL=POSIX
-PATH=/cross-tools/bin:/bin:/usr/bin
+PATH=${LFS}/cross-tools/bin:/bin:/usr/bin
export LFS LC_ALL PATH</literal>
EOF</userinput></screen>
@@ -55,7 +55,7 @@
be used as soon as they are installed. By switching off the hash function,
the shell will always search the <envar>PATH</envar> when a program is to
be run. As such, the shell will find the newly compiled tools in
- <filename class="directory">$LFS/cross-tools</filename> as soon as they are
+ <filename class="directory">$LFS${LFS}/cross-tools</filename> as soon as
they are
available without remembering a previous version of the same program in a
different location.</para>
@@ -79,7 +79,7 @@
(the two are equivalent) ensures that everything will work as expected in
the chroot environment.</para>
- <para os="j">By putting <filename
class="directory">/cross-tools/bin</filename>
+ <para os="j">By putting <filename
class="directory">${LFS}/cross-tools/bin</filename>
at the beginning of the <envar>PATH</envar>, the cross-compiler
built in <xref linkend="chapter-cross-tools"/> will be picked up by
the build process for the temp-system packages before anything that
Modified: branches/clfs-2.0/BOOK/introduction/common/how.xml
===================================================================
--- branches/clfs-2.0/BOOK/introduction/common/how.xml 2006-06-10 00:11:23 UTC
(rev 1757)
+++ branches/clfs-2.0/BOOK/introduction/common/how.xml 2006-06-10 00:17:08 UTC
(rev 1758)
@@ -51,9 +51,9 @@
compiler.</para>
<para>The process of building cross-compile tools first involves installing
- binutils into /cross-tools, so that the linker can be used with the building
+ binutils into ${LFS}/cross-tools, so that the linker can be used with the
building
of everything else in the temp-system. GCC is then compiled statically and
- installed into /cross-tools, and this cross-compiler is used to build glibc
+ installed into ${LFS}/cross-tools, and this cross-compiler is used to build
glibc
into /tools for the temp-system. The GCC cross-compiler is then rebuilt
dynamically - this final cross-compiler is what will be used to build the
rest of the temporary system. When this is done, the CLFS installation
@@ -63,7 +63,7 @@
explanation, especially the reasoning for compiling gcc statically then
dynamically... --></para>
<para>The packages in <!-- <xref linkend="chapter-temp-system"/> --> are
then built
- using the cross-compiled tools in /cross-tools, and linked against the
+ using the cross-compiled tools in ${LFS}/cross-tools, and linked against the
C library that was installed during the building of the cross-tools.</para>
<para>This effort to isolate the new system from the host distribution
--
http://linuxfromscratch.org/mailman/listinfo/cross-lfs
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
