Turn defconfig into what make allyesconfig is today. Turn allyesconfig

back into allyesconfig.  (Memo: apparently SELINUX doesn't compile anymore.)

Make defconfig shouldn't switch on libbusybox.so, but allyesconfig does.


git-svn-id: svn://busybox.net/trunk/busybox@13743 69ca8d6d-28ef-0310-b511-8ec308f3f277

1 files changed, 8 insertions, 2 deletions

diff --git a/Makefile b/Makefile
index 09504e766..d43360d32 100644
--- a/Makefile
+++ b/Makefile
@@ -184,15 +184,21 @@ randconfig: scripts/config/conf
 
 allyesconfig: scripts/config/conf
         @./scripts/config/conf -y $(CONFIG_CONFIG_IN)
-        sed -i -r -e "s/^(USING_CROSS_COMPILER|CONFIG_(DEBUG.*|STATIC|SELINUX|FEATURE_DEVFS|BUILD_AT_ONCE))=.*/# \1 is not set/" .config
+        sed -i -r -e "s/^(USING_CROSS_COMPILER)=.*/# \1 is not set/" .config
         echo "CONFIG_FEATURE_SHARED_BUSYBOX=y" >> .config
         @./scripts/config/conf -o $(CONFIG_CONFIG_IN)
 
 allnoconfig: scripts/config/conf
         @./scripts/config/conf -n $(CONFIG_CONFIG_IN)
 
+#defconfig: scripts/config/conf
+#       @./scripts/config/conf -d $(CONFIG_CONFIG_IN)
+
 defconfig: scripts/config/conf
-        @./scripts/config/conf -d $(CONFIG_CONFIG_IN)
+        @./scripts/config/conf -y $(CONFIG_CONFIG_IN)
+        sed -i -r -e "s/^(USING_CROSS_COMPILER|CONFIG_(DEBUG.*|STATIC|SELINUX|FEATURE_DEVFS|BUILD_AT_ONCE|BUILD_LIBBUSYBOX|FEATURE_FULL_LIBBUSYBOX|FEATURE_SHARED_BUSYBOX))=.*/# \1 is not set/" .config
+        @./scripts/config/conf -o $(CONFIG_CONFIG_IN)
+
 
 allbareconfig: scripts/config/conf
         @./scripts/config/conf -y $(CONFIG_CONFIG_IN)