changeset 1607:59c1495d5b5e

The defconfig busybox build bit-rotted a bit, nail it back in place.
author Rob Landley <rob@landley.net>
date Wed, 03 Jul 2013 22:54:00 -0500
parents 941d2bf65620
children f0c3f8456602
files sources/include.sh sources/sections/toybox.build
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/sources/include.sh	Wed Jul 03 22:51:41 2013 -0500
+++ b/sources/include.sh	Wed Jul 03 22:54:00 2013 -0500
@@ -72,7 +72,8 @@
 if [ -z "$OLDPATH" ]
 then
   export OLDPATH="$PATH"
-  [ -f "$HOSTTOOLS/toybox" ] &&
+  [ -z "$BUSYBOX" ] || BUSYBOX=busybox
+  [ -f "$HOSTTOOLS/${BUSYBOX:-toybox}" ] &&
     PATH="$(hosttools_path)" ||
     PATH="$(hosttools_path):$PATH"
 
--- a/sources/sections/toybox.build	Wed Jul 03 22:51:41 2013 -0500
+++ b/sources/sections/toybox.build	Wed Jul 03 22:54:00 2013 -0500
@@ -16,7 +16,7 @@
 
 if [ ! -z "$BUSYBOX" ]
 then
-  ln -sf toybox "$STAGE_DIR/${ARCH:+sbin/}oneit" || dienow
+  ln -sf {$ARCH:+/usr/bin/}toybox "$STAGE_DIR/${ARCH:+sbin/}oneit" || dienow
 fi
 
 if [ ! -z "$SKIP_STRIP" ]