disable non-essential packages by default if DEVELOPER is unset on make menuconfig

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@675 3c298f89-4303-0410-b956-a3cf2f4a3e73

53 files changed, 111 insertions, 81 deletions

diff --git a/openwrt/package/aiccu/Config.in b/openwrt/package/aiccu/Config.in
index 541aadc36f..fd7955d375 100644
--- a/openwrt/package/aiccu/Config.in
+++ b/openwrt/package/aiccu/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_AICCU
 	select BR2_PACKAGE_KMOD_IPV6
 	tristate "aiccu"
-	default m
+	default m if CONFIG_DEVEL
 	help
 	 SixXS Automatic IPv6 Connectivity Client Utility
 
diff --git a/openwrt/package/arptables/Config.in b/openwrt/package/arptables/Config.in
index cde4d0541b..cd861cce7c 100644
--- a/openwrt/package/arptables/Config.in
+++ b/openwrt/package/arptables/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_ARPTABLES
 	tristate "ARP Firewalling"
-	default m
+	default m if CONFIG_DEVEL
 	help
 		ARP Firewalling (arptables)
 		http://ebtables.sourceforge.net/
diff --git a/openwrt/package/arpwatch/Config.in b/openwrt/package/arpwatch/Config.in
index b2ff795aa4..cd65f38489 100644
--- a/openwrt/package/arpwatch/Config.in
+++ b/openwrt/package/arpwatch/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_ARPWATCH
 	tristate "arpwatch"
-	default m
+	default m if CONFIG_DEVEL
 	help
 	  Ethernet monitor program for keeping track of ethernet/ip address pairings
 	  
diff --git a/openwrt/package/asterisk/Config.in b/openwrt/package/asterisk/Config.in
index 7cf258cc10..21a322cdb0 100644
--- a/openwrt/package/asterisk/Config.in
+++ b/openwrt/package/asterisk/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_ASTERISK
 	tristate "Asterisk"
-	default m
+	default m if CONFIG_DEVEL
 	help
  	  Asterisk is a complete PBX in software. It provides all of the features
 	  you would expect from a PBX and more. Asterisk does voice over IP in three
@@ -9,7 +9,7 @@ config BR2_PACKAGE_ASTERISK
 
 config BR2_PACKAGE_ASTERISK_SPEEX
 	tristate "Speex codec"
-	default m
+	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_ASTERISK
 	select BR2_PACKAGE_SPEEX
 	help
@@ -18,7 +18,7 @@ config BR2_PACKAGE_ASTERISK_SPEEX
 
 config BR2_PACKAGE_ASTERISK_MYSQL
 	tristate "MySQL plugins"
-	default m
+	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_ASTERISK
 	select BR2_PACKAGE_LIBMYSQLCLIENT
 	help
@@ -26,7 +26,7 @@ config BR2_PACKAGE_ASTERISK_MYSQL
 
 config BR2_PACKAGE_ASTERISK_PGSQL
 	tristate "PostgreSQL plugins"
-	default m
+	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_ASTERISK
 	select BR2_PACKAGE_LIBPQ
 	help
@@ -34,14 +34,14 @@ config BR2_PACKAGE_ASTERISK_PGSQL
 	  
 config BR2_PACKAGE_ASTERISK_VOICEMAIL
 	tristate "Voicemail support"
-	default m
+	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_ASTERISK
 	help
 	  Voicemail related plugins for Asterisk
 	  
 config BR2_PACKAGE_ASTERISK_SOUNDS
 	tristate "Sound files"
-	default m
+	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_ASTERISK
 	help
 	  Sound files for Asterisk
diff --git a/openwrt/package/bwm/Config.in b/openwrt/package/bwm/Config.in
index 3a04ffd935..3a2a8bfee6 100644
--- a/openwrt/package/bwm/Config.in
+++ b/openwrt/package/bwm/Config.in
@@ -1,5 +1,5 @@
 config BR2_PACKAGE_BWM
 	tristate "bwm"
-	default m
+	default m if CONFIG_DEVEL
 	help
 	  A very tiny bandwidth monitor.
diff --git a/openwrt/package/chillispot/Config.in b/openwrt/package/chillispot/Config.in
index 217ece8c11..a8298fc3d0 100644
--- a/openwrt/package/chillispot/Config.in
+++ b/openwrt/package/chillispot/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_CHILLISPOT
 	tristate "chillispot"
-	default m
+	default m if CONFIG_DEVEL
 	help
 	  ChilliSpot is an open source captive portal or wireless LAN
 	  access point controller. It is used for authenticating users
diff --git a/openwrt/package/cifsmount/Config.in b/openwrt/package/cifsmount/Config.in
index 35d91abc3a..751c24c842 100644
--- a/openwrt/package/cifsmount/Config.in
+++ b/openwrt/package/cifsmount/Config.in
@@ -1,5 +1,5 @@
 config BR2_PACKAGE_CIFSMOUNT
 	tristate "mount.cifs"
-	default m
+	default m if CONFIG_DEVEL
 	help
 	  user space helper for mounting remote CIFS shares
diff --git a/openwrt/package/cups/Config.in b/openwrt/package/cups/Config.in
index 9adfb372df..41c3478248 100644
--- a/openwrt/package/cups/Config.in
+++ b/openwrt/package/cups/Config.in
@@ -1,5 +1,5 @@
 config BR2_PACKAGE_CUPS
 	tristate "Common UNIX Printing System"
-	default m
+	default m if CONFIG_DEVEL
 	help
 	  A printer spooling system for devices with USB or LP support
diff --git a/openwrt/package/dhcp-forwarder/Config.in b/openwrt/package/dhcp-forwarder/Config.in
index 28992fbb0c..8fa396d030 100644
--- a/openwrt/package/dhcp-forwarder/Config.in
+++ b/openwrt/package/dhcp-forwarder/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_DHCPFWD
 	tristate "dhcp-forwarder (a DHCP relay agent)"
-	default n
+	default m if CONFIG_DEVEL
 	help
 	  A DHCP relay agent
 	  
diff --git a/openwrt/package/ebtables/Config.in b/openwrt/package/ebtables/Config.in
index 2e6b8257cc..d631c1bfd8 100644
--- a/openwrt/package/ebtables/Config.in
+++ b/openwrt/package/ebtables/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_EBTABLES
 	tristate "Ethernet Bridge Firewalling"
-	default m
+	default m if CONFIG_DEVEL
 	help
 		Ethernet Bridge Firewalling (ebtables)
 		http://ebtables.sourceforge.net/
diff --git a/openwrt/package/ez-ipupdate/Config.in b/openwrt/package/ez-ipupdate/Config.in
index 97d6ade40a..87f5b98930 100644
--- a/openwrt/package/ez-ipupdate/Config.in
+++ b/openwrt/package/ez-ipupdate/Config.in
@@ -1,5 +1,5 @@
 config BR2_PACKAGE_EZIPUPDATE
 	tristate "ez-ipupdate"
-	default m
+	default m if CONFIG_DEVEL
 	help
 	  A client for many Dynamic DNS services
diff --git a/openwrt/package/fping/Config.in b/openwrt/package/fping/Config.in
index 40e5e3ca3e..da09f10353 100644
--- a/openwrt/package/fping/Config.in
+++ b/openwrt/package/fping/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_FPING
 	tristate "fping"
-	default m
+	default m if CONFIG_DEVEL
 	help
 	  fping is a ping(1) like program which uses the Internet Control Message Protocol
 	  (ICMP) echo request to determine if a host is up. fping is different from ping in
diff --git a/openwrt/package/fuse/Config.in b/openwrt/package/fuse/Config.in
index ab56c2c3ba..ab22e28671 100644
--- a/openwrt/package/fuse/Config.in
+++ b/openwrt/package/fuse/Config.in
@@ -1,7 +1,13 @@
 config BR2_PACKAGE_FUSE
 	select BR2_PACKAGE_LIBPTHREAD
-	bool "fuse (Filesystem in USErspace)"
+	depends BR2_PACKAGE_KMOD_FUSE
+	bool
 	default n
+
+config BR2_PACKAGE_KMOD_FUSE
+	select BR2_PACKAGE_FUSE
+	tristate "kmod-fuse (FUSE kernel module)"
+	default m
 	help
 	  With FUSE it is possible to implement a fully functional 
 	  filesystem in a userspace program.
@@ -20,20 +26,50 @@ config BR2_PACKAGE_FUSE
 	  http://fuse.sourceforge.net/
 	  
 	  Depends: libpthread
-	  
-
-config BR2_PACKAGE_KMOD_FUSE
-	depends BR2_PACKAGE_FUSE
-	tristate "kmod-fuse (FUSE kernel module)"
-	default m
 
 config BR2_PACKAGE_LIBFUSE
-	depends BR2_PACKAGE_FUSE
+	depends BR2_PACKAGE_KMOD_FUSE
 	tristate "libfuse (FUSE library)"
 	default m
+	help
+	  With FUSE it is possible to implement a fully functional 
+	  filesystem in a userspace program.
+	  
+	  Features include:
+	  
+	   * Simple library API
+	   * Simple installation (no need to patch or recompile the kernel)
+	   * Secure implementation
+	   * Userspace - kernel interface is very efficient
+	   * Usable by non privileged users
+	   * Runs on Linux kernels 2.4.X and 2.6.X
+	   * Has proven very stable over time
+	  
+	  
+	  http://fuse.sourceforge.net/
+	  
+	  Depends: libpthread
 
 config BR2_PACKAGE_FUSE_UTILS
-	depends BR2_PACKAGE_FUSE
+	depends BR2_PACKAGE_LIBFUSE
 	tristate "fuse-utils (FUSE utilities)"
 	default m
+	help
+	  With FUSE it is possible to implement a fully functional 
+	  filesystem in a userspace program.
+	  
+	  Features include:
+	  
+	   * Simple library API
+	   * Simple installation (no need to patch or recompile the kernel)
+	   * Secure implementation
+	   * Userspace - kernel interface is very efficient
+	   * Usable by non privileged users
+	   * Runs on Linux kernels 2.4.X and 2.6.X
+	   * Has proven very stable over time
+	  
+	  
+	  http://fuse.sourceforge.net/
+	  
+	  Depends: libpthread
 
diff --git a/openwrt/package/glib/Config.in b/openwrt/package/glib/Config.in
index 679b200ee4..6fa3c673e7 100644
--- a/openwrt/package/glib/Config.in
+++ b/openwrt/package/glib/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_GLIB
 	select BR2_PACKAGE_LIBPTHREAD
 	tristate "glib 1.2"
-	default m
+	default m if CONFIG_DEVEL
 	help
 	  GLib is a library containing many useful C routines for things such
 	  as trees, hashes, and lists.
diff --git a/openwrt/package/gmp/Config.in b/openwrt/package/gmp/Config.in
index c70af8e3c7..132697dffc 100644
--- a/openwrt/package/gmp/Config.in
+++ b/openwrt/package/gmp/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_GMP
 	tristate "libgmp"
-	default m
+	default m if CONFIG_DEVEL
 	help
 	  libgmp
 	  
diff --git a/openwrt/package/haserl/Config.in b/openwrt/package/haserl/Config.in
index 86663d2bd8..12891b8567 100644
--- a/openwrt/package/haserl/Config.in
+++ b/openwrt/package/haserl/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_HASERL
 	tristate "haserl"
-	default m
+	default m if CONFIG_DEVEL
 	help
 	  A CGI wrapper to embed shell scripts in HTML documents.
 	  
diff --git a/openwrt/package/iproute2/Config.in b/openwrt/package/iproute2/Config.in
index 8ffe739510..b123f5ca6b 100644
--- a/openwrt/package/iproute2/Config.in
+++ b/openwrt/package/iproute2/Config.in
@@ -5,12 +5,12 @@ config BR2_PACKAGE_IPROUTE2
 
 config BR2_PACKAGE_IPROUTE2_IP
 	tristate "iproute2 routing control (ip)"
-	default m
+	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_IPROUTE2
 
 config BR2_PACKAGE_IPROUTE2_TC
 	tristate "iproute2 traffic control (tc)"
-	default m
+	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_IPROUTE2
 	select BR2_PACKAGE_KMOD_SCHED
 
diff --git a/openwrt/package/iptables/Config.in b/openwrt/package/iptables/Config.in
index 5e1cd60c03..0ee2541e9a 100644
--- a/openwrt/package/iptables/Config.in
+++ b/openwrt/package/iptables/Config.in
@@ -8,21 +8,21 @@ config BR2_PACKAGE_IPTABLES
 
 config BR2_PACKAGE_IPTABLES_UTILS
 	tristate "save and restore"
-	default m
+	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_IPTABLES
 	help
 	  iptables-save and iptables-restore
 
 config BR2_PACKAGE_IPTABLES_EXTRA
 	tristate "extra modules"
-	default m
+	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_IPTABLES
 	help
 	  Extra modules for iptables (kernel and user space)
 
 config BR2_PACKAGE_IP6TABLES
 	tristate "ip6tables"
-	default m
+	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_IPTABLES
 	select BR2_PACKAGE_KMOD_IPV6
 	help
diff --git a/openwrt/package/lcd4linux/Config.in b/openwrt/package/lcd4linux/Config.in
index 797e4947f7..b770101070 100644
--- a/openwrt/package/lcd4linux/Config.in
+++ b/openwrt/package/lcd4linux/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_LCD4LINUX
 	tristate "lcd4linux"
 	select BR2_PACKAGE_NCURSES
-	default m
+	default m if CONFIG_DEVEL
 	help
 		LCD4Linux
 		https://ssl.bulix.org/projects/lcd4linux/wiki/Howto
diff --git a/openwrt/package/libelf/Config.in b/openwrt/package/libelf/Config.in
index 8115491bec..6013c37da2 100644
--- a/openwrt/package/libelf/Config.in
+++ b/openwrt/package/libelf/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_LIBELF
 	tristate "libelf"
-	default m
+	default m if CONFIG_DEVEL
 	help
 	  This is the public release of libelf-0.8.5, a free ELF object
 	  file access library.
diff --git a/openwrt/package/libgcc/Config.in b/openwrt/package/libgcc/Config.in
index 727cf1081d..074b8a3117 100644
--- a/openwrt/package/libgcc/Config.in
+++ b/openwrt/package/libgcc/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_LIBGCC
 	tristate "libgcc (GCC support library)"
-	default m
+	default m if CONFIG_DEVEL
 	help
 	  Shared version of the support library, a library of 
 	  internal subroutines that GCC uses to overcome 
diff --git a/openwrt/package/libnet/Config.in b/openwrt/package/libnet/Config.in
index 8f8b75957d..433e9fbc76 100644
--- a/openwrt/package/libnet/Config.in
+++ b/openwrt/package/libnet/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_LIBNET
 	select BR2_PACKAGE_LIBPCAP
 	tristate "libnet"
-	default m
+	default m if CONFIG_DEVEL
 	help
 	  A low-level packet creation library.
 	  
diff --git a/openwrt/package/libpcap/Config.in b/openwrt/package/libpcap/Config.in
index 0c115212eb..4f97c3ecd8 100644
--- a/openwrt/package/libpcap/Config.in
+++ b/openwrt/package/libpcap/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_LIBPCAP
 	tristate "libpcap (a low-level packet capture library)"
-	default m
+	default m if CONFIG_DEVEL
 	help
 	  A system-independent library for user-level network packet capture.
 
diff --git a/openwrt/package/libpthread/Config.in b/openwrt/package/libpthread/Config.in
index 87d1a5d030..0a0eef2127 100644
--- a/openwrt/package/libpthread/Config.in
+++ b/openwrt/package/libpthread/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_LIBPTHREAD
 	tristate "libpthread (POSIX threads library)"
-	default m
+	default m if CONFIG_DEVEL
 	help
 	  POSIX threads library
 	  
diff --git a/openwrt/package/lzo/Config.in b/openwrt/package/lzo/Config.in
index f8c043a339..d7294558c8 100644
--- a/openwrt/package/lzo/Config.in
+++ b/openwrt/package/lzo/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_LZO
 	tristate "lzo"
-	default m
+	default m if CONFIG_DEVEL
 	help
 	  A library implementing transparent compression/decompression
 	 
diff --git a/openwrt/package/matrixssl/Config.in b/openwrt/package/matrixssl/Config.in
index 85158bfda4..b8faecd412 100644
--- a/openwrt/package/matrixssl/Config.in
+++ b/openwrt/package/matrixssl/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_MATRIXSSL
 	select BR2_PACKAGE_LIBPTHREAD
 	tristate "matrixssl"
-	default m
+	default m if CONFIG_DEVEL
 	help
 	  an embedded SSL implementation
 	  
diff --git a/openwrt/package/microperl/Config.in b/openwrt/package/microperl/Config.in
index a813e1f58f..322cbb9ec7 100644
--- a/openwrt/package/microperl/Config.in
+++ b/openwrt/package/microperl/Config.in
@@ -1,5 +1,5 @@
 config BR2_PACKAGE_MICROPERL
 	tristate "microperl"
-	default m
+	default m if CONFIG_DEVEL
 	help
 	  Perl without operating-specific functions such as readdir.
diff --git a/openwrt/package/mysql/Config.in b/openwrt/package/mysql/Config.in
index fb9357427d..6da055acf4 100644
--- a/openwrt/package/mysql/Config.in
+++ b/openwrt/package/mysql/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_LIBMYSQLCLIENT
 	tristate "libmysqlclient (MySQL client library)"
-	default m
+	default m if CONFIG_DEVEL
 	help
 	  MySQL client library.
 	  
diff --git a/openwrt/package/ncurses/Config.in b/openwrt/package/ncurses/Config.in
index 9d6770cc7a..09b4adcde4 100644
--- a/openwrt/package/ncurses/Config.in
+++ b/openwrt/package/ncurses/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_NCURSES
 	tristate "ncurses"
-	default m
+	default m if CONFIG_DEVEL
 	help
 	  A terminal handling library
 	  
diff --git a/openwrt/package/nfs-server/Config.in b/openwrt/package/nfs-server/Config.in
index d052541a05..9ace94cb1a 100644
--- a/openwrt/package/nfs-server/Config.in
+++ b/openwrt/package/nfs-server/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_NFSD
 	tristate "NFS Server"
-	default m
+	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_PORTMAP
 	help
 	  User Space NFS Server
diff --git a/openwrt/package/nocatsplash/Config.in b/openwrt/package/nocatsplash/Config.in
index 87954826d2..4f7a6d8e60 100644
--- a/openwrt/package/nocatsplash/Config.in
+++ b/openwrt/package/nocatsplash/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_NOCATSPLASH
 	tristate "NoCatSplash"
-	default m
+	default m if CONFIG_DEVEL
 	help
 	 NoCatSplash is an Open Public Network Gateway Daemon.
 	 It performs as a [captive/open/active] portal. When run on a gateway/router
diff --git a/openwrt/package/ntpclient/Config.in b/openwrt/package/ntpclient/Config.in
index faeab4bc79..772c38df7a 100644
--- a/openwrt/package/ntpclient/Config.in
+++ b/openwrt/package/ntpclient/Config.in
@@ -1,5 +1,5 @@
 config BR2_PACKAGE_NTPCLIENT
 	tristate "ntpclient"
-	default m
+	default m if CONFIG_DEVEL
 	help
 	  NTP client for setting system time from NTP servers.
diff --git a/openwrt/package/openntpd/Config.in b/openwrt/package/openntpd/Config.in
index 06324d320d..d61b56fb35 100644
--- a/openwrt/package/openntpd/Config.in
+++ b/openwrt/package/openntpd/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_OPENNTPD
 	tristate "Openntpd"
-	default m
+	default m if CONFIG_DEVEL
 	help
 	NTP server
 	http://www.openntpd.org
diff --git a/openwrt/package/openssl/Config.in b/openwrt/package/openssl/Config.in
index 8430cff940..2c9f84c482 100644
--- a/openwrt/package/openssl/Config.in
+++ b/openwrt/package/openssl/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_OPENSSL
 	tristate "openssl"
-	default m
+	default m if CONFIG_DEVEL
 	help
 	  A library implementing the SSL and TLS protocols 
 	  
diff --git a/openwrt/package/openswan/Config.in b/openwrt/package/openswan/Config.in
index 56c4c4a619..2c2904b516 100644
--- a/openwrt/package/openswan/Config.in
+++ b/openwrt/package/openswan/Config.in
@@ -1,5 +1,5 @@
 config BR2_PACKAGE_OPENSWAN
 	tristate "Openswan"
-	default m
+	default m if CONFIG_DEVEL
 	help
 	  Openswan is an implementation of IPsec for Linux.
diff --git a/openwrt/package/openvpn/Config.in b/openwrt/package/openvpn/Config.in
index 0c18f6401d..460588178a 100644
--- a/openwrt/package/openvpn/Config.in
+++ b/openwrt/package/openvpn/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_OPENVPN
 	tristate "OpenVPN"
-	default m
+	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_KMOD_TUN
 	select BR2_PACKAGE_LIBPTHREAD
 	select BR2_PACKAGE_OPENSSL
diff --git a/openwrt/package/pcre/Config.in b/openwrt/package/pcre/Config.in
index 370fc763f3..822701bd44 100644
--- a/openwrt/package/pcre/Config.in
+++ b/openwrt/package/pcre/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_PCRE
-	prompt "pcre"
-	tristate
-	default m
+	tristate "pcre"
+	default m if CONFIG_DEVEL
 	help
 	  A Perl Compatible Regular Expression library
 	  
diff --git a/openwrt/package/popt/Config.in b/openwrt/package/popt/Config.in
index 9f61204d5c..8834eb7c37 100644
--- a/openwrt/package/popt/Config.in
+++ b/openwrt/package/popt/Config.in
@@ -1,14 +1,9 @@
 config BR2_PACKAGE_POPT
-	prompt "popt"
-	tristate 
-	default m
+	tristate "popt (a command line option parsing library)"
+	default m if CONFIG_DEVEL
 	help
 	  A command line option parsing library
 	  
 	  ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/
 	  
 
-config BR2_PACKAGE_LIBPOPT
-	tristate
-	default BR2_PACKAGE_POPT
-
diff --git a/openwrt/package/portmap/Config.in b/openwrt/package/portmap/Config.in
index 3427e082c3..41cd484809 100644
--- a/openwrt/package/portmap/Config.in
+++ b/openwrt/package/portmap/Config.in
@@ -1,5 +1,5 @@
 config BR2_PACKAGE_PORTMAP
 	tristate "RPC Portmapper"
-	default m
+	default m if CONFIG_DEVEL
 	help
 	  The RPC Portmapper (used by the NFS Server)
diff --git a/openwrt/package/postgresql/Config.in b/openwrt/package/postgresql/Config.in
index 9fc9e2a1f7..6ff1953109 100644
--- a/openwrt/package/postgresql/Config.in
+++ b/openwrt/package/postgresql/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_LIBPQ
 	tristate "libpq (PostgreSQL client library)"
-	default m
+	default m if CONFIG_DEVEL
 	help
 	  PostgreSQL client library.
 	  
diff --git a/openwrt/package/pptp/Config.in b/openwrt/package/pptp/Config.in
index 40c1ded3d0..8ffeff264f 100644
--- a/openwrt/package/pptp/Config.in
+++ b/openwrt/package/pptp/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_PPTP
 	tristate "PPTP Client"
-	default m
+	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_KMOD_GRE
 	select BR2_PACKAGE_PPP
 	help
diff --git a/openwrt/package/pptpd/Config.in b/openwrt/package/pptpd/Config.in
index e713b18b02..6915029164 100644
--- a/openwrt/package/pptpd/Config.in
+++ b/openwrt/package/pptpd/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_PPTPD
 	tristate "PPTP Server"
-	default m
+	default m if CONFIG_DEVEL
 	select BR2_PACKAGE_KMOD_GRE
 	select BR2_PACKAGE_PPP
 	help
diff --git a/openwrt/package/quagga/Config.in b/openwrt/package/quagga/Config.in
index 073d916120..af3fc16ef0 100644
--- a/openwrt/package/quagga/Config.in
+++ b/openwrt/package/quagga/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_QUAGGA
 	tristate "Quagga"
-	default m
+	default m if CONFIG_DEVEL
 	help
 	routing software package that provides TCP/IP based routing services
         with routing protocols support such as RIPv1, RIPv2, RIPng, OSPFv2, 
@@ -10,28 +10,28 @@ config BR2_PACKAGE_QUAGGA
 
 config BR2_PACKAGE_QUAGGA_ZEBRA
 	tristate "zebra daemon"
-	default m
+	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_QUAGGA
 	help
 	 zebra daemon
 
 config BR2_PACKAGE_QUAGGA_RIPD
 	tristate "ripd daemon"
-	default m
+	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_QUAGGA
 	help
 	 ripd daemon
 
 config BR2_PACKAGE_QUAGGA_BGPD
 	tristate "bgpd daemon"
-	default m
+	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_QUAGGA
 	help
 	 bgpd daemon
 
 config BR2_PACKAGE_QUAGGA_OSPFD
 	tristate "ospfd daemon"
-	default m
+	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_QUAGGA
 	help
 	 ospfd daemon
diff --git a/openwrt/package/radvd/Config.in b/openwrt/package/radvd/Config.in
index adecf1badb..132690fa42 100644
--- a/openwrt/package/radvd/Config.in
+++ b/openwrt/package/radvd/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_RADVD
 	select BR2_PACKAGE_KMOD_IPV6
 	tristate "radvd"
-	default m
+	default m if CONFIG_DEVEL
 	help
 	  Routing Advertisement Daemon for IPv6
diff --git a/openwrt/package/sdk/Config.in b/openwrt/package/sdk/Config.in
index b5c8d92b3e..06eed79faa 100644
--- a/openwrt/package/sdk/Config.in
+++ b/openwrt/package/sdk/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_SDK
 	bool "OpenWrt SDK"
-	default n
+	default y if CONFIG_DEVEL
 	help
 	  Build an OpenWrt SDK.
 	  This is essentially a stripped-down version of the buildroot
diff --git a/openwrt/package/ser/Config.in b/openwrt/package/ser/Config.in
index 371cbcc58d..ede98e5f35 100644
--- a/openwrt/package/ser/Config.in
+++ b/openwrt/package/ser/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_SER
 	tristate "SIP Express Router"
-	default m
+	default m if CONFIG_DEVEL
 	help
 	 SIP Express Router (ser) is a high-performance,
 	 configurable, free SIP server.
diff --git a/openwrt/package/setserial/Config.in b/openwrt/package/setserial/Config.in
index 477896769e..8d87e0aa26 100644
--- a/openwrt/package/setserial/Config.in
+++ b/openwrt/package/setserial/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_SETSERIAL
 	tristate "setserial"
-	default m
+	default m if CONFIG_DEVEL
 	help
 	  setserial  is a program designed to set and/or report the
 	  configuration information associated with a serial port.  This
diff --git a/openwrt/package/shfs/Config.in b/openwrt/package/shfs/Config.in
index a6b50935cc..14b1fa3713 100644
--- a/openwrt/package/shfs/Config.in
+++ b/openwrt/package/shfs/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_SHFS
 	tristate "shfs (SHell FileSystem kernel module and utilities)"
-	default n
+	default m if CONFIG_DEVEL
 	help
 	  ShFS is a simple and easy to use Linux kernel module which 
 	  allows you to mount remote filesystems using a plain shell 
diff --git a/openwrt/package/speex/Config.in b/openwrt/package/speex/Config.in
index 6891a443de..930169a7fa 100644
--- a/openwrt/package/speex/Config.in
+++ b/openwrt/package/speex/Config.in
@@ -1,5 +1,5 @@
 config BR2_PACKAGE_SPEEX
 	tristate "speex"
-	default m
+	default m if CONFIG_DEVEL
 	help
 	  An open source patent-free speech compression codec
diff --git a/openwrt/package/strace/Config.in b/openwrt/package/strace/Config.in
index 9e83e685e1..0fb8aa52f6 100644
--- a/openwrt/package/strace/Config.in
+++ b/openwrt/package/strace/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_STRACE
 	tristate "strace"
-	default m
+	default m if CONFIG_DEVEL
 	help
 	  A useful diagnostic, instructional, and debugging tool.
 	  Allows you to track what system calls a program makes 
diff --git a/openwrt/package/tcpdump/Config.in b/openwrt/package/tcpdump/Config.in
index 798101af67..9648e890ca 100644
--- a/openwrt/package/tcpdump/Config.in
+++ b/openwrt/package/tcpdump/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_TCPDUMP
 	select BR2_PACKAGE_LIBPCAP
 	tristate "tcpdump"
-	default m
+	default m if CONFIG_DEVEL
 	help
 	  A tool for network monitoring and data acquisition.
 
diff --git a/openwrt/package/wol/Config.in b/openwrt/package/wol/Config.in
index c9e0383883..036eee3053 100644
--- a/openwrt/package/wol/Config.in
+++ b/openwrt/package/wol/Config.in
@@ -1,5 +1,5 @@
 config BR2_PACKAGE_WOL
 	tristate "Wake On LAN client"
-	default m
+	default m if CONFIG_DEVEL
 	help
 	  wol implements Wake On LAN functionality in a small program. It wakes up hardware that is Magic Packet compliant.
diff --git a/openwrt/package/zlib/Config.in b/openwrt/package/zlib/Config.in
index 89cb1eb92a..00c912a88a 100644
--- a/openwrt/package/zlib/Config.in
+++ b/openwrt/package/zlib/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_ZLIB
 	tristate "zlib"
-	default y
+	default m if CONFIG_DEVEL
 	help
 	  A library implementing the 'deflate' compression method