diff options
author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-01-24 18:15:20 +0000 |
---|---|---|
committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-01-24 18:15:20 +0000 |
commit | 9ed6ac2beadbc373b466d54b59292a35e5878298 (patch) | |
tree | df237c7aaaaf2a93ca482eda5d95a8a4607c122f | |
parent | 2aba3953d46b66927506c96571207ffaee941534 (diff) | |
download | busybox-w32-9ed6ac2beadbc373b466d54b59292a35e5878298.tar.gz busybox-w32-9ed6ac2beadbc373b466d54b59292a35e5878298.tar.bz2 busybox-w32-9ed6ac2beadbc373b466d54b59292a35e5878298.zip |
- Turn off combine for allyesconfig and allbareconfig.
The user ought to explicitely request this.
-rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -184,7 +184,7 @@ randconfig: scripts/config/conf | |||
184 | 184 | ||
185 | allyesconfig: scripts/config/conf | 185 | allyesconfig: scripts/config/conf |
186 | @./scripts/config/conf -y $(CONFIG_CONFIG_IN) | 186 | @./scripts/config/conf -y $(CONFIG_CONFIG_IN) |
187 | sed -i -r -e "s/^(CONFIG_DEBUG|USING_CROSS_COMPILER|CONFIG_STATIC|CONFIG_SELINUX|CONFIG_FEATURE_DEVFS).*/# \1 is not set/" .config | 187 | sed -i -r -e "s/^(CONFIG_DEBUG|USING_CROSS_COMPILER|CONFIG_STATIC|CONFIG_SELINUX|CONFIG_FEATURE_DEVFS|BUILD_AT_ONCE).*/# \1 is not set/" .config |
188 | echo "CONFIG_FEATURE_SHARED_BUSYBOX=y" >> .config | 188 | echo "CONFIG_FEATURE_SHARED_BUSYBOX=y" >> .config |
189 | @./scripts/config/conf -o $(CONFIG_CONFIG_IN) | 189 | @./scripts/config/conf -o $(CONFIG_CONFIG_IN) |
190 | 190 | ||
@@ -196,7 +196,7 @@ defconfig: scripts/config/conf | |||
196 | 196 | ||
197 | allbareconfig: scripts/config/conf | 197 | allbareconfig: scripts/config/conf |
198 | @./scripts/config/conf -y $(CONFIG_CONFIG_IN) | 198 | @./scripts/config/conf -y $(CONFIG_CONFIG_IN) |
199 | @sed -i -r -e "s/^(USING_CROSS_COMPILER|CONFIG_(DEBUG|STATIC|SELINUX|DEVFSD|NC_GAPING_SECURITY_HOLE)).*/# \1 is not set/" .config | 199 | @sed -i -r -e "s/^(USING_CROSS_COMPILER|CONFIG_(DEBUG|STATIC|SELINUX|DEVFSD|NC_GAPING_SECURITY_HOLE|BUILD_AT_ONCE)).*/# \1 is not set/" .config |
200 | @sed -i -e "/FEATURE/s/=.*//;/^[^#]/s/.*FEATURE.*/# \0 is not set/;" .config | 200 | @sed -i -e "/FEATURE/s/=.*//;/^[^#]/s/.*FEATURE.*/# \0 is not set/;" .config |
201 | @echo "CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y" >> .config | 201 | @echo "CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y" >> .config |
202 | @./scripts/config/conf -o $(CONFIG_CONFIG_IN) | 202 | @./scripts/config/conf -o $(CONFIG_CONFIG_IN) |