[Clfs-commits] [CLFS Embedded]Cross-LFS Embedded Book branch, master, updated. 0add7072d8a4888100e8971dc623e22b07d2fcaf
git
git at cross-lfs.org
Fri Apr 8 18:27:59 PDT 2011
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 0add7072d8a4888100e8971dc623e22b07d2fcaf (commit)
via 68781d8ddadc6d821353790addf6444c129fc181 (commit)
via 4c373d47c981dcb41fc311d3ebde735cb6240730 (commit)
via b882f7458226687c21196d7bb84a5b7ee05baa62 (commit)
via dea8e25db106d8e62085ad5b6466e230b6dcace0 (commit)
via acdf537abcd92e5c8346b34f452d4b195fecc90f (commit)
via 11cf000b556d877f33a413d8c14333359ad5a6d1 (commit)
via f4b0bd8e4ce10ae58464727b7d66fa034c61de24 (commit)
via 01716930a4746da1234dd34a080181605913a8d1 (commit)
via 1b109e6eae092a7a1fe4a5580683e93507fa7e02 (commit)
via ccb76d5759ffa6f8ebf4e85610fdcd00eecfdf91 (commit)
via ca55e96bc6abc9f9626583f698dcf26f0de7e598 (commit)
via 23af5294df3a95fe917cbb24795c0cb7ba12231f (commit)
via 9592d61604179a6987bc6c83e74392104ae1e089 (commit)
via 2e939d0fa9004b60ab5c22d3c9afe170bcc1de60 (commit)
via 0f6a3bab6db8a2c8a1ff19eb5038cd9f6536e9a5 (commit)
via 79c069a58a4b6f1155276687bc8832e1e04d77a5 (commit)
via 3e9edc531e9da88b011bf58eb37ab3b87056d84d (commit)
via c62f4d490b0eb063053c0cd92ce0c74a1439bae9 (commit)
via 7dd2673a797d145caca6f1541dbb879e1438674f (commit)
via b836e1e655cd3d0449627db4438e378cc40f2a5d (commit)
from 2ef84660d2aeacafaad9b61df91b2b18d76e41b1 (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 0add7072d8a4888100e8971dc623e22b07d2fcaf
Author: Andrew Bradford <bradfa at gmail.com>
Date: Fri Apr 8 07:55:58 2011 -0400
Updated date
diff --git a/BOOK/general.ent b/BOOK/general.ent
index b46ab30..e0b2e18 100644
--- a/BOOK/general.ent
+++ b/BOOK/general.ent
@@ -2,7 +2,7 @@
<!ENTITY month "04"> <!-- Use two digits -->
<!ENTITY month_name "April">
-<!ENTITY day "01"> <!-- Use two digits -->
+<!ENTITY day "08"> <!-- Use two digits -->
<!ENTITY year "2011"> <!-- Use four digits -->
<!ENTITY releasedate "&month_name; &day;, &year;">
commit 68781d8ddadc6d821353790addf6444c129fc181
Author: Andrew Bradford <bradfa at gmail.com>
Date: Fri Apr 8 07:55:37 2011 -0400
Updated ARM changelog
For libgcc soft float patch
diff --git a/BOOK/introduction/arm/changelog.xml b/BOOK/introduction/arm/changelog.xml
index 82dce04..079b7d6 100644
--- a/BOOK/introduction/arm/changelog.xml
+++ b/BOOK/introduction/arm/changelog.xml
@@ -33,6 +33,16 @@
-->
<listitem>
+ <para>April 8, 2011</para>
+ <itemizedlist>
+ <listitem>
+ <para>[abradford] - Added patch for ARM uClibc soft floating point
+ fixes in order to build libgcc.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>February 24, 2011</para>
<itemizedlist>
<listitem>
commit 4c373d47c981dcb41fc311d3ebde735cb6240730
Author: Andrew Bradford <bradfa at gmail.com>
Date: Fri Apr 8 07:30:34 2011 -0400
Added note to ARM Static-GCC for soft float patch
Tell users to apply ARM static-GCC patch for soft float.
diff --git a/BOOK/cross-tools/arm/gcc-static.xml b/BOOK/cross-tools/arm/gcc-static.xml
index 70bf49f..d4e727d 100644
--- a/BOOK/cross-tools/arm/gcc-static.xml
+++ b/BOOK/cross-tools/arm/gcc-static.xml
@@ -27,6 +27,17 @@
href="../common/gcc-static.xml"
xpointer="xpointer(//*[@os='a'])"/>
+ <important>
+
+ <para>If you set ${CLFS_FLOAT} to "soft" or "softfp", you must apply the
+ &gcc-uclibc-arm-softfloat-patch;. Check what ${CLFS_FLOAT} is set to and
+ if needed, apply the patch:</para>
+
+<screen><userinput>echo ${CLFS_FLOAT}
+patch -Np1 -i ../&gcc-uclibc-arm-softfloat-patch;</userinput></screen>
+
+ </important>
+
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../common/gcc-static.xml"
xpointer="xpointer(//*[@os='c'])"/>
commit b882f7458226687c21196d7bb84a5b7ee05baa62
Author: Andrew Bradford <bradfa at gmail.com>
Date: Tue Apr 5 07:47:02 2011 -0400
Updated book for GCC uClibc ARM soft float patch
Just the patch listing in Additional Patches for ARM.
No instructions yet.
diff --git a/BOOK/materials/arm/patches.xml b/BOOK/materials/arm/patches.xml
index d0563d3..82a883b 100644
--- a/BOOK/materials/arm/patches.xml
+++ b/BOOK/materials/arm/patches.xml
@@ -10,19 +10,19 @@
<title>Additional Patches for ARM</title>
-<!--
<variablelist role="materials">
- <varlistentry os="linux-mips-patch">
- <term>Linux-MIPS Merge Patch - <token>&linux-mips-patch-size;</token>:</term>
+
+ <varlistentry os="gcc-uclibc-arm-softfloat-patch">
+ <term>GCC uClibc ARM Soft Floating Point Patch - <token>&gcc-uclibc-arm-softfloat-patch-size;</token>:</term>
<listitem>
<para>Download: <ulink
- url="&patches-root;&linux-mips-patch;"/></para>
- <para>MD5 sum: <literal>&linux-mips-patch-md5;</literal></para>
+ url="&patches-root;&gcc-uclibc-arm-softfloat-patch;"/></para>
+ <para>MD5 sum: <literal>&gcc-uclibc-arm-softfloat-patch-md5;</literal></para>
</listitem>
</varlistentry>
</variablelist>
--->
+
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../common/patches.xml"
diff --git a/BOOK/patches.ent b/BOOK/patches.ent
index 3ae197f..5c8b7ad 100644
--- a/BOOK/patches.ent
+++ b/BOOK/patches.ent
@@ -32,6 +32,12 @@
<!ENTITY libnl-fixes-patch-md5 "773b0d979f1592f757dd30d47ae179fa">
<!ENTITY libnl-fixes-patch-size "3 KB">
+<!-- ARM Patches -->
+
+<!ENTITY gcc-uclibc-arm-softfloat-patch "gcc-&gcc-version;-uclibc-arm-softfloat-1.patch">
+<!ENTITY gcc-uclibc-arm-softfloat-patch-md5 "8a302850b814bbd75237eff65a23b9d1">
+<!ENTITY gcc-uclibc-arm-softfloat-patch-size "2 KB">
+
<!-- MIPS Patches -->
<!ENTITY linux-bcm43xx-patch "linux-&linux-version;-openwrt-bcm47xx-fixes-2.patch">
commit dea8e25db106d8e62085ad5b6466e230b6dcace0
Author: Andrew Bradford <bradfa at gmail.com>
Date: Tue Apr 5 06:52:03 2011 -0400
Created patch to enable softfloat on ARM w/ uClibc
Original taken from Buildroot team's GCC 4.5.2 patch. Wouldn't apply
cleanly to GCC 4.6.0 so modified slightly.
Enables a bunch of assembly routines to do soft floating point that
aren't enabled by default but are required to be in libgcc for uClibc.
diff --git a/patches/gcc-4.6.0-uclibc-arm-softfloat-1.patch b/patches/gcc-4.6.0-uclibc-arm-softfloat-1.patch
new file mode 100644
index 0000000..d61802b
--- /dev/null
+++ b/patches/gcc-4.6.0-uclibc-arm-softfloat-1.patch
@@ -0,0 +1,46 @@
+Submitted By: Andrew Bradford <bradfa at gmail.com>
+Date: 2011-04-05
+Initial Package Version: 4.6.0
+Upstream Status: From Buildroot Team
+Origin: http://git.buildroot.net/buildroot/tree/toolchain/gcc/4.5.2/810-arm-softfloat-libgcc.patch
+Description: This patch configures GCC to produce the required asm functions
+ to enable soft floating point operation in libgcc for ARM systems
+ using uClibc. GCC will use the file gcc/config/arm/ieee754-df.S
+ where these routines are stored. This doesn't happen by default,
+ thus requiring this patch.
+
+ Modified from the Buildroot team's original as it wouldn't apply
+ cleanly to GCC-4.6.0. Content is the same but with different
+ offsets.
+
+diff -Naur gcc-4.6.0.orig/gcc/config/arm/linux-elf.h gcc-4.6.0/gcc/config/arm/li
+nux-elf.h
+--- gcc-4.6.0.orig/gcc/config/arm/linux-elf.h 2011-04-05 05:58:33.000000000 -0
+400
++++ gcc-4.6.0/gcc/config/arm/linux-elf.h 2011-04-05 05:59:28.000000000 -0
+400
+@@ -60,7 +60,7 @@
+ %{shared:-lc} \
+ %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
+
+-#define LIBGCC_SPEC "%{msoft-float:-lfloat} %{mfloat-abi=soft*:-lfloat} -lgcc"
++#define LIBGCC_SPEC "-lgcc"
+
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
+
+diff -Naur gcc-4.6.0.orig/gcc/config/arm/t-linux gcc-4.6.0/gcc/config/arm/t-linux
+--- gcc-4.6.0.orig/gcc/config/arm/t-linux 2011-04-05 05:58:33.000000000 -0400
++++ gcc-4.6.0/gcc/config/arm/t-linux 2011-04-05 06:03:12.000000000 -0400
+@@ -23,7 +23,11 @@
+
+ LIB1ASMSRC = arm/lib1funcs.asm
+ LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \
+- _arm_addsubdf3 _arm_addsubsf3
++ _arm_addsubdf3 _arm_addsubsf3 \
++ _arm_negdf2 _arm_muldivdf3 _arm_cmpdf2 _arm_unorddf2 \
++ _arm_fixdfsi _arm_fixunsdfsi _arm_truncdfsf2 \
++ _arm_negsf2 _arm_muldivsf3 _arm_cmpsf2 _arm_unordsf2 \
++ _arm_fixsfsi _arm_fixunssfsi
+
+ # MULTILIB_OPTIONS = mhard-float/msoft-float
+ # MULTILIB_DIRNAMES = hard-float soft-float
commit acdf537abcd92e5c8346b34f452d4b195fecc90f
Author: Andrew Bradford <bradfa at gmail.com>
Date: Fri Apr 1 06:29:14 2011 -0400
Updated date
diff --git a/BOOK/general.ent b/BOOK/general.ent
index e33d807..b46ab30 100644
--- a/BOOK/general.ent
+++ b/BOOK/general.ent
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY month "03"> <!-- Use two digits -->
-<!ENTITY month_name "March">
-<!ENTITY day "23"> <!-- Use two digits -->
+<!ENTITY month "04"> <!-- Use two digits -->
+<!ENTITY month_name "April">
+<!ENTITY day "01"> <!-- Use two digits -->
<!ENTITY year "2011"> <!-- Use four digits -->
<!ENTITY releasedate "&month_name; &day;, &year;">
commit 11cf000b556d877f33a413d8c14333359ad5a6d1
Author: Andrew Bradford <bradfa at gmail.com>
Date: Fri Apr 1 06:27:45 2011 -0400
Updated changelog
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index 8c228f2..abf7ba0 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -37,6 +37,45 @@
-->
<listitem>
+ <para>March 31, 2011</para>
+ <itemizedlist>
+ <listitem>
+ <para>[abradford] - Updated BusyBox to version 1.18.4.</para>
+ </listitem>
+ <listitem>
+ <para>[abradford] - Updated GCC to version 4.6.0.</para>
+ </listitem>
+ <listitem>
+ <para>[abradford] - Updated MPC to version 0.9.</para>
+ </listitem>
+ <listitem>
+ <para>[abradford] - Updated zlib to version 1.2.5.</para>
+ </listitem>
+ <listitem>
+ <para>[abradford] - Updated Linux kernel to version 2.6.38.2.</para>
+ </listitem>
+ <listitem>
+ <para>[abradford] - Require Gawk 3.1 or greater because of Iana-Etc
+ requirements.</para>
+ </listitem>
+ <listitem>
+ <para>[abradford] - Updated "What Now?" section to include CBLFS link.
+ Thanks go to Adrian Grigo.</para>
+ </listitem>
+ <listitem>
+ <para>[abradford] - Link ${CLFS}/etc/init.d/rcS to
+ ${CLFS}/etc/rc.d/startup so that BusyBox's init can find the startup
+ scripts.</para>
+ </listitem>
+ <listitem>
+ <para>[abradford] - Updated mdev configuration such that video output
+ is disabled by default to ensure no errors if video is not
+ available.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>March 23, 2011</para>
<itemizedlist>
<listitem>
commit f4b0bd8e4ce10ae58464727b7d66fa034c61de24
Author: Andrew Bradford <bradfa at gmail.com>
Date: Thu Mar 31 07:45:58 2011 -0400
Updated busybox config patch md5sum and size
diff --git a/BOOK/patches.ent b/BOOK/patches.ent
index afc3a33..3ae197f 100644
--- a/BOOK/patches.ent
+++ b/BOOK/patches.ent
@@ -5,8 +5,8 @@
<!-- Start of Common Patches -->
<!ENTITY busybox-config-patch "busybox-&busybox-version;-config-1.patch">
-<!ENTITY busybox-config-patch-md5 "64bee07ba3efbb512fb4f348e814bf31">
-<!ENTITY busybox-config-patch-size "4 KB">
+<!ENTITY busybox-config-patch-md5 "bd06ac3799960df8c72f73bb4ad27e30">
+<!ENTITY busybox-config-patch-size "26 KB">
<!--
<!ENTITY busybox-fixes-patch "busybox-&busybox-version;-fixes-1.patch">
commit 01716930a4746da1234dd34a080181605913a8d1
Author: Andrew Bradford <bradfa at gmail.com>
Date: Wed Mar 30 07:55:49 2011 -0400
Updated BusyBox to version 1.18.4
Simply commented out the fixes patch info since there will be patches
to fix things in the future and editing existing info is more
straightforward than putting new info in.
Updated config patch is based off the 1.17.3 patch from Joe.
diff --git a/BOOK/final-system/common/busybox.xml b/BOOK/final-system/common/busybox.xml
index 0e9da8a..8c4721f 100644
--- a/BOOK/final-system/common/busybox.xml
+++ b/BOOK/final-system/common/busybox.xml
@@ -30,10 +30,12 @@
<sect2 role="installation">
<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>
<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>
diff --git a/BOOK/materials/common/patches.xml b/BOOK/materials/common/patches.xml
index ba533e5..123bd52 100644
--- a/BOOK/materials/common/patches.xml
+++ b/BOOK/materials/common/patches.xml
@@ -27,6 +27,7 @@
</listitem>
</varlistentry>
+<!--
<varlistentry>
<term>Busybox Fixes Patch - <token>&busybox-fixes-patch-size;</token>:</term>
<listitem>
@@ -35,6 +36,7 @@
<para>MD5 sum: <literal>&busybox-fixes-patch-md5;</literal></para>
</listitem>
</varlistentry>
+-->
<varlistentry>
<term>Iana-Etc Update Patch - <token>&iana-etc-update-patch-size;</token>:</term>
diff --git a/BOOK/packages.ent b/BOOK/packages.ent
index 3064fd8..e65db11 100644
--- a/BOOK/packages.ent
+++ b/BOOK/packages.ent
@@ -10,10 +10,10 @@
<!ENTITY binutils-md5 "c84c5acc9d266f1a7044b51c85a823f5">
<!ENTITY binutils-home "http://sourceware.org/binutils/">
-<!ENTITY busybox-version "1.17.3">
-<!ENTITY busybox-size "2,048 KB">
+<!ENTITY busybox-version "1.18.4">
+<!ENTITY busybox-size "2,081 KB">
<!ENTITY busybox-url "http://busybox.net/downloads/busybox-&busybox-version;.tar.bz2">
-<!ENTITY busybox-md5 "a2ce1a951571da8c6e0eaf75b1acef60">
+<!ENTITY busybox-md5 "b03c5b46ced732679e525a920a1a62f5">
<!ENTITY busybox-home "http://www.busybox.net">
<!ENTITY clfs-bootscripts-version "1.0-pre5">
diff --git a/BOOK/patches.ent b/BOOK/patches.ent
index 0960721..afc3a33 100644
--- a/BOOK/patches.ent
+++ b/BOOK/patches.ent
@@ -8,9 +8,11 @@
<!ENTITY busybox-config-patch-md5 "64bee07ba3efbb512fb4f348e814bf31">
<!ENTITY busybox-config-patch-size "4 KB">
+<!--
<!ENTITY busybox-fixes-patch "busybox-&busybox-version;-fixes-1.patch">
<!ENTITY busybox-fixes-patch-md5 "64bee07ba3efbb512fb4f348e814bf31">
<!ENTITY busybox-fixes-patch-size "4 KB">
+-->
<!ENTITY iana-etc-update-patch "iana-etc-&iana-etc-version;-update-1.patch">
<!ENTITY iana-etc-update-patch-md5 "9b4d102672fc8bf777bbb95d1007edda">
diff --git a/patches/busybox-1.17.3-config-1.patch b/patches/busybox-1.18.4-config-1.patch
similarity index 94%
rename from patches/busybox-1.17.3-config-1.patch
rename to patches/busybox-1.18.4-config-1.patch
index 12c620e..b4af564 100644
--- a/patches/busybox-1.17.3-config-1.patch
+++ b/patches/busybox-1.18.4-config-1.patch
@@ -1,18 +1,19 @@
-Submitted By: Joe Ciccone <jciccone at gmail.com>
-Date: 2010-11-28
-Initial Package Version: 0.17.3
-Origin: Joe Ciccone
+Submitted By: Andrew Bradford <bradfa at gmail.com>
+Date: 2011-03-31
+Initial Package Version: 1.18.4
+Origin: Andrew Bradford, Joe Ciccone
Upstream Status: None - CLFS Specific
-Description: Default configuration for CLFS builds of BusyBox
+Description: Default configuration for CLFS builds of BusyBox.
+ A modified version of Joe's 1.17.3 patch.
-diff -Naur busybox-1.17.3.orig/clfs/config busybox-1.17.3/clfs/config
---- busybox-1.17.3.orig/clfs/config 1969-12-31 19:00:00.000000000 -0500
-+++ busybox-1.17.3/clfs/config 2010-11-28 11:15:17.074781789 -0500
-@@ -0,0 +1,970 @@
+diff -Naur busybox-1.18.4.orig/clfs/config busybox-1.18.4/clfs/config
+--- busybox-1.18.4.orig/clfs/config 1969-12-31 19:00:00.000000000 -0500
++++ busybox-1.18.4/clfs/config 2011-03-31 07:04:13.000000000 -0400
+@@ -0,0 +1,990 @@
+#
+# Automatically generated make config: don't edit
-+# Busybox version: 1.17.3
-+# Sun Nov 28 11:13:16 2010
++# Busybox version: 1.18.4
++# Thu Mar 31 06:49:24 2011
+#
+CONFIG_HAVE_DOT_CONFIG=y
+
@@ -27,6 +28,7 @@ diff -Naur busybox-1.17.3.orig/clfs/config busybox-1.17.3/clfs/config
+# CONFIG_EXTRA_COMPAT is not set
+# CONFIG_INCLUDE_SUSv2 is not set
+# CONFIG_USE_PORTABLE_CODE is not set
++CONFIG_PLATFORM_LINUX=y
+CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
+# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
+# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
@@ -34,6 +36,7 @@ diff -Naur busybox-1.17.3.orig/clfs/config busybox-1.17.3/clfs/config
+CONFIG_FEATURE_VERBOSE_USAGE=y
+CONFIG_FEATURE_COMPRESS_USAGE=y
+CONFIG_FEATURE_INSTALLER=y
++# CONFIG_INSTALL_NO_USR is not set
+# CONFIG_LOCALE_SUPPORT is not set
+CONFIG_UNICODE_SUPPORT=y
+# CONFIG_UNICODE_USING_LOCALE is not set
@@ -48,8 +51,8 @@ diff -Naur busybox-1.17.3.orig/clfs/config busybox-1.17.3/clfs/config
+CONFIG_LONG_OPTS=y
+CONFIG_FEATURE_DEVPTS=y
+# CONFIG_FEATURE_CLEAN_UP is not set
-+CONFIG_FEATURE_UTMP=y
+CONFIG_FEATURE_WTMP=y
++CONFIG_FEATURE_UTMP=y
+CONFIG_FEATURE_PIDFILE=y
+CONFIG_FEATURE_SUID=y
+CONFIG_FEATURE_SUID_CONFIG=y
@@ -84,9 +87,8 @@ diff -Naur busybox-1.17.3.orig/clfs/config busybox-1.17.3/clfs/config
+# CONFIG_EFENCE is not set
+
+#
-+# Installation Options
++# Installation Options ("make install" behavior)
+#
-+# CONFIG_INSTALL_NO_USR is not set
+# CONFIG_INSTALL_APPLET_SYMLINKS is not set
+# CONFIG_INSTALL_APPLET_HARDLINKS is not set
+CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS=y
@@ -103,6 +105,7 @@ diff -Naur busybox-1.17.3.orig/clfs/config busybox-1.17.3/clfs/config
+CONFIG_MD5_SIZE_VS_SPEED=2
+CONFIG_FEATURE_FAST_TOP=y
+# CONFIG_FEATURE_ETC_NETWORKS is not set
++CONFIG_FEATURE_USE_TERMIOS=y
+CONFIG_FEATURE_EDITING=y
+CONFIG_FEATURE_EDITING_MAX_LEN=1024
+CONFIG_FEATURE_EDITING_VI=y
@@ -183,6 +186,7 @@ diff -Naur busybox-1.17.3.orig/clfs/config busybox-1.17.3/clfs/config
+CONFIG_TR=y
+CONFIG_FEATURE_TR_CLASSES=y
+CONFIG_FEATURE_TR_EQUIV=y
++CONFIG_BASE64=y
+CONFIG_CAL=y
+CONFIG_CATV=y
+CONFIG_CHGRP=y
@@ -357,6 +361,7 @@ diff -Naur busybox-1.17.3.orig/clfs/config busybox-1.17.3/clfs/config
+#
+# Editors
+#
++CONFIG_PATCH=y
+CONFIG_AWK=y
+CONFIG_FEATURE_AWK_LIBM=y
+CONFIG_CMP=y
@@ -364,7 +369,6 @@ diff -Naur busybox-1.17.3.orig/clfs/config busybox-1.17.3/clfs/config
+CONFIG_FEATURE_DIFF_LONG_OPTIONS=y
+CONFIG_FEATURE_DIFF_DIR=y
+# CONFIG_ED is not set
-+CONFIG_PATCH=y
+CONFIG_SED=y
+CONFIG_VI=y
+CONFIG_FEATURE_VI_MAX_LEN=4096
@@ -424,6 +428,9 @@ diff -Naur busybox-1.17.3.orig/clfs/config busybox-1.17.3/clfs/config
+# CONFIG_BOOTCHARTD is not set
+# CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set
+# CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set
++CONFIG_HALT=y
++# CONFIG_FEATURE_CALL_TELINIT is not set
++CONFIG_TELINIT_PATH=""
+CONFIG_INIT=y
+CONFIG_FEATURE_USE_INITTAB=y
+CONFIG_FEATURE_KILL_REMOVED=y
@@ -433,30 +440,30 @@ diff -Naur busybox-1.17.3.orig/clfs/config busybox-1.17.3/clfs/config
+# CONFIG_FEATURE_EXTRA_QUIET is not set
+# CONFIG_FEATURE_INIT_COREDUMPS is not set
+# CONFIG_FEATURE_INITRD is not set
-+CONFIG_HALT=y
-+# CONFIG_FEATURE_CALL_TELINIT is not set
-+CONFIG_TELINIT_PATH=""
++CONFIG_INIT_TERMINAL_TYPE="linux"
+CONFIG_MESG=y
+
+#
+# Login/Password Management Utilities
+#
++# CONFIG_ADD_SHELL is not set
++# CONFIG_REMOVE_SHELL is not set
+CONFIG_FEATURE_SHADOWPASSWDS=y
+CONFIG_USE_BB_PWD_GRP=y
+CONFIG_USE_BB_SHADOW=y
+CONFIG_USE_BB_CRYPT=y
+CONFIG_USE_BB_CRYPT_SHA=y
-+CONFIG_ADDGROUP=y
-+# CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS is not set
-+CONFIG_FEATURE_ADDUSER_TO_GROUP=y
-+CONFIG_DELGROUP=y
-+CONFIG_FEATURE_DEL_USER_FROM_GROUP=y
-+# CONFIG_FEATURE_CHECK_NAMES is not set
+CONFIG_ADDUSER=y
+CONFIG_FEATURE_ADDUSER_LONG_OPTIONS=y
++# CONFIG_FEATURE_CHECK_NAMES is not set
+CONFIG_FIRST_SYSTEM_ID=100
+CONFIG_LAST_SYSTEM_ID=999
++CONFIG_ADDGROUP=y
++# CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS is not set
++CONFIG_FEATURE_ADDUSER_TO_GROUP=y
+CONFIG_DELUSER=y
++CONFIG_DELGROUP=y
++CONFIG_FEATURE_DEL_USER_FROM_GROUP=y
+CONFIG_GETTY=y
+CONFIG_LOGIN=y
+# CONFIG_PAM is not set
@@ -515,6 +522,7 @@ diff -Naur busybox-1.17.3.orig/clfs/config busybox-1.17.3/clfs/config
+#
+# Linux System Utilities
+#
++CONFIG_BLOCKDEV=y
+CONFIG_REV=y
+# CONFIG_ACPID is not set
+# CONFIG_FEATURE_ACPID_COMPAT is not set
@@ -533,6 +541,7 @@ diff -Naur busybox-1.17.3.orig/clfs/config busybox-1.17.3/clfs/config
+# CONFIG_FEATURE_SGI_LABEL is not set
+# CONFIG_FEATURE_SUN_LABEL is not set
+# CONFIG_FEATURE_OSF_LABEL is not set
++# CONFIG_FEATURE_GPT_LABEL is not set
+CONFIG_FEATURE_FDISK_ADVANCED=y
+CONFIG_FINDFS=y
+CONFIG_FLOCK=y
@@ -565,7 +574,6 @@ diff -Naur busybox-1.17.3.orig/clfs/config busybox-1.17.3/clfs/config
+CONFIG_MKSWAP=y
+CONFIG_FEATURE_MKSWAP_UUID=y
+CONFIG_MORE=y
-+CONFIG_FEATURE_USE_TERMIOS=y
+CONFIG_MOUNT=y
+CONFIG_FEATURE_MOUNT_FAKE=y
+CONFIG_FEATURE_MOUNT_VERBOSE=y
@@ -603,7 +611,7 @@ diff -Naur busybox-1.17.3.orig/clfs/config busybox-1.17.3/clfs/config
+CONFIG_FEATURE_VOLUMEID_EXT=y
+# CONFIG_FEATURE_VOLUMEID_BTRFS is not set
+# CONFIG_FEATURE_VOLUMEID_REISERFS is not set
-+# CONFIG_FEATURE_VOLUMEID_FAT is not set
++CONFIG_FEATURE_VOLUMEID_FAT=y
+# CONFIG_FEATURE_VOLUMEID_HFS is not set
+# CONFIG_FEATURE_VOLUMEID_JFS is not set
+# CONFIG_FEATURE_VOLUMEID_XFS is not set
@@ -622,10 +630,13 @@ diff -Naur busybox-1.17.3.orig/clfs/config busybox-1.17.3/clfs/config
+# Miscellaneous Utilities
+#
+# CONFIG_CONSPY is not set
++CONFIG_NANDWRITE=y
++CONFIG_NANDDUMP=y
+# CONFIG_UBIATTACH is not set
+# CONFIG_UBIDETACH is not set
+CONFIG_ADJTIMEX=y
+# CONFIG_BBCONFIG is not set
++# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set
+# CONFIG_BEEP is not set
+CONFIG_FEATURE_BEEP_FREQ=0
+CONFIG_FEATURE_BEEP_LENGTH_MS=0
@@ -654,10 +665,10 @@ diff -Naur busybox-1.17.3.orig/clfs/config busybox-1.17.3/clfs/config
+CONFIG_EJECT=y
+CONFIG_FEATURE_EJECT_SCSI=y
+# CONFIG_FBSPLASH is not set
-+# CONFIG_FLASHCP is not set
-+# CONFIG_FLASH_LOCK is not set
-+# CONFIG_FLASH_UNLOCK is not set
-+# CONFIG_FLASH_ERASEALL is not set
++CONFIG_FLASHCP=y
++CONFIG_FLASH_LOCK=y
++CONFIG_FLASH_UNLOCK=y
++CONFIG_FLASH_ERASEALL=y
+# CONFIG_IONICE is not set
+CONFIG_INOTIFYD=y
+CONFIG_LAST=y
@@ -705,6 +716,7 @@ diff -Naur busybox-1.17.3.orig/clfs/config busybox-1.17.3/clfs/config
+#
+# Networking Utilities
+#
++CONFIG_NBDCLIENT=y
+# CONFIG_NC is not set
+# CONFIG_NC_SERVER is not set
+# CONFIG_NC_EXTRA is not set
@@ -740,6 +752,7 @@ diff -Naur busybox-1.17.3.orig/clfs/config busybox-1.17.3/clfs/config
+# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
+# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set
+# CONFIG_FEATURE_HTTPD_PROXY is not set
++# CONFIG_FEATURE_HTTPD_GZIP is not set
+CONFIG_IFCONFIG=y
+CONFIG_FEATURE_IFCONFIG_STATUS=y
+CONFIG_FEATURE_IFCONFIG_SLIP=y
@@ -819,15 +832,15 @@ diff -Naur busybox-1.17.3.orig/clfs/config busybox-1.17.3/clfs/config
+# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
+CONFIG_TUNCTL=y
+# CONFIG_FEATURE_TUNCTL_UG is not set
-+CONFIG_UDHCPD=y
-+CONFIG_DHCPRELAY=y
-+CONFIG_DUMPLEASES=y
++# CONFIG_UDHCPD is not set
++# CONFIG_DHCPRELAY is not set
++# CONFIG_DUMPLEASES is not set
+# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
+CONFIG_DHCPD_LEASES_FILE=""
+CONFIG_UDHCPC=y
+CONFIG_FEATURE_UDHCPC_ARPING=y
+CONFIG_FEATURE_UDHCP_PORT=y
-+CONFIG_UDHCP_DEBUG=0
++CONFIG_UDHCP_DEBUG=1
+CONFIG_FEATURE_UDHCP_RFC3397=y
+CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
+CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
@@ -838,6 +851,7 @@ diff -Naur busybox-1.17.3.orig/clfs/config busybox-1.17.3/clfs/config
+CONFIG_FEATURE_WGET_STATUSBAR=y
+CONFIG_FEATURE_WGET_AUTHENTICATION=y
+CONFIG_FEATURE_WGET_LONG_OPTIONS=y
++CONFIG_FEATURE_WGET_TIMEOUT=y
+# CONFIG_ZCIP is not set
+
+#
@@ -861,6 +875,10 @@ diff -Naur busybox-1.17.3.orig/clfs/config busybox-1.17.3/clfs/config
+#
+# Process Utilities
+#
++CONFIG_IOSTAT=y
++CONFIG_MPSTAT=y
++CONFIG_PMAP=y
++CONFIG_POWERTOP=y
+CONFIG_SMEMCAP=y
+CONFIG_FREE=y
+CONFIG_FUSER=y
@@ -937,10 +955,13 @@ diff -Naur busybox-1.17.3.orig/clfs/config busybox-1.17.3/clfs/config
+CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
+CONFIG_ASH_RANDOM_SUPPORT=y
+CONFIG_ASH_EXPAND_PRMT=y
++CONFIG_CTTYHACK=y
+CONFIG_HUSH=y
+CONFIG_HUSH_BASH_COMPAT=y
++CONFIG_HUSH_BRACE_EXPANSION=y
+CONFIG_HUSH_HELP=y
+CONFIG_HUSH_INTERACTIVE=y
++CONFIG_HUSH_SAVEHISTORY=y
+CONFIG_HUSH_JOB=y
+CONFIG_HUSH_TICK=y
+CONFIG_HUSH_IF=y
@@ -948,22 +969,21 @@ diff -Naur busybox-1.17.3.orig/clfs/config busybox-1.17.3/clfs/config
+CONFIG_HUSH_CASE=y
+CONFIG_HUSH_FUNCTIONS=y
+CONFIG_HUSH_LOCAL=y
-+CONFIG_HUSH_EXPORT_N=y
+CONFIG_HUSH_RANDOM_SUPPORT=y
++CONFIG_HUSH_EXPORT_N=y
++CONFIG_HUSH_MODE_X=y
++# CONFIG_MSH is not set
+CONFIG_FEATURE_SH_IS_ASH=y
+# CONFIG_FEATURE_SH_IS_HUSH is not set
+# CONFIG_FEATURE_SH_IS_NONE is not set
-+# CONFIG_FEATURE_BASH_IS_ASH is not set
++CONFIG_FEATURE_BASH_IS_ASH=y
+# CONFIG_FEATURE_BASH_IS_HUSH is not set
-+CONFIG_FEATURE_BASH_IS_NONE=y
-+# CONFIG_LASH is not set
-+# CONFIG_MSH is not set
++# CONFIG_FEATURE_BASH_IS_NONE is not set
+CONFIG_SH_MATH_SUPPORT=y
+# CONFIG_SH_MATH_SUPPORT_64 is not set
+CONFIG_FEATURE_SH_EXTRA_QUIET=y
+# CONFIG_FEATURE_SH_STANDALONE is not set
+# CONFIG_FEATURE_SH_NOFORK is not set
-+CONFIG_CTTYHACK=y
+
+#
+# System Logging Utilities
@@ -978,4 +998,5 @@ diff -Naur busybox-1.17.3.orig/clfs/config busybox-1.17.3/clfs/config
+CONFIG_LOGREAD=y
+CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y
+CONFIG_KLOGD=y
++CONFIG_FEATURE_KLOGD_KLOGCTL=y
+CONFIG_LOGGER=y
commit 1b109e6eae092a7a1fe4a5580683e93507fa7e02
Author: Andrew Bradford <bradfa at gmail.com>
Date: Wed Mar 30 07:49:00 2011 -0400
Update GCC to version 4.6.0
diff --git a/BOOK/packages.ent b/BOOK/packages.ent
index 1a05ac2..3064fd8 100644
--- a/BOOK/packages.ent
+++ b/BOOK/packages.ent
@@ -28,10 +28,10 @@
<!ENTITY e2fsprogs-md5 "05f70470aea2ef7efbb0845b2b116720">
<!ENTITY e2fsprogs-home "http://e2fsprogs.sourceforge.net">
-<!ENTITY gcc-version "4.5.2">
-<!ENTITY gcc-size "64,775 KB">
+<!ENTITY gcc-version "4.6.0">
+<!ENTITY gcc-size "69,902 KB">
<!ENTITY gcc-url "ftp://gcc.gnu.org/pub/gcc/releases/gcc-&gcc-version;/gcc-&gcc-version;.tar.bz2">
-<!ENTITY gcc-md5 "d6559145853fbaaa0fd7556ed93bce9a">
+<!ENTITY gcc-md5 "93d1c436bf991564524701259b6285a2">
<!ENTITY gcc-home "http://gcc.gnu.org">
<!ENTITY gmp-version "5.0.1">
commit ccb76d5759ffa6f8ebf4e85610fdcd00eecfdf91
Author: Andrew Bradford <bradfa at gmail.com>
Date: Wed Mar 30 07:42:17 2011 -0400
Update MPC to version 0.9
diff --git a/BOOK/packages.ent b/BOOK/packages.ent
index 9719725..1a05ac2 100644
--- a/BOOK/packages.ent
+++ b/BOOK/packages.ent
@@ -54,10 +54,10 @@
<!ENTITY linux-md5 "5e9d0edae15053ea9acd932e6d162d03">
<!ENTITY linux-home "http://www.kernel.org">
-<!ENTITY mpc-version "0.8.2">
-<!ENTITY mpc-size "536 KB">
+<!ENTITY mpc-version "0.9">
+<!ENTITY mpc-size "553 KB">
<!ENTITY mpc-url "http://www.multiprecision.org/mpc/download/mpc-&mpc-version;.tar.gz">
-<!ENTITY mpc-md5 "e98267ebd5648a39f881d66797122fb6">
+<!ENTITY mpc-md5 "0d6acab8d214bd7d1fbbc593e83dd00d">
<!ENTITY mpc-home "http://www.multiprecision.org/">
<!ENTITY mpfr-version "3.0.0">
commit ca55e96bc6abc9f9626583f698dcf26f0de7e598
Author: Andrew Bradford <bradfa at gmail.com>
Date: Wed Mar 30 07:31:20 2011 -0400
Update zlib to version 1.2.5
diff --git a/BOOK/packages.ent b/BOOK/packages.ent
index 91db251..9719725 100644
--- a/BOOK/packages.ent
+++ b/BOOK/packages.ent
@@ -73,10 +73,10 @@
<!ENTITY uclibc-md5 "52fb8a494758630c8d3ddd7f1e0daafd">
<!ENTITY uclibc-home "http://uclibc.org/">
-<!ENTITY zlib-version "1.2.3">
-<!ENTITY zlib-size "484 KB">
+<!ENTITY zlib-version "1.2.5">
+<!ENTITY zlib-size "532 KB">
<!ENTITY zlib-url "&sourceforge;libpng/zlib-&zlib-version;.tar.gz">
-<!ENTITY zlib-md5 "debc62758716a169df9f62e6ab2bc634">
+<!ENTITY zlib-md5 "c735eab2d659a96e5a594c9e8541ad63">
<!ENTITY zlib-home "http://www.zlib.net">
<!-- Beyond CLFS packages -->
commit 23af5294df3a95fe917cbb24795c0cb7ba12231f
Author: Andrew Bradford <bradfa at gmail.com>
Date: Wed Mar 30 07:07:04 2011 -0400
uClibc note grammar fixup
diff --git a/BOOK/cross-tools/common/uclibc.xml b/BOOK/cross-tools/common/uclibc.xml
index 0b425d0..6371a24 100644
--- a/BOOK/cross-tools/common/uclibc.xml
+++ b/BOOK/cross-tools/common/uclibc.xml
@@ -32,7 +32,7 @@
<note os="a">
<para>Below we are just telling uClibc to use its default configuration.
- For those for more adventurous, you can use make menuconfig, and
+ For those who are more adventurous, you can use make menuconfig and
do a more custom build for your uClibc installation.</para>
</note>
commit 9592d61604179a6987bc6c83e74392104ae1e089
Author: Andrew Bradford <bradfa at gmail.com>
Date: Wed Mar 30 07:04:49 2011 -0400
Tab added to uClibc arm if-then
diff --git a/BOOK/cross-tools/arm/uclibc.xml b/BOOK/cross-tools/arm/uclibc.xml
index 2078140..fe8ba8b 100644
--- a/BOOK/cross-tools/arm/uclibc.xml
+++ b/BOOK/cross-tools/arm/uclibc.xml
@@ -44,7 +44,7 @@
<screen os="e"><userinput>cp -v clfs/config.${CLFS_ARCH}.${CLFS_ENDIAN} .config
if [ "${CLFS_ABI}" == "aapcs" ] || [ "${CLFS_ABI}" == "aapcs-linux" ]; \
-then sed -i s/CONFIG_ARM_OABI/CONFIG_ARM_EABI/g .config; fi</userinput></screen>
+ then sed -i s/CONFIG_ARM_OABI/CONFIG_ARM_EABI/g .config; fi</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../common/uclibc.xml"
commit 2e939d0fa9004b60ab5c22d3c9afe170bcc1de60
Author: Andrew Bradford <bradfa at gmail.com>
Date: Tue Mar 29 07:49:38 2011 -0400
Update Linux kernel to 2.6.38.2 (current stable)
2.6.38 is the first mainline kernel that has most of the drivers required
for TI OMAP3730 SoC processor on the BeagleBoard-xM. Also includes
a defconfig for omap2_plus covering OMAP2 and OMAP3 ARM processors from TI.
diff --git a/BOOK/packages.ent b/BOOK/packages.ent
index 22a7470..91db251 100644
--- a/BOOK/packages.ent
+++ b/BOOK/packages.ent
@@ -48,10 +48,10 @@
<!ENTITY linux-dl-version "2.6">
-<!ENTITY linux-version "2.6.36">
-<!ENTITY linux-size "68,632 KB">
+<!ENTITY linux-version "2.6.38.2">
+<!ENTITY linux-size "73,037 KB">
<!ENTITY linux-url "&kernel;linux/kernel/v&linux-dl-version;/linux-&linux-version;.tar.bz2">
-<!ENTITY linux-md5 "61f3739a73afb6914cb007f37fb09b62">
+<!ENTITY linux-md5 "5e9d0edae15053ea9acd932e6d162d03">
<!ENTITY linux-home "http://www.kernel.org">
<!ENTITY mpc-version "0.8.2">
commit 0f6a3bab6db8a2c8a1ff19eb5038cd9f6536e9a5
Author: Andrew Bradford <bradfa at gmail.com>
Date: Tue Mar 29 07:43:42 2011 -0400
Require at least Gawk 3.1
Iana-etc requires at least Gawk 3.1 (according to docs) so we need to, too.
diff --git a/BOOK/prologue/common/hostreqs.xml b/BOOK/prologue/common/hostreqs.xml
index 223749f..6e22352 100644
--- a/BOOK/prologue/common/hostreqs.xml
+++ b/BOOK/prologue/common/hostreqs.xml
@@ -48,7 +48,7 @@
</listitem>
<listitem>
- <para><emphasis role="strong">Gawk-3.0</emphasis></para>
+ <para><emphasis role="strong">Gawk-3.1</emphasis></para>
</listitem>
<listitem>
commit 79c069a58a4b6f1155276687bc8832e1e04d77a5
Author: Andrew Bradford <bradfa at gmail.com>
Date: Tue Mar 29 07:19:53 2011 -0400
Updated changelog.
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index 241fc1c..8c228f2 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -37,6 +37,44 @@
-->
<listitem>
+ <para>March 23, 2011</para>
+ <itemizedlist>
+ <listitem>
+ <para>[abradford] - Remove mknod commands as mdev takes care of creating
+ all required entries in /dev automatically.</para>
+ </listitem>
+ <listitem>
+ <para>[abradford] - Moved change ownership section to be as late in the
+ book as possible and only operate on a copy of the file system.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
+ <para>March 18, 2011</para>
+ <itemizedlist>
+ <listitem>
+ <para>[abradford] - Copy libgcc library to target as it's needed by
+ at least e2fsprogs.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
+ <para>March 7, 2011</para>
+ <itemizedlist>
+ <listitem>
+ <para>[abradford] - Added optional information for building C++
+ compiler.</para>
+ </listitem>
+ <listitem>
+ <para>[abradford] - Updated bootscripts install target and package contents
+ to match current bootscripts.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>February 24, 2011</para>
<itemizedlist>
<listitem>
commit 3e9edc531e9da88b011bf58eb37ab3b87056d84d
Author: Andrew Bradford <bradfa at gmail.com>
Date: Tue Mar 29 07:02:00 2011 -0400
Added CBLFS link and info to "What Now?"
Thanks to Adrian Grigo <agrigo2001 at yahoo dot com dot au> for pointing
out that the "What Now?" section did not have a link to CBLFS.
diff --git a/BOOK/general.ent b/BOOK/general.ent
index 2a90767..e33d807 100644
--- a/BOOK/general.ent
+++ b/BOOK/general.ent
@@ -29,6 +29,7 @@
<!ENTITY hints-index "&lfs-root;hints/list.html">
<!ENTITY livecd-root "&lfs-root;livecd/">
<!ENTITY errata "&clfs-wiki;clfs-embedded/errata/&generic-version;/">
+<!ENTITY cblfs-wiki "http://cblfs.cross-lfs.org/">
<!ENTITY gnu "http://ftp.gnu.org/gnu/">
<!ENTITY gnu-software "http://www.gnu.org/software/">
diff --git a/BOOK/the-end/whatnow.xml b/BOOK/the-end/whatnow.xml
index 6910411..c7b29be 100644
--- a/BOOK/the-end/whatnow.xml
+++ b/BOOK/the-end/whatnow.xml
@@ -61,6 +61,15 @@
</listitem>
<listitem>
+ <para>Community Driven Beyond Linux From Scratch</para>
+
+ <para>The Community Driven Beyond Linux From Scratch wiki provides
+ information, installation procedures, and other tips for a large variety
+ of software that can be installed on a CLFS system. The CBLFS wiki is
+ located at <ulink url="&cblfs-wiki;"/>.</para>
+ </listitem>
+
+ <listitem>
<para>Beyond Linux From Scratch</para>
<para>The Beyond Linux From Scratch book covers installation
commit c62f4d490b0eb063053c0cd92ce0c74a1439bae9
Author: Andrew Bradford <bradfa at gmail.com>
Date: Fri Mar 25 06:44:34 2011 -0400
Link etc/init.d/rcS to etc/rc.d/startup for BusyBox
BusyBox wanst the startup script to be located at /etc/init.d/rcS.
Our startup scripts store everything in /etc/rc.d and our
startup script is "startup". Symlink created so BusyBox can find
the startup script.
This may change at a later date if startup scripts get renamed to be more
BusyBox friendly.
diff --git a/BOOK/bootscripts/common/bootscripts.xml b/BOOK/bootscripts/common/bootscripts.xml
index 8eecb69..6ae7ddf 100644
--- a/BOOK/bootscripts/common/bootscripts.xml
+++ b/BOOK/bootscripts/common/bootscripts.xml
@@ -29,6 +29,14 @@
<screen><userinput>make DESTDIR=${CLFS} install-bootscripts</userinput></screen>
+ <para>The CLFS startup bootscript is <filename>/etc/rc.d/startup</filename>,
+ but BusyBox will look for <filename>/etc/init.d/rcS</filename> to use as its
+ startup script. To ensure BusyBox finds the startup script, create the
+ <filename>${CLFS}/etc/init.d</filename> directory and a symlink:</para>
+
+<screen><userinput>install -dv ${CLFS}/etc/init.d
+ln -sv ../rc.d/startup ${CLFS}/etc/init.d/rcS</userinput></screen>
+
</sect2>
<sect2 id="contents-bootscripts" role="content">
commit 7dd2673a797d145caca6f1541dbb879e1438674f
Author: Andrew Bradford <bradfa at gmail.com>
Date: Thu Mar 24 06:36:56 2011 -0400
Fixed Hostname typo, [lfs] to [clfs]
diff --git a/BOOK/bootscripts/common/hostname.xml b/BOOK/bootscripts/common/hostname.xml
index 3e4b86d..81a00c5 100644
--- a/BOOK/bootscripts/common/hostname.xml
+++ b/BOOK/bootscripts/common/hostname.xml
@@ -23,7 +23,7 @@
<screen><userinput>echo "<replaceable>[clfs]</replaceable>" > ${CLFS}/etc/HOSTNAME</userinput></screen>
- <para><replaceable>[lfs]</replaceable> needs to be replaced with the
+ <para><replaceable>[clfs]</replaceable> needs to be replaced with the
name given to the computer. Do not enter the Fully Qualified
Domain Name (FQDN) here. That information will be put in the
<filename>/etc/hosts</filename> file in the next section.</para>
commit b836e1e655cd3d0449627db4438e378cc40f2a5d
Author: Andrew Bradford <bradfa at gmail.com>
Date: Thu Mar 24 06:15:26 2011 -0400
Made mdev video output not enabled by default
Default configuration should not throw errors but may not be fully
featured. Changed mdev.conf to comment out video output lines by default
and have a note to uncomment to enable video output. In this way,
a board with or without video output will boot without errors.
diff --git a/BOOK/bootscripts/common/mdev.xml b/BOOK/bootscripts/common/mdev.xml
index 1ab08f0..d560184 100644
--- a/BOOK/bootscripts/common/mdev.xml
+++ b/BOOK/bootscripts/common/mdev.xml
@@ -64,13 +64,11 @@ stderr -> fd/2
stdin -> fd/0
stdout -> fd/1
-# Remove these devices, if using a headless system
-# You will see an error mdev: Bad line 35
-vbi -> vbi0
-vcs -> vcs0
-vcsa -> vcsa0
-video -> video0
-# Stop Remove for headless system
+# Uncomment the following 4 lines to enable video output
+#vbi -> vbi0
+#vcs -> vcs0
+#vcsa -> vcsa0
+#video -> video0
# Devices:
# Syntax: %s %d:%d %s
-----------------------------------------------------------------------
Summary of changes:
BOOK/bootscripts/common/bootscripts.xml | 8 ++
BOOK/bootscripts/common/hostname.xml | 2 +-
BOOK/bootscripts/common/mdev.xml | 12 +--
BOOK/cross-tools/arm/gcc-static.xml | 11 ++
BOOK/cross-tools/arm/uclibc.xml | 2 +-
BOOK/cross-tools/common/uclibc.xml | 2 +-
BOOK/final-system/common/busybox.xml | 2 +
BOOK/general.ent | 7 +-
BOOK/introduction/arm/changelog.xml | 10 ++
BOOK/introduction/common/changelog.xml | 77 +++++++++++++++
BOOK/materials/arm/patches.xml | 12 +-
BOOK/materials/common/patches.xml | 2 +
BOOK/packages.ent | 30 +++---
BOOK/patches.ent | 12 ++-
BOOK/prologue/common/hostreqs.xml | 2 +-
BOOK/the-end/whatnow.xml | 9 ++
...onfig-1.patch => busybox-1.18.4-config-1.patch} | 101 ++++++++++++--------
patches/gcc-4.6.0-uclibc-arm-softfloat-1.patch | 46 +++++++++
18 files changed, 270 insertions(+), 77 deletions(-)
rename patches/{busybox-1.17.3-config-1.patch => busybox-1.18.4-config-1.patch} (94%)
create mode 100644 patches/gcc-4.6.0-uclibc-arm-softfloat-1.patch
hooks/post-receive
--
Cross-LFS Embedded Book
More information about the Clfs-commits
mailing list