# HG changeset patch
# User Rob Landley <rob@landley.net>
# Date 1331899209 18000
# Node ID 1261b8fd1ec9d4f06066b54204dd7e81937420bf
# Parent  9c5f0af9bea71c83caa93ab6bbb076079586a62e
Teach busybox.build to switch off toybox-supplied functionality when TOYBOX=toybox, and move one more config symbol after toybox marker.

diff -r 9c5f0af9bea7 -r 1261b8fd1ec9 sources/baseconfig-busybox
--- a/sources/baseconfig-busybox	Fri Mar 16 06:58:28 2012 -0500
+++ b/sources/baseconfig-busybox	Fri Mar 16 07:00:09 2012 -0500
@@ -45,7 +45,6 @@
 CONFIG_TAIL=y
 CONFIG_TOUCH=y
 CONFIG_TR=y
-CONFIG_UNIQ=y
 CONFIG_WHOAMI=y
 CONFIG_FEATURE_AUTOWIDTH=y
 CONFIG_MKTEMP=y
@@ -188,3 +187,5 @@
 CONFIG_XARGS=y
 CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y
 CONFIG_YES=y
+
+CONFIG_UNIQ=y
diff -r 9c5f0af9bea7 -r 1261b8fd1ec9 sources/sections/busybox.build
--- a/sources/sections/busybox.build	Fri Mar 16 06:58:28 2012 -0500
+++ b/sources/sections/busybox.build	Fri Mar 16 07:00:09 2012 -0500
@@ -11,7 +11,12 @@
   sed -i -e 's/^\(CONFIG_UBI.*\)=y/# \1 is not set/' .config &&
   cp .config "$WORK"/config-busybox || dienow
 else
-  getconfig busybox > "$WORK/config-busybox" &&
+  if [ "$TOYBOX" == toybox ]
+  then
+    getconfig busybox | sed '/toybox/q' > "$WORK/config-busybox" || dienow
+  else
+    getconfig busybox > "$WORK/config-busybox" || dienow
+  fi
   make allnoconfig KCONFIG_ALLCONFIG="$WORK/config-busybox" || dienow
 fi