# HG changeset patch
# User Rob Landley <rob@landley.net>
# Date 1280120738 18000
# Node ID 7ca3dfbc9e062d139d1c996395c65bae9f93fb5b
# Parent  29c86692f80d3dc63078a5808bbdb396e01a29c2
Update to busybox 1.17.1 and switch to defconfig instead of trimconfig.

diff -r 29c86692f80d -r 7ca3dfbc9e06 download.sh
--- a/download.sh	Sun Jul 25 23:26:46 2010 -0500
+++ b/download.sh	Mon Jul 26 00:05:38 2010 -0500
@@ -42,22 +42,22 @@
 
 URL=ftp://ftp.gnu.org/gnu/gcc/gcc-4.2.1/gcc-core-4.2.1.tar.bz2 \
 SHA1=43a138779e053a864bd16dfabcd3ffff04103213 \
-UNSTABLE=ftp://ftp.gnu.org/gnu/gcc/gcc-4.4.1/gcc-core-4.4.1.tar.bz2 \
+#UNSTABLE=ftp://ftp.gnu.org/gnu/gcc/gcc-4.4.1/gcc-core-4.4.1.tar.bz2 \
 maybe_fork "download || dienow"
 
 # The g++ version must match gcc version.
 
 URL=http://ftp.gnu.org/gnu/gcc/gcc-4.2.1/gcc-g++-4.2.1.tar.bz2 \
 SHA1=8f3785bd0e092f563e14ecd26921cd04275496a6 \
-UNSTABLE=http://ftp.gnu.org/gnu/gcc/gcc-4.4.1/gcc-g++-4.4.1.tar.bz2 \
+#UNSTABLE=http://ftp.gnu.org/gnu/gcc/gcc-4.4.1/gcc-g++-4.4.1.tar.bz2 \
 maybe_fork "download || dienow"
 
 # Building a native root filesystem requires linux and uClibc (above) plus
 # BusyBox.  Adding a native toolchain requires binutils and gcc (above) plus
 # make and bash.
 
-URL=http://www.busybox.net/downloads/busybox-1.16.2.tar.bz2 \
-SHA1=07d6a4f698a55775162422dde40286820460e181 \
+URL=http://www.busybox.net/downloads/busybox-1.17.1.tar.bz2 \
+SHA1=691f44088c3327c957158443e813ec7346e99df6 \
 #UNSTABLE=http://busybox.net/downloads/busybox-snapshot.tar.bz2 \
 maybe_fork "download || dienow"
 
@@ -77,7 +77,7 @@
 
 URL=http://impactlinux.com/code/toybox/downloads/toybox-0.1.0.tar.bz2 \
 SHA1=ad42f9317e3805312c521fc62c6bfd2d4c61906c \
-UNSTABLE=http://impactlinux.com/fwl/mirror/alt-toybox-0.tar.bz2
+#UNSTABLE=http://impactlinux.com/fwl/mirror/alt-toybox-0.tar.bz2
 maybe_fork "download || dienow"
 
 URL=http://cxx.uclibc.org/src/uClibc++-0.2.2.tar.bz2 \
diff -r 29c86692f80d -r 7ca3dfbc9e06 sources/sections/busybox.build
--- a/sources/sections/busybox.build	Sun Jul 25 23:26:46 2010 -0500
+++ b/sources/sections/busybox.build	Mon Jul 26 00:05:38 2010 -0500
@@ -4,7 +4,8 @@
 
 # Build busybox
 
-make allyesconfig KCONFIG_ALLCONFIG="${SOURCES}/trimconfig-busybox" &&
+#make allyesconfig KCONFIG_ALLCONFIG="${SOURCES}/trimconfig-busybox" &&
+make defconfig &&
 cp .config "$WORK"/config-busybox &&
 LDFLAGS="$LDFLAGS $STATIC_FLAGS" make -j $CPUS $VERBOSITY $DO_CROSS &&
 make busybox.links || dienow
@@ -15,5 +16,6 @@
 
 for i in $(sed 's@.*/@@' busybox.links)
 do
-  [ ! -f "INSTDIR/$i" ] && (ln -sf busybox "$INSTDIR/$i" || dienow)
+  [ ! -f "$INSTDIR/$i" ] && (ln -sf busybox "$INSTDIR/$i" || dienow)
 done
+rm -f "$INSTDIR"/{patch,tune2fs}
diff -r 29c86692f80d -r 7ca3dfbc9e06 sources/trimconfig-busybox
--- a/sources/trimconfig-busybox	Sun Jul 25 23:26:46 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,71 +0,0 @@
-# Differences between "allyesconfig" and the config we want.
-#
-# To use: make allyesconfig KCONFIG_ALLCONFIG=trimconfig
-
-# These are provided by other packages, because the busybox ones don't
-# work yet.
-
-# No ext2 support (tune2fs -j)
-CONFIG_MKFS_EXT2=n
-
-# binutils (no write support)
-CONFIG_AR=n
-# toybox
-CONFIG_PATCH=n
-# bash
-CONFIG_FEATURE_SH_IS_ASH=y
-
-# Switch off inadvisable features and build options.
-
-CONFIG_FEATURE_ASSUME_UNICODE=n
-CONFIG_FEATURE_CLEAN_UP=n
-CONFIG_SELINUX=n
-CONFIG_PAM=n
-CONFIG_FEATURE_PREFER_APPLETS=n
-CONFIG_STATIC=n
-CONFIG_PIE=n
-CONFIG_NOMMU=n
-CONFIG_BUILD_LIBBUSYBOX=n
-
-# Switch off archaic, dead, and _also_ problematic code.
-
-CONFIG_FEATURE_MTAB_SUPPORT=n
-CONFIG_FEATURE_DEVFS=n
-CONFIG_DEVFSD=n
-
-# Switch off debug stuff
-
-CONFIG_DEBUG=n
-CONFIG_WERROR=n
-CONFIG_INSTALL_NO_USR=n
-CONFIG_DEBUG_TFTP=n
-CONFIG_FEATURE_UDHCP_DEBUG=n
-
-# This doesn't build on some non-x86 targets (such as m68k).
-
-CONFIG_TASKSET=n
-
-# This doesn't build under Knoppix 5
-
-CONFIG_INOTIFYD=n
-
-# This doesn't even build for i686 on Ubuntu 8.04.
-CONFIG_FLASHCP=n
-CONFIG_FLASH_LOCK=n
-CONFIG_FLASH_UNLOCK=n
-CONFIG_FLASH_ERASEALL=n
-
-# Features to keep an eye on
-
-# CONFIG_FEATURE_INETD_RPC=n
-# CONFIG_FEATURE_IP_RARE_TOOLS=n
-# CONFIG_FEATURE_NAMEIF_EXTENDED=n
-# CONFIG_CLOCK_MONOTONIC_SYSCALL=n
-
-# Contains a hardwired #ifdef staircase of known targets.
-
-CONFIG_FEATURE_OSF_LABEL=n
-
-# Doesn't build on SLES 10
-
-CONFIG_ACPID=n