[Clfs-commits] [CLFS Embedded]Cross-LFS Embedded Book branch, master, updated. 1e8068355c808581a57736a0b81b2290a4dc8b5d
git
git at cross-lfs.org
Wed Jul 24 11:58:35 PDT 2013
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cross-LFS Embedded Book".
The branch, master has been updated
via 1e8068355c808581a57736a0b81b2290a4dc8b5d (commit)
via bde0524759df8962534631b629d63d6643a7fe7d (commit)
via be33999444e4f5f13ab4e0ca649d9f7935690ec2 (commit)
via a22b32d2e9004190bee6aa08aaec1e035ecb8e23 (commit)
via e29250962e4e8872f3547cf272fc69b24a461215 (commit)
via e554d7b60c4ec630ed6b50977864d4067b86b906 (commit)
via 752c0e232a84b2f13f1bb6c1e32144cff7aa5619 (commit)
via df099acd5ca16dcd82aef08badc46c5797eac408 (commit)
via ab4899eecfda6c634c8e2ffb314beee547624e57 (commit)
via bc7fc77b270cfbe4f7142414c1b68d9c4da6d270 (commit)
via 364d698c9ea8105d4b2897ca823fd683db775efe (commit)
via 6280230f00d7e279ed420e4d7ce8fb5e6e12f15d (commit)
via feb553b49525f9a740eb64c63387e421f3f1b3b9 (commit)
from d1e82c57f264351199d6624b93c4c2c901fd85f5 (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 1e8068355c808581a57736a0b81b2290a4dc8b5d
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date: Wed Jul 24 14:35:47 2013 -0400
general: Update date
diff --git a/BOOK/general.ent b/BOOK/general.ent
index 92df0a1..1e6d2f5 100644
--- a/BOOK/general.ent
+++ b/BOOK/general.ent
@@ -2,7 +2,7 @@
<!ENTITY month "07"> <!-- Use two digits -->
<!ENTITY month_name "July">
-<!ENTITY day "03"> <!-- Use two digits -->
+<!ENTITY day "24"> <!-- Use two digits -->
<!ENTITY year "2013"> <!-- Use four digits -->
<!ENTITY releasedate "&month_name; &day;, &year;">
commit bde0524759df8962534631b629d63d6643a7fe7d
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date: Wed Jul 24 14:35:34 2013 -0400
Update changelog
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index 26c99fc..967ff18 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -36,6 +36,18 @@
</listitem>
-->
<listitem>
+ <para>July 24, 2013</para>
+ <itemizedlist>
+ <listitem>
+ <para>[abradford] - Fix binutils build issue with some Texinfo.</para>
+ </listitem>
+ <listitem>
+ <para>[abradford] - Install headers to cross-tools.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>June 17, 2013</para>
<itemizedlist>
<listitem>
diff --git a/BOOK/introduction/mips/changelog.xml b/BOOK/introduction/mips/changelog.xml
index b69feb1..5430581 100644
--- a/BOOK/introduction/mips/changelog.xml
+++ b/BOOK/introduction/mips/changelog.xml
@@ -33,6 +33,15 @@
-->
<listitem>
+ <para>July 24, 2013</para>
+ <itemizedlist>
+ <listitem>
+ <para>[abradford] - Fix CLFS_ARCH for kernel build.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>February 24, 2011</para>
<itemizedlist>
<listitem>
commit be33999444e4f5f13ab4e0ca649d9f7935690ec2
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date: Wed Jul 24 14:45:23 2013 -0400
Revert "Rename uClibc configs patch"
This reverts commit 9959161b612e69c79464f4a61611dd4aaa5e287c.
diff --git a/BOOK/patches.ent b/BOOK/patches.ent
index 11aa500..ace74dc 100644
--- a/BOOK/patches.ent
+++ b/BOOK/patches.ent
@@ -18,7 +18,7 @@
<!ENTITY iana-etc-update-patch-md5 "9b4d102672fc8bf777bbb95d1007edda">
<!ENTITY iana-etc-update-patch-size "864 KB">
-<!ENTITY uclibc-configs-patch "uClibc-&uclibc-version;-configs-1.patch">
+<!ENTITY uclibc-configs-patch "uClibc-&uclibc-version;-configs-2.patch">
<!ENTITY uclibc-configs-patch-md5 "e06455fe909d2572f7926f48cd066785">
<!ENTITY uclibc-configs-patch-size "38 KB">
diff --git a/patches/uClibc-0.9.33.2-configs-1.patch b/patches/uClibc-0.9.31-configs-2.patch
similarity index 100%
rename from patches/uClibc-0.9.33.2-configs-1.patch
rename to patches/uClibc-0.9.31-configs-2.patch
commit a22b32d2e9004190bee6aa08aaec1e035ecb8e23
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date: Wed Jul 24 14:27:12 2013 -0400
Revert "packages: Update uClibc to 0.9.33.2"
This reverts commit dffb50340f4ed38531cc28a4373a879108e35f26.
The configs patch works for 0.9.31 but asks quite a lot of hard
questions for 0.9.33 and possibly unsets the choice of EABI for arm
after setting it with sed, which would be not-good. For sanity just
keep uClibc at the older known working version.
diff --git a/BOOK/packages.ent b/BOOK/packages.ent
index a8d60a9..bd35020 100644
--- a/BOOK/packages.ent
+++ b/BOOK/packages.ent
@@ -60,10 +60,10 @@
<!ENTITY mpfr-md5 "ee2c3ac63bf0c2359bf08fc3ee094c19">
<!ENTITY mpfr-home "http://www.mpfr.org/">
-<!ENTITY uclibc-version "0.9.33.2">
-<!ENTITY uclibc-size "2767 KB">
+<!ENTITY uclibc-version "0.9.31">
+<!ENTITY uclibc-size "2,244 KB">
<!ENTITY uclibc-url "http://www.uclibc.org/downloads/uClibc-&uclibc-version;.tar.bz2">
-<!ENTITY uclibc-md5 "a338aaffc56f0f5040e6d9fa8a12eda1">
+<!ENTITY uclibc-md5 "52fb8a494758630c8d3ddd7f1e0daafd">
<!ENTITY uclibc-home "http://uclibc.org/">
<!-- Beyond CLFS library packages -->
commit e29250962e4e8872f3547cf272fc69b24a461215
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date: Thu Jul 18 16:39:31 2013 -0400
binutils: Copy libiberty.h to ${CLFS}/cross-tools
Not into the target file system, it's not needed there.
diff --git a/BOOK/cross-tools/common/binutils.xml b/BOOK/cross-tools/common/binutils.xml
index cee2eeb..2e9a34b 100644
--- a/BOOK/cross-tools/common/binutils.xml
+++ b/BOOK/cross-tools/common/binutils.xml
@@ -129,7 +129,7 @@ make</userinput></screen>
<para os="l">Copy the <filename class="headerfile">libiberty.h</filename> file to
<filename class="directory">${CLFS}/usr/include</filename> directory:</para>
-<screen os="m"><userinput>cp -v ../binutils-&binutils-version;/include/libiberty.h ${CLFS}/usr/include</userinput></screen>
+<screen os="m"><userinput>cp -v ../binutils-&binutils-version;/include/libiberty.h ${CLFS}/cross-tools/include</userinput></screen>
</sect2>
commit e554d7b60c4ec630ed6b50977864d4067b86b906
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date: Thu Jul 18 16:37:59 2013 -0400
binutils: Fix Texinfo related build failures
As per the method LFS uses. This is needed until the next release of
binutils which incorporates a fix but binutils snapshots work fine
without this sed line.
diff --git a/BOOK/cross-tools/common/binutils.xml b/BOOK/cross-tools/common/binutils.xml
index f1a931b..cee2eeb 100644
--- a/BOOK/cross-tools/common/binutils.xml
+++ b/BOOK/cross-tools/common/binutils.xml
@@ -31,6 +31,12 @@
linker and assembler to determine which of their own features to
enable.</para>
+ <para os="ab">Fix a couple of syntax errors that prevent the documentation
+ from building with some versions of Texinfo:</para>
+
+<screen os="ac"><userinput>sed -i -e 's/@colophon/@@colophon/' \
+ -e 's/doc at cygnus.com/doc@@cygnus.com/' bfd/doc/bfd.texinfo</userinput></screen>
+
<para os="b">The Binutils documentation recommends building Binutils outside of the
source directory in a dedicated build directory:</para>
commit 752c0e232a84b2f13f1bb6c1e32144cff7aa5619
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date: Tue Jul 16 14:47:28 2013 -0400
linux-headers: Match description to location
Due to recent change of installing linux-headers to ${CLFS}/cross-tools
the description at the bottom of the page needed updating to match.
diff --git a/BOOK/cross-tools/common/linux-headers.xml b/BOOK/cross-tools/common/linux-headers.xml
index 608a68c..2e37189 100644
--- a/BOOK/cross-tools/common/linux-headers.xml
+++ b/BOOK/cross-tools/common/linux-headers.xml
@@ -43,7 +43,7 @@ cp -rv dest/include/* ${CLFS}/cross-tools/include</userinput></screen>
<segtitle>Installed headers</segtitle>
<seglistitem>
- <seg>/usr/include/{asm,asm-generic,drm,linux,mtd,rdma,scsi,sound,video,xen}/*.h</seg>
+ <seg>${CLFS}/cross-tools/include/{asm,asm-generic,drm,linux,mtd,rdma,scsi,sound,video,xen}/*.h</seg>
</seglistitem>
</segmentedlist>
@@ -53,8 +53,7 @@ cp -rv dest/include/* ${CLFS}/cross-tools/include</userinput></screen>
<?dbhtml list-presentation="table"?>
<varlistentry id="linux-headers">
- <term><filename
- class="headerfile">/usr/include/{asm,asm-generic,drm,linux,mtd,rdma,scsi,sound,video,xen}/*.h</filename></term>
+ <term><filename class="headerfile">${CLFS}/cross-tools/include/{asm,asm-generic,drm,linux,mtd,rdma,scsi,sound,video,xen}/*.h</filename></term>
<listitem>
<para>The Linux API headers</para>
<indexterm zone="ch-cross-tools-linux-headers linux-headers">
commit df099acd5ca16dcd82aef08badc46c5797eac408
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date: Mon Jul 15 08:11:09 2013 -0400
Install linux headers to cross-tools/include
They aren't needed on the final system so just install them into
${CLFS}/cross-tools/include. EGLIBC will look for them there.
diff --git a/BOOK/cross-tools/common/linux-headers.xml b/BOOK/cross-tools/common/linux-headers.xml
index 54da915..608a68c 100644
--- a/BOOK/cross-tools/common/linux-headers.xml
+++ b/BOOK/cross-tools/common/linux-headers.xml
@@ -32,7 +32,7 @@
<screen os="c"><userinput>make mrproper
make ARCH=${CLFS_ARCH} headers_check
make ARCH=${CLFS_ARCH} INSTALL_HDR_PATH=dest headers_install
-cp -rv dest/include/* ${CLFS}/usr/include</userinput></screen>
+cp -rv dest/include/* ${CLFS}/cross-tools/include</userinput></screen>
</sect2>
diff --git a/BOOK/final-preps/creatingcrossdir.xml b/BOOK/final-preps/creatingcrossdir.xml
index 04de89d..dd2b558 100644
--- a/BOOK/final-preps/creatingcrossdir.xml
+++ b/BOOK/final-preps/creatingcrossdir.xml
@@ -20,6 +20,6 @@
<para>Create the required directory by running the following:</para>
-<screen><userinput>install -dv ${CLFS}/cross-tools{,/bin}</userinput></screen>
+<screen><userinput>install -dv ${CLFS}/cross-tools{,/include,/bin}</userinput></screen>
</sect1>
commit ab4899eecfda6c634c8e2ffb314beee547624e57
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date: Mon Jul 15 07:17:48 2013 -0400
Set CLFS_ARCH to just "mips" for MIPS
Setting it with the sed regex could produce a CLFS_ARCH value of
"mipsel" which when used to deal with the Linux kernel would result in
errors since "mipsel" isn't a valid arch for Linux. "mips" is so let's
just use that.
diff --git a/BOOK/cross-tools/mips/variables.xml b/BOOK/cross-tools/mips/variables.xml
index 1974a60..9e83e9c 100644
--- a/BOOK/cross-tools/mips/variables.xml
+++ b/BOOK/cross-tools/mips/variables.xml
@@ -27,7 +27,7 @@
href="../common/variables.xml"
xpointer="xpointer(//*[@os='c'])"/>
-<screen os="d"><userinput>export CLFS_ARCH=$(echo ${CLFS_TARGET} | sed -e 's/\(mips\)\(64\)\?\(el\)\?-.*/\1\3/')
+<screen os="d"><userinput>export CLFS_ARCH=mips
export CLFS_ENDIAN=$(echo ${CLFS_ARCH} | sed -e 's/mipsel/little/' -e 's/mips/big/')</userinput></screen>
<para os="m1">Now you will need to set the MIPS LEVEL. This determines how your
commit bc7fc77b270cfbe4f7142414c1b68d9c4da6d270
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date: Mon Jul 15 07:13:32 2013 -0400
Delete cross-tools/{arm,mips}/linux-headers.xml
Were not used, arm and mips both were previously switched to using
common.
diff --git a/BOOK/cross-tools/arm/linux-headers.xml b/BOOK/cross-tools/arm/linux-headers.xml
deleted file mode 100644
index 551e4a8..0000000
--- a/BOOK/cross-tools/arm/linux-headers.xml
+++ /dev/null
@@ -1,54 +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-linux-headers" role="wrap">
- <?dbhtml filename="linux-headers.html"?>
-
- <title>Linux-Headers-&linux-version;</title>
-
- <indexterm zone="ch-cross-tools-linux-headers">
- <primary sortas="a-Linux-Headers">Linux-Headers</primary>
- </indexterm>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/linux-headers.xml"
- xpointer="xpointer(//*[@role='package'])"/>
-
- <sect2 role="installation">
- <title>Installation of Linux Headers</title>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/linux-headers.xml"
- xpointer="xpointer(//*[@os='a'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/linux-headers.xml"
- xpointer="xpointer(//*[@os='p1'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/linux-headers.xml"
- xpointer="xpointer(//*[@os='p2'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/linux-headers.xml"
- xpointer="xpointer(//*[@os='b'])"/>
-
-<screen os="c"><userinput>install -dv ${CLFS}/usr/include
-make mrproper
-make ARCH=arm headers_check
-make ARCH=arm INSTALL_HDR_PATH=dest headers_install
-cp -rv dest/include/* ${CLFS}/usr/include</userinput></screen>
-
- </sect2>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/linux-headers.xml"
- xpointer="xpointer(//*[@role='content'])"/>
-
-</sect1>
-
-
diff --git a/BOOK/cross-tools/mips/linux-headers.xml b/BOOK/cross-tools/mips/linux-headers.xml
deleted file mode 100644
index 5434974..0000000
--- a/BOOK/cross-tools/mips/linux-headers.xml
+++ /dev/null
@@ -1,54 +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-linux-headers" role="wrap">
- <?dbhtml filename="linux-headers.html"?>
-
- <title>Linux-Headers-&linux-mips-version;</title>
-
- <indexterm zone="ch-cross-tools-linux-headers">
- <primary sortas="a-Linux-Headers">Linux-Headers</primary>
- </indexterm>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/linux-headers.xml"
- xpointer="xpointer(//*[@role='package'])"/>
-
- <sect2 role="installation">
- <title>Installation of Linux Headers</title>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/linux-headers.xml"
- xpointer="xpointer(//*[@os='a'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/linux-headers.xml"
- xpointer="xpointer(//*[@os='p1'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/linux-headers.xml"
- xpointer="xpointer(//*[@os='p2'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/linux-headers.xml"
- xpointer="xpointer(//*[@os='b'])"/>
-
-<screen os="c"><userinput>install -dv ${CLFS}/usr/include
-make mrproper
-make ARCH=mips headers_check
-make ARCH=mips INSTALL_HDR_PATH=dest headers_install
-cp -rv dest/include/* ${CLFS}/usr/include</userinput></screen>
-
- </sect2>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/linux-headers.xml"
- xpointer="xpointer(//*[@role='content'])"/>
-
-</sect1>
-
-
commit 364d698c9ea8105d4b2897ca823fd683db775efe
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date: Mon Jul 15 06:59:23 2013 -0400
Consistently capitalize BusyBox name
It was written sometimes with the second 'B' lowercase which is
incorrect.
diff --git a/BOOK/beyond-intro/common/introduction.xml b/BOOK/beyond-intro/common/introduction.xml
index 3606270..61ee0b4 100644
--- a/BOOK/beyond-intro/common/introduction.xml
+++ b/BOOK/beyond-intro/common/introduction.xml
@@ -15,6 +15,6 @@
<para os="b">In this section, we explain how to compile additional packages
for use with the system. We will also cover how to configure some of the
- Busybox Utilities.</para>
+ BusyBox Utilities.</para>
</sect1>
diff --git a/BOOK/bootscripts/common/mdev.xml b/BOOK/bootscripts/common/mdev.xml
index 700c4a2..4ace82f 100644
--- a/BOOK/bootscripts/common/mdev.xml
+++ b/BOOK/bootscripts/common/mdev.xml
@@ -17,7 +17,7 @@
<sect2 role="package">
<title/>
- <para>Is a Busybox replacement of udev. With a different rule
+ <para>Is a BusyBox replacement of udev. With a different rule
base.</para>
</sect2>
diff --git a/BOOK/final-system/common/busybox.xml b/BOOK/final-system/common/busybox.xml
index ce6fba4..eb9c5e0 100644
--- a/BOOK/final-system/common/busybox.xml
+++ b/BOOK/final-system/common/busybox.xml
@@ -8,10 +8,10 @@
<sect1 id="ch-system-busybox" role="wrap">
<?dbhtml filename="busybox.html"?>
- <title>Busybox-&busybox-version;</title>
+ <title>BusyBox-&busybox-version;</title>
<indexterm zone="ch-system-busybox">
- <primary sortas="a-Busybox">Busybox</primary>
+ <primary sortas="a-BusyBox">BusyBox</primary>
</indexterm>
<sect2 role="package">
@@ -28,11 +28,11 @@
</sect2>
<sect2 role="installation">
- <title>Installation of Busybox</title>
+ <title>Installation of BusyBox</title>
<!-- Version 1.18.4 does not require any "fixes" patch, none exists, yet
<para os="p1">The following patch contains a number of fixes to version
- &busybox-version; by the Busybox developers:</para>
+ &busybox-version; by the BusyBox developers:</para>
<screen os="p2"><userinput>patch -Np1 -i ../&busybox-fixes-patch;</userinput></screen>
-->
@@ -41,13 +41,13 @@
<screen os="b"><userinput>make distclean</userinput></screen>
- <para os="c">The following patch contains a default configuration for busybox:</para>
+ <para os="c">The following patch contains a default configuration for BusyBox:</para>
<screen os="d"><userinput>patch -Np1 -i ../&busybox-config-patch;
cp -v clfs/config .config</userinput></screen>
<note os="e">
- <para>Currently we are just telling Busybox to use a generic
+ <para>Currently we are just telling BusyBox to use a generic
configuration. For those for more adventurous, you can use
<command>make menuconfig</command>, and create a custom or modified
configuration for your build.</para>
@@ -76,7 +76,7 @@ chmod 755 ${CLFS}/cross-tools/bin/depmod.pl</userinput></screen>
</sect2>
<sect2 id="contents-busybox" role="content">
- <title>Contents of Busybox</title>
+ <title>Contents of BusyBox</title>
<segmentedlist>
<segtitle>Installed programs</segtitle>
diff --git a/BOOK/materials/common/packages.xml b/BOOK/materials/common/packages.xml
index 4137109..c68fa70 100644
--- a/BOOK/materials/common/packages.xml
+++ b/BOOK/materials/common/packages.xml
@@ -24,7 +24,7 @@
</varlistentry>
<varlistentry>
- <term>Busybox (&busybox-version;) - <token>&busybox-size;</token>:</term>
+ <term>BusyBox (&busybox-version;) - <token>&busybox-size;</token>:</term>
<listitem>
<para>Home page: <ulink url="&busybox-home;"/></para>
<para>Download: <ulink url="&busybox-url;"/></para>
diff --git a/BOOK/materials/common/patches.xml b/BOOK/materials/common/patches.xml
index 123bd52..aa4ef73 100644
--- a/BOOK/materials/common/patches.xml
+++ b/BOOK/materials/common/patches.xml
@@ -19,7 +19,7 @@
<variablelist role="materials">
<varlistentry>
- <term>Busybox Config Patch - <token>&busybox-config-patch-size;</token>:</term>
+ <term>BusyBox Config Patch - <token>&busybox-config-patch-size;</token>:</term>
<listitem>
<para>Download: <ulink
url="&patches-root;&busybox-config-patch;"/></para>
@@ -29,7 +29,7 @@
<!--
<varlistentry>
- <term>Busybox Fixes Patch - <token>&busybox-fixes-patch-size;</token>:</term>
+ <term>BusyBox Fixes Patch - <token>&busybox-fixes-patch-size;</token>:</term>
<listitem>
<para>Download: <ulink
url="&patches-root;&busybox-fixes-patch;"/></para>
commit 6280230f00d7e279ed420e4d7ce8fb5e6e12f15d
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date: Mon Jul 15 06:54:46 2013 -0400
busybox: 'make distclean' first
To ensure we have a clean directory prior to building.
diff --git a/BOOK/final-system/common/busybox.xml b/BOOK/final-system/common/busybox.xml
index 8c4721f..ce6fba4 100644
--- a/BOOK/final-system/common/busybox.xml
+++ b/BOOK/final-system/common/busybox.xml
@@ -37,36 +37,40 @@
<screen os="p2"><userinput>patch -Np1 -i ../&busybox-fixes-patch;</userinput></screen>
-->
- <para os="a">The following patch contains a default configuration for busybox:</para>
+ <para os="a">First ensure the BusyBox source is completely clean:</para>
-<screen os="b"><userinput>patch -Np1 -i ../&busybox-config-patch;
+<screen os="b"><userinput>make distclean</userinput></screen>
+
+ <para os="c">The following patch contains a default configuration for busybox:</para>
+
+<screen os="d"><userinput>patch -Np1 -i ../&busybox-config-patch;
cp -v clfs/config .config</userinput></screen>
- <note os="c">
+ <note os="e">
<para>Currently we are just telling Busybox to use a generic
configuration. For those for more adventurous, you can use
<command>make menuconfig</command>, and create a custom or modified
configuration for your build.</para>
</note>
- <para os="d">The following tells BusyBox to validate the configuration,
+ <para os="f">The following tells BusyBox to validate the configuration,
and makes sure all required options are defined:</para>
-<screen os="e"><userinput>make oldconfig</userinput></screen>
+<screen os="g"><userinput>make oldconfig</userinput></screen>
- <para os="f">Compile the package:</para>
+ <para os="h">Compile the package:</para>
-<screen os="g"><userinput>make CROSS_COMPILE="${CLFS_TARGET}-"</userinput></screen>
+<screen os="i"><userinput>make CROSS_COMPILE="${CLFS_TARGET}-"</userinput></screen>
- <para os="h">Install the package:</para>
+ <para os="j">Install the package:</para>
-<screen os="i"><userinput>make CROSS_COMPILE="${CLFS_TARGET}-" \
+<screen os="k"><userinput>make CROSS_COMPILE="${CLFS_TARGET}-" \
CONFIG_PREFIX="${CLFS}" install</userinput></screen>
- <para os="j">If you're going to build your kernel with modules, you will need
+ <para os="l">If you're going to build your kernel with modules, you will need
to make sure <command>depmod.pl</command> is available:</para>
-<screen os="k"><userinput>cp examples/depmod.pl ${CLFS}/cross-tools/bin
+<screen os="m"><userinput>cp examples/depmod.pl ${CLFS}/cross-tools/bin
chmod 755 ${CLFS}/cross-tools/bin/depmod.pl</userinput></screen>
</sect2>
commit feb553b49525f9a740eb64c63387e421f3f1b3b9
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date: Fri Jul 12 07:01:49 2013 -0400
final-sys/intro: We use ${CLFS}/cross-tools
Not just straight /tools
diff --git a/BOOK/final-system/common/introduction.xml b/BOOK/final-system/common/introduction.xml
index 4a0c602..45796a0 100644
--- a/BOOK/final-system/common/introduction.xml
+++ b/BOOK/final-system/common/introduction.xml
@@ -23,11 +23,11 @@
<para os="b">The order that packages are installed in this chapter needs to
be strictly followed to ensure that no program accidentally acquires a
- path referring to <filename class="directory">/tools</filename>
+ path referring to <filename class="directory">${CLFS}/cross-tools</filename>
hard-wired into it. For the same reason, do not compile packages in
parallel. Compiling in parallel may save time (especially on dual-CPU
machines), but it could result in a program containing a hard-wired
- path to <filename class="directory">/tools</filename>, which will
+ path to <filename class="directory">${CLFS}/cross-tools</filename>, which will
cause the program to stop working when that directory is
removed.</para>
-----------------------------------------------------------------------
Summary of changes:
BOOK/beyond-intro/common/introduction.xml | 2 +-
BOOK/bootscripts/common/mdev.xml | 2 +-
BOOK/cross-tools/arm/linux-headers.xml | 54 --------------------
BOOK/cross-tools/common/binutils.xml | 8 +++-
BOOK/cross-tools/common/linux-headers.xml | 7 +--
BOOK/cross-tools/mips/linux-headers.xml | 54 --------------------
BOOK/cross-tools/mips/variables.xml | 2 +-
BOOK/final-preps/creatingcrossdir.xml | 2 +-
BOOK/final-system/common/busybox.xml | 38 ++++++++------
BOOK/final-system/common/introduction.xml | 4 +-
BOOK/general.ent | 2 +-
BOOK/introduction/common/changelog.xml | 12 ++++
BOOK/introduction/mips/changelog.xml | 9 +++
BOOK/materials/common/packages.xml | 2 +-
BOOK/materials/common/patches.xml | 4 +-
BOOK/packages.ent | 6 +-
BOOK/patches.ent | 2 +-
...nfigs-1.patch => uClibc-0.9.31-configs-2.patch} | 0
18 files changed, 66 insertions(+), 144 deletions(-)
delete mode 100644 BOOK/cross-tools/arm/linux-headers.xml
delete mode 100644 BOOK/cross-tools/mips/linux-headers.xml
rename patches/{uClibc-0.9.33.2-configs-1.patch => uClibc-0.9.31-configs-2.patch} (100%)
hooks/post-receive
--
Cross-LFS Embedded Book
More information about the Clfs-commits
mailing list