busybox: invert hide option

Invert the BR2_PACKAGE_BUSYBOX_HIDE_OTHERS option to use positive logic,
renaming it to _SHOW_OTHERS.

Positive logic is simpler to understand, and it makes all{,package}config
do the right thing.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/configs/at91rm9200df_defconfig b/configs/at91rm9200df_defconfig
index 0f584fc95cfed303ed6029002f2fbb55342d9d41..81ebc8ebd4abd985db728f4d5a8afe89ca923d15 100644 (file)
--- a/configs/at91rm9200df_defconfig
+++ b/configs/at91rm9200df_defconfig
@@ -343,7 +343,7 @@ BR2_BUSYBOX_VERSION_1_13_X=y
 BR2_BUSYBOX_VERSION="1.13.2"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
-BR2_PACKAGE_BUSYBOX_HIDE_OTHERS=y
+# BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
 # BR2_PACKAGE_BUSYBOX_SKELETON is not set
 
 #

diff --git a/configs/at91rm9200df_ext_defconfig b/configs/at91rm9200df_ext_defconfig
index 33174ae0e977990c1aca13fb70613dc2468de6d2..078956f15f67c9c4d8f1b14184cbfa9449e605de 100644 (file)
--- a/configs/at91rm9200df_ext_defconfig
+++ b/configs/at91rm9200df_ext_defconfig
@@ -268,7 +268,7 @@ BR2_BUSYBOX_VERSION_1_13_X=y
 BR2_BUSYBOX_VERSION="1.13.2"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
-BR2_PACKAGE_BUSYBOX_HIDE_OTHERS=y
+# BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
 # BR2_PACKAGE_BUSYBOX_SKELETON is not set
 
 #

diff --git a/configs/at91sam9260dfc_defconfig b/configs/at91sam9260dfc_defconfig
index 1d7e10f529c52d49060a13dae8d22d615d6a1bfe..4eb59fe3dc3af01e19c4011103c6407139218af5 100644 (file)
--- a/configs/at91sam9260dfc_defconfig
+++ b/configs/at91sam9260dfc_defconfig
@@ -355,7 +355,7 @@ BR2_BUSYBOX_VERSION_1_13_X=y
 BR2_BUSYBOX_VERSION="1.13.2"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
-BR2_PACKAGE_BUSYBOX_HIDE_OTHERS=y
+# BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
 # BR2_PACKAGE_BUSYBOX_SKELETON is not set
 
 #

diff --git a/configs/at91sam9260dfc_ext_defconfig b/configs/at91sam9260dfc_ext_defconfig
index 4579b4602e565f0145511c4219b0cac2c02ce1dd..6d1a28167da02da428e27e7475a90cec6ab98f99 100644 (file)
--- a/configs/at91sam9260dfc_ext_defconfig
+++ b/configs/at91sam9260dfc_ext_defconfig
@@ -276,7 +276,7 @@ BR2_BUSYBOX_VERSION_1_13_X=y
 BR2_BUSYBOX_VERSION="1.13.2"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
-BR2_PACKAGE_BUSYBOX_HIDE_OTHERS=y
+# BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
 # BR2_PACKAGE_BUSYBOX_SKELETON is not set
 
 #

diff --git a/configs/at91sam9260pf_defconfig b/configs/at91sam9260pf_defconfig
index d9fadb7a16ea90be2011d3ca1c9f37a8662b81e8..3cf632405dae5b5fb4dad629d93f4443bdc28a3a 100644 (file)
--- a/configs/at91sam9260pf_defconfig
+++ b/configs/at91sam9260pf_defconfig
@@ -241,7 +241,7 @@ BR2_BUSYBOX_VERSION_1_13_X=y
 BR2_BUSYBOX_VERSION="1.13.4"
 BR2_PACKAGE_BUSYBOX_INSTALL_SYMLINKS=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
-# BR2_PACKAGE_BUSYBOX_HIDE_OTHERS is not set
+BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
 # BR2_PACKAGE_BUSYBOX_SKELETON is not set
 
 #

diff --git a/configs/at91sam9261ek_defconfig b/configs/at91sam9261ek_defconfig
index ef1e44de81630e1c8d405d675150d2983023dc3c..eb0732fcee2166bb219e0cfafd931c65b4975707 100644 (file)
--- a/configs/at91sam9261ek_defconfig
+++ b/configs/at91sam9261ek_defconfig
@@ -349,7 +349,7 @@ BR2_BUSYBOX_VERSION_1_13_X=y
 BR2_BUSYBOX_VERSION="1.13.2"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
-BR2_PACKAGE_BUSYBOX_HIDE_OTHERS=y
+# BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
 # BR2_PACKAGE_BUSYBOX_SKELETON is not set
 
 #

diff --git a/configs/at91sam9261ek_ext_defconfig b/configs/at91sam9261ek_ext_defconfig
index 1bd143cd10a9dfa880003492a130b59871d2ef28..6cdd8e9e5e67e77c6cf36ccab6613e5d4c49f428 100644 (file)
--- a/configs/at91sam9261ek_ext_defconfig
+++ b/configs/at91sam9261ek_ext_defconfig
@@ -307,7 +307,7 @@ BR2_BUSYBOX_VERSION_1_13_X=y
 BR2_BUSYBOX_VERSION="1.13.2"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
-BR2_PACKAGE_BUSYBOX_HIDE_OTHERS=y
+# BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
 # BR2_PACKAGE_BUSYBOX_SKELETON is not set
 
 #

diff --git a/configs/at91sam9263ek_defconfig b/configs/at91sam9263ek_defconfig
index 7ea6a992da576c635348db14ee49ec18892a661b..62a2698fc78f58e79b3bf1eee854d9a7b6ad6b3c 100644 (file)
--- a/configs/at91sam9263ek_defconfig
+++ b/configs/at91sam9263ek_defconfig
@@ -348,7 +348,7 @@ BR2_BUSYBOX_VERSION_1_13_X=y
 BR2_BUSYBOX_VERSION="1.13.2"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
-BR2_PACKAGE_BUSYBOX_HIDE_OTHERS=y
+# BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
 # BR2_PACKAGE_BUSYBOX_SKELETON is not set
 
 #

diff --git a/configs/at91sam9263ek_ext_defconfig b/configs/at91sam9263ek_ext_defconfig
index 3fd7a36edde8f6f10e194e0fac3ccc4c55f2f23e..99cf3c5157c799432a954039b60c178e86eb0324 100644 (file)
--- a/configs/at91sam9263ek_ext_defconfig
+++ b/configs/at91sam9263ek_ext_defconfig
@@ -269,7 +269,7 @@ BR2_BUSYBOX_VERSION_1_13_X=y
 BR2_BUSYBOX_VERSION="1.13.2"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
-BR2_PACKAGE_BUSYBOX_HIDE_OTHERS=y
+# BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
 # BR2_PACKAGE_BUSYBOX_SKELETON is not set
 
 #

diff --git a/configs/at91sam9g20dfc_defconfig b/configs/at91sam9g20dfc_defconfig
index 30a2e4c518cad921ef7f4490d7e824ab523f51bd..51e2b834d4ad5064b0e7738b173b4f681312ae51 100644 (file)
--- a/configs/at91sam9g20dfc_defconfig
+++ b/configs/at91sam9g20dfc_defconfig
@@ -348,7 +348,7 @@ BR2_BUSYBOX_VERSION_1_13_X=y
 BR2_BUSYBOX_VERSION="1.13.2"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
-BR2_PACKAGE_BUSYBOX_HIDE_OTHERS=y
+# BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
 # BR2_PACKAGE_BUSYBOX_SKELETON is not set
 
 #

diff --git a/configs/at91sam9g20dfc_ext_defconfig b/configs/at91sam9g20dfc_ext_defconfig
index 19ab32489f227602f8927e686c7db62f97e4c385..d67416003580749c3916388874d6694b37f3605c 100644 (file)
--- a/configs/at91sam9g20dfc_ext_defconfig
+++ b/configs/at91sam9g20dfc_ext_defconfig
@@ -276,7 +276,7 @@ BR2_BUSYBOX_VERSION_1_13_X=y
 BR2_BUSYBOX_VERSION="1.13.2"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
-BR2_PACKAGE_BUSYBOX_HIDE_OTHERS=y
+# BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
 # BR2_PACKAGE_BUSYBOX_SKELETON is not set
 
 #

diff --git a/configs/atngw100-base_defconfig b/configs/atngw100-base_defconfig
index 0e0b78dca7b0e405a355cd560f1be1ef9f25f328..b6337ff5139520f8c752360d2bb552ad74f74518 100644 (file)
--- a/configs/atngw100-base_defconfig
+++ b/configs/atngw100-base_defconfig
@@ -277,7 +277,7 @@ BR2_BUSYBOX_VERSION_1_14_X=y
 BR2_BUSYBOX_VERSION="1.14.0"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
-BR2_PACKAGE_BUSYBOX_HIDE_OTHERS=y
+# BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
 BR2_PACKAGE_BUSYBOX_SKELETON=y
 
 #

diff --git a/configs/atngw100_defconfig b/configs/atngw100_defconfig
index ba30c1328234f8642ca297307c5cae0e5badbca2..952028d109a61b9bbe1c206ac44014b9c1d36416 100644 (file)
--- a/configs/atngw100_defconfig
+++ b/configs/atngw100_defconfig
@@ -288,7 +288,7 @@ BR2_BUSYBOX_VERSION_1_14_X=y
 BR2_BUSYBOX_VERSION="1.14.0"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
-BR2_PACKAGE_BUSYBOX_HIDE_OTHERS=y
+# BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
 BR2_PACKAGE_BUSYBOX_SKELETON=y
 
 #

diff --git a/configs/atstk1005_defconfig b/configs/atstk1005_defconfig
index 99b740a81cbb6420a7cc8450efb3cfe2f2615bb9..55e23f6972beef025c0a3e15e5de4f8009246c8b 100644 (file)
--- a/configs/atstk1005_defconfig
+++ b/configs/atstk1005_defconfig
@@ -296,7 +296,7 @@ BR2_BUSYBOX_VERSION_1_13_X=y
 BR2_BUSYBOX_VERSION="1.13.4"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
-BR2_PACKAGE_BUSYBOX_HIDE_OTHERS=y
+# BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
 BR2_PACKAGE_BUSYBOX_SKELETON=y
 
 #

diff --git a/configs/atstk100x_defconfig b/configs/atstk100x_defconfig
index 32de940e4d44b2920895861e01b792bacf870bfa..4a47d0df652852a9ac4210c0028b8a13cde5ba8a 100644 (file)
--- a/configs/atstk100x_defconfig
+++ b/configs/atstk100x_defconfig
@@ -289,7 +289,7 @@ BR2_BUSYBOX_VERSION_1_14_X=y
 BR2_BUSYBOX_VERSION="1.14.0"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="target/device/Atmel/atstk100x/busybox-1.9.1.config"
-# BR2_PACKAGE_BUSYBOX_HIDE_OTHERS is not set
+BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
 BR2_PACKAGE_BUSYBOX_SKELETON=y
 
 #

diff --git a/configs/i386_defconfig b/configs/i386_defconfig
index 2df16efdfb5abcba64665676adf4a317cb18ddd0..afc10752ca179b402489caa95ba6f3817333e163 100644 (file)
--- a/configs/i386_defconfig
+++ b/configs/i386_defconfig
@@ -276,7 +276,7 @@ BR2_BUSYBOX_VERSION_1_14_X=y
 BR2_BUSYBOX_VERSION="1.14.0"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
-BR2_PACKAGE_BUSYBOX_HIDE_OTHERS=y
+# BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
 # BR2_PACKAGE_BUSYBOX_SKELETON is not set
 
 #

diff --git a/configs/i686_defconfig b/configs/i686_defconfig
index af0cc158fdad9658bd27d3146203c00c86fd4adb..1e1da2172ace0dc3d1aab0b7e053de327d0cfff4 100644 (file)
--- a/configs/i686_defconfig
+++ b/configs/i686_defconfig
@@ -276,7 +276,7 @@ BR2_BUSYBOX_VERSION_1_14_X=y
 BR2_BUSYBOX_VERSION="1.14.0"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
-BR2_PACKAGE_BUSYBOX_HIDE_OTHERS=y
+# BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
 # BR2_PACKAGE_BUSYBOX_SKELETON is not set
 
 #

diff --git a/configs/integrator926_defconfig b/configs/integrator926_defconfig
index 9531f1cd1bd17e1ba9a520565928c0a1bd7cfbf7..a53d8c3324de07beac56a20312e3a62220382d12 100644 (file)
--- a/configs/integrator926_defconfig
+++ b/configs/integrator926_defconfig
@@ -273,7 +273,7 @@ BR2_BUSYBOX_VERSION_1_13_X=y
 BR2_BUSYBOX_VERSION="1.13.4"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
-BR2_PACKAGE_BUSYBOX_HIDE_OTHERS=y
+# BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
 BR2_PACKAGE_BUSYBOX_SKELETON=y
 
 #

diff --git a/configs/integrator926_huge_defconfig b/configs/integrator926_huge_defconfig
index 805ac0f0be317f1ab0758c97de0b0852a4870acc..b379e9fe3d9a30e18407f6087f10d9da131462d8 100644 (file)
--- a/configs/integrator926_huge_defconfig
+++ b/configs/integrator926_huge_defconfig
@@ -274,7 +274,7 @@ BR2_BUSYBOX_VERSION_1_13_X=y
 BR2_BUSYBOX_VERSION="1.13.4"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
-BR2_PACKAGE_BUSYBOX_HIDE_OTHERS=y
+# BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
 BR2_PACKAGE_BUSYBOX_SKELETON=y
 
 #

diff --git a/configs/kb9202_defconfig b/configs/kb9202_defconfig
index ce50f2c2ae22aa1ec61dffb73463ff580b506ed7..b8ca087cf983600577980782d171e7869319d516 100644 (file)
--- a/configs/kb9202_defconfig
+++ b/configs/kb9202_defconfig
@@ -268,7 +268,7 @@ BR2_BUSYBOX_VERSION_1_13_X=y
 BR2_BUSYBOX_VERSION="1.13.4"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
-# BR2_PACKAGE_BUSYBOX_HIDE_OTHERS is not set
+BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
 # BR2_PACKAGE_BUSYBOX_SKELETON is not set
 
 #

diff --git a/configs/v100sc2_defconfig b/configs/v100sc2_defconfig
index 799931b29a3c0418b59a098dea04a1d3b2120a07..61e4c8ad88ef98b7fc1327252ba10ef8905030be 100644 (file)
--- a/configs/v100sc2_defconfig
+++ b/configs/v100sc2_defconfig
@@ -258,7 +258,7 @@ BR2_BUSYBOX_VERSION_1_12_X=y
 BR2_BUSYBOX_VERSION="1.12.1"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="target/device/valka/v100sc2/busybox.config"
-# BR2_PACKAGE_BUSYBOX_HIDE_OTHERS is not set
+BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
 BR2_PACKAGE_BUSYBOX_SKELETON=y
 
 #

diff --git a/docs/buildroot.html b/docs/buildroot.html
index 2fc752812a20779400cb8b8b3415a783533d098c..e61e05fe71ee0e27c06261a6a3c8abad64ffdc64 100644 (file)
--- a/docs/buildroot.html
+++ b/docs/buildroot.html
@@ -794,9 +794,7 @@ config BR2_PACKAGE_FOO
     <em>sorted alphabetically</em> per category and are <em>NOT</em>
     supposed to contain anything but the <em>bare</em> name of the package.</p>
 <pre>
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
 source "package/procps/Config.in"
-endif
 </pre>
    <p><strong>Note:</strong><br>
    Generally all packages should live <em>directly</em> in the

diff --git a/package/Config.in b/package/Config.in
index c78fd31912493d8404a0269f47b56748681f3c11..ff7fc3d318436405ca834da386896f547eb2c404 100644 (file)
--- a/package/Config.in
+++ b/package/Config.in
@@ -4,7 +4,7 @@ source "package/busybox/Config.in"
 
 comment "The minimum needed to build a uClibc development system"
 
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/bash/Config.in"
 source "package/bzip2/Config.in"
 source "package/coreutils/Config.in"
@@ -12,15 +12,15 @@ source "package/diffutils/Config.in"
 source "package/findutils/Config.in"
 endif
 source "package/flex/Config.in"
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/gawk/Config.in"
 endif
 source "toolchain/gcc/Config.in.2"
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/grep/Config.in"
 endif
 source "package/make/Config.in"
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/patch/Config.in"
 source "package/sed/Config.in"
 source "package/tar/Config.in"
@@ -52,12 +52,12 @@ source "package/at/Config.in"
 source "package/beecrypt/Config.in"
 source "package/berkeleydb/Config.in"
 source "package/bsdiff/Config.in"
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/bootutils/Config.in"
 endif
 source "package/cups/Config.in"
 source "package/customize/Config.in"
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/dash/Config.in"
 endif
 source "package/enchant/Config.in"
@@ -65,7 +65,7 @@ source "package/file/Config.in"
 source "package/gamin/Config.in"
 source "package/icu/Config.in"
 source "package/kexec/Config.in"
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/less/Config.in"
 endif
 source "package/libconfig/Config.in"
@@ -87,16 +87,16 @@ source "package/lsof/Config.in"
 source "package/ltp-testsuite/Config.in"
 source "package/ltrace/Config.in"
 source "package/memstat/Config.in"
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/module-init-tools/Config.in"
 source "package/modutils/Config.in"
 endif
 source "package/ng-spice-rework/Config.in"
 source "package/popt/Config.in"
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/procps/Config.in"
 endif
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/psmisc/Config.in"
 endif
 source "package/screen/Config.in"
@@ -104,7 +104,7 @@ source "package/shared-mime-info/Config.in"
 source "package/startup-notification/Config.in"
 source "package/strace/Config.in"
 source "package/sudo/Config.in"
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/sysklogd/Config.in"
 # busybox has init and the runit stuff
 source "package/sysvinit/Config.in"
@@ -114,7 +114,7 @@ endif
 
 source "package/database/Config.in"
 
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 # busybox has an editor
 
 # text editors
@@ -128,14 +128,14 @@ comment "Networking applications"
 source "package/argus/Config.in"
 source "package/avahi/Config.in"
 source "package/axel/Config.in"
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/boa/Config.in"
 endif
 source "package/bind/Config.in"
 source "package/bmon/Config.in"
 source "package/bridge-utils/Config.in"
 source "package/ctorrent/Config.in"
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/dhcp/Config.in"
 endif
 source "package/dnsmasq/Config.in"
@@ -163,12 +163,12 @@ source "package/libosip2/Config.in"
 source "package/libpcap/Config.in"
 source "package/libsoup/Config.in"
 source "package/libupnp/Config.in"
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/lighttpd/Config.in"
 endif
 source "package/links/Config.in"
 source "package/lrzsz/Config.in"
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/microcom/Config.in"
 endif
 source "package/mii-diag/Config.in"
@@ -177,7 +177,7 @@ source "package/mutt/Config.in"
 source "package/nbd/Config.in"
 source "package/ncftp/Config.in"
 source "package/neon/Config.in"
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/netcat/Config.in"
 source "package/netkitbase/Config.in"
 source "package/netkittelnet/Config.in"
@@ -206,7 +206,7 @@ source "package/socat/Config.in"
 source "package/spawn-fcgi/Config.in"
 source "package/stunnel/Config.in"
 source "package/tcpdump/Config.in"
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/tftpd/Config.in"
 source "package/thttpd/Config.in"
 source "package/tinyhttpd/Config.in"
@@ -218,7 +218,7 @@ source "package/vpnc/Config.in"
 source "package/vsftpd/Config.in"
 source "package/vtun/Config.in"
 source "package/webif/Config.in"
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/wget/Config.in"
 endif
 source "package/wireless-tools/Config.in"
@@ -231,7 +231,7 @@ source "package/acpid/Config.in"
 source "package/dbus/Config.in"
 source "package/dbus-glib/Config.in"
 source "package/dbus-python/Config.in"
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/devmem2/Config.in"
 endif
 source "package/dmraid/Config.in"
@@ -244,7 +244,7 @@ source "package/fuse/Config.in"
 source "package/gadgetfs-test/Config.in"
 source "package/gvfs/Config.in"
 source "package/hal/Config.in"
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/hdparm/Config.in"
 source "package/hotplug/Config.in"
 endif
@@ -265,12 +265,12 @@ source "package/ntfsprogs/Config.in"
 source "package/pciutils/Config.in"
 source "package/pcmcia/Config.in"
 source "package/setserial/Config.in"
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 # busybox has fdisk
 source "package/sfdisk/Config.in"
 endif
 source "package/smartmontools/Config.in"
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 # mdev
 source "package/udev/Config.in"
 endif
@@ -377,7 +377,7 @@ endmenu
 
 menu "Compressors / decompressors"
 
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/gzip/Config.in"
 endif
 source "package/libarchive/Config.in"
@@ -391,7 +391,7 @@ menu "Package managers"
 
 source "package/ipkg/Config.in"
 source "package/portage/Config.in"
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/rpm/Config.in"
 endif
 endmenu

diff --git a/package/busybox/Config.in b/package/busybox/Config.in
index 4961a8d518a5464120ba3e16ec01d85c5ac9aefa..ca7264f52e65fa5d6fe96c304b4861f6c645bdba 100644 (file)
--- a/package/busybox/Config.in
+++ b/package/busybox/Config.in
@@ -70,12 +70,11 @@ config BR2_PACKAGE_BUSYBOX_CONFIG
 
          Most people will just use the default BusyBox configuration file.
 
-config BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
-       bool "Hide applications that are provided by busybox"
+config BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
+       bool "Show packages that are also provided by busybox"
        depends on BR2_PACKAGE_BUSYBOX
-       default y
        help
-         Do not show packages in menuconfig that are potentially provided
+         Show packages in menuconfig that are potentially also provided
          by busybox.
 
 config BR2_PACKAGE_BUSYBOX_SKELETON

diff --git a/target/xtensa/defconfig b/target/xtensa/defconfig
index 4127f530871544c4c8a8d3fed8350e762ba07428..f7a5741732509a939838165775e831ada490e064 100644 (file)
--- a/target/xtensa/defconfig
+++ b/target/xtensa/defconfig
@@ -90,7 +90,7 @@ BR2_TOOLCHAIN_BUILDROOT=y
 BR2_TOOLCHAIN_SOURCE=y
 
 
-BR2_PACKAGE_BUSYBOX_HIDE_OTHERS=y
+# BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
 
 #
 # Other development stuff