Mercurial > hg > aboriginal

diff sources/sections/busybox.build @ 1544:e2f722cc97a6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make busybox build by default, switch override knob to BUSYBOX=1 to use defconfig busybox, always use toybox for oneit, cleanup/fix record-commands logic.
author Rob Landley <rob@landley.net>
date Thu, 06 Sep 2012 05:11:25 -0500
parents 1261b8fd1ec9
children d33dcb246984
line wrap: on
line diff
--- a/sources/sections/busybox.build	Thu Sep 06 05:07:23 2012 -0500
+++ b/sources/sections/busybox.build	Thu Sep 06 05:11:25 2012 -0500
@@ -4,19 +4,14 @@
 
 # Build busybox
 
-if [ "$TOYBOX" == busybox_defconfig ]
+if [ ! -z "$BUSYBOX" ]
 then
   make defconfig &&
   # breaks on ubuntu 11.10
   sed -i -e 's/^\(CONFIG_UBI.*\)=y/# \1 is not set/' .config &&
   cp .config "$WORK"/config-busybox || dienow
 else
-  if [ "$TOYBOX" == toybox ]
-  then
-    getconfig busybox | sed '/toybox/q' > "$WORK/config-busybox" || dienow
-  else
-    getconfig busybox > "$WORK/config-busybox" || dienow
-  fi
+  getconfig busybox | sed '/toybox/,$d' > "$WORK/config-busybox" &&
   make allnoconfig KCONFIG_ALLCONFIG="$WORK/config-busybox" || dienow
 fi