Mercurial > hg > aboriginal
changeset 1507:1261b8fd1ec9
Teach busybox.build to switch off toybox-supplied functionality when TOYBOX=toybox, and move one more config symbol after toybox marker.
author | Rob Landley <rob@landley.net> |
---|---|
date | Fri, 16 Mar 2012 07:00:09 -0500 |
parents | 9c5f0af9bea7 |
children | 9f8fb7a20166 |
files | sources/baseconfig-busybox sources/sections/busybox.build |
diffstat | 2 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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