[Clfs-commits] commit: r4073 - in /branches/clfs-embedded: BOOK/ BOOK/cross-tools/arm/ BOOK/cross-tools/mips/ BOOK/cross-tools/x86/ BOOK/final-system/arm/ BOOK/final-system/mips/ BOOK/final-system/x86/ BOOK/introduction/common/ BOOK/materials/common/ patches/
svn at cross-lfs.org
svn at cross-lfs.org
Sat Nov 8 08:24:33 PST 2008
Author: jciccone
Date: Sat Nov 8 16:24:32 2008
New Revision: 4073
Log:
Updated Busybox to 1.12.1.
Patched uClibc so struct flock doesn't get redefined.
Added:
branches/clfs-embedded/patches/busybox-1.12.1-fixes-1.patch
branches/clfs-embedded/patches/busybox-1.12.1-iptunnel_headers-1.patch
branches/clfs-embedded/patches/uClibc-0.9.30-rc3-flock_fixes-1.patch
Removed:
branches/clfs-embedded/patches/busybox-1.8.2-fixes-1.patch
Modified:
branches/clfs-embedded/BOOK/cross-tools/arm/uclibc.xml
branches/clfs-embedded/BOOK/cross-tools/mips/uclibc.xml
branches/clfs-embedded/BOOK/cross-tools/x86/uclibc.xml
branches/clfs-embedded/BOOK/final-system/arm/busybox.xml
branches/clfs-embedded/BOOK/final-system/mips/busybox.xml
branches/clfs-embedded/BOOK/final-system/x86/busybox.xml
branches/clfs-embedded/BOOK/introduction/common/changelog.xml
branches/clfs-embedded/BOOK/materials/common/patches.xml
branches/clfs-embedded/BOOK/packages.ent
branches/clfs-embedded/BOOK/patches.ent
Modified: branches/clfs-embedded/BOOK/cross-tools/arm/uclibc.xml
==============================================================================
--- branches/clfs-embedded/BOOK/cross-tools/arm/uclibc.xml (original)
+++ branches/clfs-embedded/BOOK/cross-tools/arm/uclibc.xml Sat Nov 8 16:24:32 2008
@@ -27,14 +27,21 @@
following sed makes sure we are using the proper settings for our
architecture:</para>
-<screen os="b"><userinput>
-cp extra/Configs/Config.arm extra/Configs/Config.arm.orig
+<screen os="b"><userinput>cp extra/Configs/Config.arm extra/Configs/Config.arm.orig
sed -e "/default/s:OABI:EABI:" \
extra/Configs/Config.arm.orig > extra/Configs/Config.arm</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../x86/uclibc.xml"
xpointer="xpointer(//*[@os='e'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../x86/uclibc.xml"
+ xpointer="xpointer(//*[@os='p1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../x86/uclibc.xml"
+ xpointer="xpointer(//*[@os='p2'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../x86/uclibc.xml"
Modified: branches/clfs-embedded/BOOK/cross-tools/mips/uclibc.xml
==============================================================================
--- branches/clfs-embedded/BOOK/cross-tools/mips/uclibc.xml (original)
+++ branches/clfs-embedded/BOOK/cross-tools/mips/uclibc.xml Sat Nov 8 16:24:32 2008
@@ -35,6 +35,14 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../x86/uclibc.xml"
xpointer="xpointer(//*[@os='e'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../x86/uclibc.xml"
+ xpointer="xpointer(//*[@os='p1'])"/>
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../x86/uclibc.xml"
+ xpointer="xpointer(//*[@os='p2'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../x86/uclibc.xml"
Modified: branches/clfs-embedded/BOOK/cross-tools/x86/uclibc.xml
==============================================================================
--- branches/clfs-embedded/BOOK/cross-tools/x86/uclibc.xml (original)
+++ branches/clfs-embedded/BOOK/cross-tools/x86/uclibc.xml Sat Nov 8 16:24:32 2008
@@ -33,6 +33,11 @@
For those for more adventureous, you can use make menuconfig, and
do a more custom build for your uClibc installation.</para>
</note>
+
+ <para os="p1">The following patch creates a condition in a header so that
+ the struct flock will not be redefined:</para>
+
+<screen os="p2"><userinput>patch -Np1 -i ../&uclibc-flock_fixes-patch;</userinput></screen>
<para os="f">Create the default configuration:</para>
Modified: branches/clfs-embedded/BOOK/final-system/arm/busybox.xml
==============================================================================
--- branches/clfs-embedded/BOOK/final-system/arm/busybox.xml (original)
+++ branches/clfs-embedded/BOOK/final-system/arm/busybox.xml Sat Nov 8 16:24:32 2008
@@ -36,10 +36,6 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../x86/busybox.xml"
xpointer="xpointer(//*[@os='p4'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/busybox.xml"
- xpointer="xpointer(//*[@os='p5'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../x86/busybox.xml"
Modified: branches/clfs-embedded/BOOK/final-system/mips/busybox.xml
==============================================================================
--- branches/clfs-embedded/BOOK/final-system/mips/busybox.xml (original)
+++ branches/clfs-embedded/BOOK/final-system/mips/busybox.xml Sat Nov 8 16:24:32 2008
@@ -36,10 +36,6 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../x86/busybox.xml"
xpointer="xpointer(//*[@os='p4'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/busybox.xml"
- xpointer="xpointer(//*[@os='p5'])"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../x86/busybox.xml"
Modified: branches/clfs-embedded/BOOK/final-system/x86/busybox.xml
==============================================================================
--- branches/clfs-embedded/BOOK/final-system/x86/busybox.xml (original)
+++ branches/clfs-embedded/BOOK/final-system/x86/busybox.xml Sat Nov 8 16:24:32 2008
@@ -29,19 +29,16 @@
<sect2 role="installation">
<title>Installation of Busybox</title>
- <para os="p1">Before you build BusyBox, you may want to check the following URL for
- patches that the upstream maintainer of BusyBox has released to fix issues.
- <ulink url="http://busybox.net/downloads/fixes-&busybox-version;"/></para>
-
- <para os="p2">Here's an example of how to apply the patches from Busybox's website
- replace {patch_name} with the name of the patch:</para>
-
-<screen os="p3" role="nodump"><userinput>patch -Np1 -i ../busybox-&busybox-version;{patch_name}</userinput></screen>
-
- <para os="p4">The following patch fixes some issues that are related to the
+ <para os="p1">The following patch fixes some issues that are related to the
headers we are using:</para>
-<screen os="p5"><userinput>patch -Np1 -i ../&busybox-fixes-patch;</userinput></screen>
+<screen os="p2"><userinput>patch -Np1 -i ../&busybox-fixes-patch;</userinput></screen>
+
+ <para os="p3">The following patch corrects some includes in
+ <filename>iptunnel.c</filename> to be compatible with the sanatized
+ kernel headers installed earlier:</para>
+
+<screen os="p4"><userinput>patch -Np1 -i ../&busybox-iptunnel_headers-patch;</userinput></screen>
<para os="a">Create the default configuration:</para>
Modified: branches/clfs-embedded/BOOK/introduction/common/changelog.xml
==============================================================================
--- branches/clfs-embedded/BOOK/introduction/common/changelog.xml (original)
+++ branches/clfs-embedded/BOOK/introduction/common/changelog.xml Sat Nov 8 16:24:32 2008
@@ -40,6 +40,9 @@
<para>November 8, 2008</para>
<itemizedlist>
<listitem>
+ <para>[jciccone] - Updated Busybox to 1.12.1.</para>
+ </listitem>
+ <listitem>
<para>[jciccone] - Updated uClibc to 0.9.30-rc3.</para>
</listitem>
</itemizedlist>
Modified: branches/clfs-embedded/BOOK/materials/common/patches.xml
==============================================================================
--- branches/clfs-embedded/BOOK/materials/common/patches.xml (original)
+++ branches/clfs-embedded/BOOK/materials/common/patches.xml Sat Nov 8 16:24:32 2008
@@ -37,11 +37,29 @@
</varlistentry>
<varlistentry>
+ <term>Busybox Iptunnel Headers Patch - <token>&busybox-iptunnel_headers-patch-size;</token>:</term>
+ <listitem>
+ <para>Download: <ulink
+ url="&patches-root;&busybox-iptunnel_headers-patch;"/></para>
+ <para>MD5 sum: <literal>&busybox-iptunnel_headers-patch-md5;</literal></para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term>GCC Posix Patch - <token>&gcc-posix-patch-size;</token>:</term>
<listitem>
<para>Download: <ulink
url="&patches-root;&gcc-posix-patch;"/></para>
<para>MD5 sum: <literal>&gcc-posix-patch-md5;</literal></para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>uClibc Flock Fixes Patch - <token>&uclibc-flock_fixes-patch-size;</token>:</term>
+ <listitem>
+ <para>Downloads: <ulink
+ url="&patches-root;&uclibc-flock_fixes-patch;"/></para>
+ <para>MD5 sum: <literal>&uclibc-flock_fixes-patch-md5;</literal></para>
</listitem>
</varlistentry>
Modified: branches/clfs-embedded/BOOK/packages.ent
==============================================================================
--- branches/clfs-embedded/BOOK/packages.ent (original)
+++ branches/clfs-embedded/BOOK/packages.ent Sat Nov 8 16:24:32 2008
@@ -10,10 +10,10 @@
<!ENTITY binutils-md5 "17a52219dee5a76c1a9d9b0bfd337d66">
<!ENTITY binutils-home "http://sources.redhat.com/binutils/">
-<!ENTITY busybox-version "1.8.2">
-<!ENTITY busybox-size "1,732 KB">
+<!ENTITY busybox-version "1.12.1">
+<!ENTITY busybox-size "1,980 KB">
<!ENTITY busybox-url "http://busybox.net/downloads/busybox-&busybox-version;.tar.bz2">
-<!ENTITY busybox-md5 "5794c6187c7cc8176c52b96af9bf2478">
+<!ENTITY busybox-md5 "dc2e5e00d6fee8229ae92884c68733a7">
<!ENTITY busybox-home "http://www.busybox.net">
<!ENTITY clfs-bootscripts-version "1.0-pre4">
Modified: branches/clfs-embedded/BOOK/patches.ent
==============================================================================
--- branches/clfs-embedded/BOOK/patches.ent (original)
+++ branches/clfs-embedded/BOOK/patches.ent Sat Nov 8 16:24:32 2008
@@ -9,12 +9,20 @@
<!ENTITY binutils-posix-patch-size "4 KB">
<!ENTITY busybox-fixes-patch "busybox-&busybox-version;-fixes-1.patch">
-<!ENTITY busybox-fixes-patch-md5 "8c63ff58287e5de40a40e81145a8a1ad">
-<!ENTITY busybox-fixes-patch-size "20 KB">
+<!ENTITY busybox-fixes-patch-md5 "984f771a81475c234b1fc3f92c672b4d">
+<!ENTITY busybox-fixes-patch-size "16 KB">
+
+<!ENTITY busybox-iptunnel_headers-patch "busybox-&busybox-version;-iptunnel_headers-1.patch">
+<!ENTITY busybox-iptunnel_headers-patch-md5 "f0771cde6810a68c5459683b8c5e69b31">
+<!ENTITY busybox-iptunnel_headers-patch-size "4 KB">
<!ENTITY gcc-posix-patch "gcc-&gcc-version;-posix-1.patch">
<!ENTITY gcc-posix-patch-md5 "ed26ea522e014b2e39adf066bd44053b">
<!ENTITY gcc-posix-patch-size "12 KB">
+
+<!ENTITY uclibc-flock_fixes-patch "uClibc-&uclibc-version;-flock_fixes-1.patch">
+<!ENTITY uclibc-flock_fixes-patch-md5 "aaff25f9503fe380f82be79f82aa04e9">
+<!ENTITY uclibc-flock_fixes-patch-size "24 KB">
<!ENTITY zlib-destdir-patch "zlib-&zlib-version;-DESTDIR-1.patch">
<!ENTITY zlib-destdir-patch-md5 "d21bdd08bf444f87f275b6aef44e1a84">
More information about the Clfs-commits
mailing list