changeset 1229:313c702a0984

Remove toybox.
author Rob Landley <rob@landley.net>
date Tue, 24 Aug 2010 03:08:47 -0500
parents 8a88cae14011
children 50015325b804
files config download.sh host-tools.sh simple-root-filesystem.sh sources/functions.sh sources/include.sh sources/sections/busybox.build sources/sections/toybox.build
diffstat 8 files changed, 8 insertions(+), 32 deletions(-) [+]
line wrap: on
line diff
--- a/config	Tue Aug 24 02:53:11 2010 -0500
+++ b/config	Tue Aug 24 03:08:47 2010 -0500
@@ -84,7 +84,7 @@
 # Try development versions of these packages.  (Know what you're doing if
 # you select these, it's quite possible the result won't work.)
 
-# export USE_UNSTABLE=uClibc,busybox,toybox,linux,binutils,make,gcc-core,gcc-g++
+# export USE_UNSTABLE=uClibc,busybox,linux,binutils,make,gcc-core,gcc-g++
 
 # Debugging option to leave source in build/temp-$ARCH after build.
 
--- a/download.sh	Tue Aug 24 02:53:11 2010 -0500
+++ b/download.sh	Tue Aug 24 03:08:47 2010 -0500
@@ -75,11 +75,6 @@
 
 # These are optional parts of the native root filesystem.
 
-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
-maybe_fork "download || dienow"
-
 URL=http://cxx.uclibc.org/src/uClibc++-0.2.2.tar.bz2 \
 SHA1=f5582d206378d7daee6f46609c80204c1ad5c0f7 \
 maybe_fork "download || dienow"
--- a/host-tools.sh	Tue Aug 24 02:53:11 2010 -0500
+++ b/host-tools.sh	Tue Aug 24 03:08:47 2010 -0500
@@ -84,7 +84,6 @@
 # thing.
 
 [ ! -f "$STAGE_DIR/busybox" ] && build_section busybox
-[ ! -f "$STAGE_DIR/toybox" ] && build_section toybox
 
 # Create symlinks to the host toolchain.  We need a usable existing host
 # toolchain in order to build anything else (even a new host toolchain),
--- a/simple-root-filesystem.sh	Tue Aug 24 02:53:11 2010 -0500
+++ b/simple-root-filesystem.sh	Tue Aug 24 03:08:47 2010 -0500
@@ -54,7 +54,7 @@
   cp -r "$SIMPLE_ROOT_OVERLAY/." "$STAGE_DIR/" || dienow
 fi
 
-# Build busybox and toybox
+# Build busybox
 
 build_section busybox
 cp "$WORK"/config-busybox "$STAGE_DIR"/src || dienow
--- a/sources/functions.sh	Tue Aug 24 02:53:11 2010 -0500
+++ b/sources/functions.sh	Tue Aug 24 03:08:47 2010 -0500
@@ -538,7 +538,6 @@
     bash (ftp://ftp.gnu.org/gnu/bash) $(identify_release bash)
 
   Optional packages:
-    Toybox (http://landley.net/code/toybox) $(identify_release toybox)
     distcc (http://distcc.samba.org) $(identify_release distcc)
     uClibc++ (http://cxx.uclibc.org) $(identify_release uClibc++)
 EOF
--- a/sources/include.sh	Tue Aug 24 02:53:11 2010 -0500
+++ b/sources/include.sh	Tue Aug 24 03:08:47 2010 -0500
@@ -75,7 +75,7 @@
   export WRAPPY_LOGPATH="$BUILD/logs/cmdlines.$ARCH_NAME.early"
   OLDPATH="$PATH:$OLDPATH"
   PATH="$WRAPDIR"
-elif [ ! -f "$HOSTTOOLS/busybox" ] || [ ! -f "$HOSTTOOLS/toybox" ]
+elif [ ! -f "$HOSTTOOLS/busybox" ]
 then
   PATH="$PATH:$OLDPATH"
 fi
--- a/sources/sections/busybox.build	Tue Aug 24 02:53:11 2010 -0500
+++ b/sources/sections/busybox.build	Tue Aug 24 03:08:47 2010 -0500
@@ -16,9 +16,10 @@
 
 for i in $(sed 's@.*/@@' busybox.links)
 do
-  # is_in_list can't handle [ and [[ filenames, they're an unterminated regex.
-  [ "$i" != "[" ] && [ "$i" != "[[" ] &&
-  # Still using toybox patch, and busybox mke2fs/tune2fs don't support -j
-  is_in_list $i patch,tune2fs,mke2fs && continue
+  # busybox mke2fs/tune2fs don't support -j
+  if [ "$i" == mke2fs ] || [ "$i" == tune2fs ]
+  then
+    continue
+  fi
   [ ! -f "$INSTDIR/$i" ] && (ln -sf busybox "$INSTDIR/$i" || dienow)
 done
--- a/sources/sections/toybox.build	Tue Aug 24 02:53:11 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-# Build toybox
-
-yes "" | make defconfig &&
-CFLAGS="$CFLAGS $STATIC_FLAGS" make $DO_CROSS || dienow
-
-# Install into bin subdirectory if it exists
-
-[ -d "$STAGE_DIR/bin" ] && INSTDIR="$STAGE_DIR/bin" || INSTDIR="$STAGE_DIR"
-
-if [ -z "$USE_TOYBOX" ]
-then
-  ln -sf toybox "$INSTDIR/patch" &&
-  ln -sf toybox "$INSTDIR/netcat" || dienow
-else
-  make install_flat PREFIX="$INSTDIR" || dienow
-fi
-
-mv toybox${SKIP_STRIP:+_unstripped} "$INSTDIR/toybox"