change bool in BR2_COMPILE_* to tristate to avoid unnecessary package/<foo>-install calls

SVN-Revision: 2388
19 years ago · 7c38715694
parent 439b8bac00
commit 7c38715694
55 changed files with 57 additions and 62 deletions
--- a/openwrt/package/Config.in
+++ b/openwrt/package/Config.in
@ -171,7 +171,7 @@ source "package/libgpg-error/Config.in"
 source "package/libid3tag/Config.in"
 source "package/jpeg/Config.in"  # libjpeg
 source "package/libtool/Config.in"  # libltdl
-source "package/lzo/Config.in"  # liblzo
+source "package/liblzo/Config.in"
 source "package/libmad/Config.in"
 source "package/matrixssl/Config.in"  # libmatrixssl
 source "package/mysql/Config.in"  # limysqlclient
--- a/openwrt/package/Makefile
+++ b/openwrt/package/Makefile
@ -83,6 +83,7 @@ package-$(BR2_PACKAGE_LIBGD) += libgd
 package-$(BR2_PACKAGE_LIBGDBM) += libgdbm
 package-$(BR2_PACKAGE_LIBGPG_ERROR) += libgpg-error
 package-$(BR2_PACKAGE_LIBID3TAG) += libid3tag
+package-$(BR2_PACKAGE_LIBLZO) += liblzo
 package-$(BR2_PACKAGE_LIBMAD) += libmad
 package-$(BR2_PACKAGE_LIBNET) += libnet
 package-$(BR2_PACKAGE_LIBNIDS) += libnids
@ -102,7 +103,6 @@ package-$(BR2_PACKAGE_LIBXSLT) += libxslt
 package-$(BR2_PACKAGE_LIGHTTPD) += lighttpd
 package-$(BR2_PACKAGE_LINUX_ATM) += linux-atm
 package-$(BR2_COMPILE_LUA) += lua
-package-$(BR2_COMPILE_LZO) += lzo
 package-$(BR2_PACKAGE_MADWIFI_TOOLS) += madwifi-tools
 package-$(BR2_PACKAGE_MARADNS) += maradns
 package-$(BR2_COMPILE_MATRIXSSL) += matrixssl
@ -212,7 +212,7 @@ package-$(BR2_PACKAGE_XINETD) += xinetd
 package-$(BR2_PACKAGE_XSUPPLICANT) += xsupplicant
 package-$(BR2_PACKAGE_ZLIB) += zlib

-DEV_LIBS:=tcp_wrappers glib ncurses openssl pcre popt zlib libnet libpcap mysql postgresql iptables matrixssl lzo gmp fuse portmap libelf uclibc++ speex libpng libgd wireless-tools nvram linux-atm libamsel libao libart libdaemon libdb libdnet libevent libffi-sable libgcrypt libgdbm libgpg-error libid3tag libmad libnet libnids libogg libosip2 libpcap libtasn1 libupnp libusb libvorbis libvorbisidec libxml2 libxslt id3lib
+DEV_LIBS:=tcp_wrappers glib ncurses openssl pcre popt zlib libnet libpcap mysql postgresql iptables matrixssl liblzo gmp fuse portmap libelf uclibc++ speex libpng libgd wireless-tools nvram linux-atm libamsel libao libart libdaemon libdb libdnet libevent libffi-sable libgcrypt libgdbm libgpg-error libid3tag libmad libnet libnids libogg libosip2 libpcap libtasn1 libupnp libusb libvorbis libvorbisidec libxml2 libxslt id3lib
 DEV_LIBS_COMPILE:=$(patsubst %,%-compile,$(DEV_LIBS))
 SDK_DEFAULT_PACKAGES:=busybox dnsmasq iptables wireless-tools dropbear bridge ipkg ppp
 SDK_DEFAULT_COMPILE:=$(patsubst %,%-compile,$(SDK_DEFAULT_PACKAGES))
@ -297,10 +297,10 @@ socat-compile: openssl-compile
 sqlite-compile: ncurses-compile readline-compile
 sqlite2-compile: ncurses-compile readline-compile
 tcpdump-compile: libpcap-compile
-tinc-compile: zlib-compile openssl-compile lzo-compile
+tinc-compile: zlib-compile openssl-compile liblzo-compile
 tor-compile: libevent-compile openssl-compile zlib-compile
 usbutils-compile: libusb-compile
-vtun-compile: zlib-compile openssl-compile lzo-compile
+vtun-compile: zlib-compile openssl-compile liblzo-compile
 wificonf-compile: wireless-tools-compile nvram-compile
 wknock-compile: libpcap-compile
 wpa_supplicant-compile: openssl-compile
@ -347,7 +347,7 @@ endif

 openvpn-compile: openssl-compile
 ifeq ($(BR2_PACKAGE_OPENVPN_LZO),y)
-openvpn-compile: lzo-compile
+openvpn-compile: liblzo-compile
 endif

 php4-compile: openssl-compile zlib-compile
--- a/openwrt/package/atftp/Config.in
+++ b/openwrt/package/atftp/Config.in
@ -1,7 +1,7 @@
 #menu "atftp............................. TFTP implementation"

 config BR2_COMPILE_ATFTP
-	bool
+	tristate
 	default n
 	depends BR2_PACKAGE_ATFTP || BR2_PACKAGE_ATFTPD
 	
--- a/openwrt/package/avahi/Config.in
+++ b/openwrt/package/avahi/Config.in
@ -1,7 +1,7 @@
 menu "avahi............................. An mDNS/DNS-SD (aka RendezVous/Bonjour/ZeroConf) implementation"

 config BR2_COMPILE_AVAHI
-	bool
+	tristate
 	default n
 	depends BR2_PACKAGE_AVAHI_DAEMON || BR2_PACKAGE_AVAHI_DNSCONFD || BR2_PACKAGE_LIBAVAHI

--- a/openwrt/package/bind/Config.in
+++ b/openwrt/package/bind/Config.in
@ -1,7 +1,7 @@
 #menu "bind.............................. A DNS server implementation"

 config BR2_COMPILE_BIND
-	bool
+	tristate
 	default n
 	depends BR2_PACKAGE_BIND_CLIENT || BR2_PACKAGE_BIND_SERVER
 	
--- a/openwrt/package/curl/Config.in
+++ b/openwrt/package/curl/Config.in
@ -1,5 +1,5 @@
 config BR2_COMPILE_CURL
-	bool
+	tristate
 	default n
 	depends BR2_PACKAGE_LIBCURL

--- a/openwrt/package/cyrus-sasl/Config.in
+++ b/openwrt/package/cyrus-sasl/Config.in
@ -1,5 +1,5 @@
 config BR2_COMPILE_CYRUS_SASL
-	bool
+	tristate
 	default n
 	depends BR2_PACKAGE_LIBSASL2

--- a/openwrt/package/dhcp/Config.in
+++ b/openwrt/package/dhcp/Config.in
@ -1,7 +1,7 @@
 #menu "dhcp.............................. ISC DHCP (Dynamic Host Configuration Protocol) implementation"

 config BR2_COMPILE_DHCP
-	bool
+	tristate
 	default n
 	depends BR2_PACKAGE_DHCP_RELAY || BR2_PACKAGE_DHCP_SERVER

--- a/openwrt/package/expat/Config.in
+++ b/openwrt/package/expat/Config.in
@ -1,5 +1,5 @@
 config BR2_COMPILE_EXPAT
-	bool
+	tristate
 	default n
 	depends BR2_PACKAGE_LIBEXPAT

--- a/openwrt/package/flac/Config.in
+++ b/openwrt/package/flac/Config.in
@ -1,5 +1,5 @@
 config BR2_COMPILE_FLAC
-	bool
+	tristate
 	default n
 	depends BR2_PACKAGE_LIBFLAC

--- a/openwrt/package/fuse/Config.in
+++ b/openwrt/package/fuse/Config.in
@ -1,5 +1,5 @@
 config BR2_COMPILE_FUSE
-	bool
+	tristate
 	default n
 	depends BR2_PACKAGE_LIBFUSE

--- a/openwrt/package/glib/Config.in
+++ b/openwrt/package/glib/Config.in
@ -1,5 +1,5 @@
 config BR2_COMPILE_GLIB
-	bool
+	tristate
 	depends BR2_PACKAGE_GLIB1

 config BR2_PACKAGE_GLIB1
--- a/openwrt/package/gmp/Config.in
+++ b/openwrt/package/gmp/Config.in
@ -1,5 +1,5 @@
 config BR2_COMPILE_GMP
-	bool
+	tristate
 	default n
 	depends BR2_PACKAGE_LIBGMP

--- a/openwrt/package/gnutls/Config.in
+++ b/openwrt/package/gnutls/Config.in
@ -1,5 +1,5 @@
 config BR2_COMPILE_GNUTLS
-	bool
+	tristate
 	default n
 	depends BR2_PACKAGE_LIBGNUTLS

--- a/openwrt/package/howl/Config.in
+++ b/openwrt/package/howl/Config.in
@ -1,7 +1,7 @@
 menu "howl.............................. A Zeroconf networking implementation"

 config BR2_COMPILE_HOWL
-	bool
+	tristate
 	default n
 	depends BR2_PACKAGE_LIBHOWL

--- a/openwrt/package/iproute2/Config.in
+++ b/openwrt/package/iproute2/Config.in
@ -1,7 +1,7 @@
 menu "iproute2.......................... A collection of utilites for controlling TCP/IP networking and Traffic Control"

 config BR2_COMPILE_IPROUTE2
-	bool
+	tristate
 	default n
 	depends BR2_PACKAGE_IPROUTE2_IP || BR2_PACKAGE_IPROUTE2_TC

--- a/openwrt/package/jpeg/Config.in
+++ b/openwrt/package/jpeg/Config.in
@ -1,5 +1,5 @@
 config BR2_COMPILE_JPEG
-	bool
+	tristate
 	default n
 	depends BR2_PACKAGE_LIBJPEG

--- a/openwrt/package/kismet/Config.in
+++ b/openwrt/package/kismet/Config.in
@ -1,7 +1,7 @@
 #menu "kismet............................ An 802.11 layer2 wireless network detector, sniffer, and intrusion detection system"

 config BR2_COMPILE_KISMET
-	bool
+	tristate
 	default n
 	depends BR2_PACKAGE_KISMET_CLIENT || BR2_PACKAGE_KISMET_DRONE || BR2_PACKAGE_KISMET_SERVER

--- a/openwrt/package/libdb/Config.in
+++ b/openwrt/package/libdb/Config.in
@ -1,5 +1,5 @@
 config BR2_COMPILE_DB
-	bool
+	tristate
 	default n
 	depends BR2_PACKAGE_LIBDB

--- a/openwrt/package/liblzo/Config.in
+++ b/openwrt/package/liblzo/Config.in
@ -1,13 +1,7 @@
-config BR2_COMPILE_LZO
-	bool
-	default n
-	depends BR2_PACKAGE_LIBLZO
-
 config BR2_PACKAGE_LIBLZO
 	prompt "liblzo............................ Real-time data compression library"
 	tristate
 	default m if CONFIG_DEVEL
-	select BR2_COMPILE_LZO
 	help
 	  A real-time data compression library
 	  
--- a/openwrt/package/liblzo/Makefile
+++ b/openwrt/package/liblzo/Makefile
--- a/openwrt/package/liblzo/ipkg/liblzo.control
+++ b/openwrt/package/liblzo/ipkg/liblzo.control
--- a/openwrt/package/liblzo/patches/lzo-cross-compile.patch
+++ b/openwrt/package/liblzo/patches/lzo-cross-compile.patch
--- a/openwrt/package/libtool/Config.in
+++ b/openwrt/package/libtool/Config.in
@ -1,5 +1,5 @@
 config BR2_COMPILE_LIBTOOL
-	bool
+	tristate
 	depends BR2_PACKAGE_LIBLTDL

 config BR2_PACKAGE_LIBLTDL
--- a/openwrt/package/lua/Config.in
+++ b/openwrt/package/lua/Config.in
@ -1,7 +1,7 @@
 menu "lua............................... LUA programming language"

 config BR2_COMPILE_LUA
-	bool
+	tristate
 	default y
 	depends BR2_PACKAGE_LIBLUA

--- a/openwrt/package/matrixssl/Config.in
+++ b/openwrt/package/matrixssl/Config.in
@ -1,5 +1,5 @@
 config BR2_COMPILE_MATRIXSSL
-	bool
+	tristate
 	depends BR2_PACKAGE_LIBMATRIXSSL

 config BR2_PACKAGE_LIBMATRIXSSL
--- a/openwrt/package/mini_httpd/Config.in
+++ b/openwrt/package/mini_httpd/Config.in
@ -1,7 +1,7 @@
 menu "mini-httpd........................ A small web server"

 config BR2_COMPILE_MINI_HTTPD
-	bool
+	tristate
 	default n
 	depends BR2_PACKAGE_MINI_HTTPD || BR2_PACKAGE_MINI_HTTPD_MATRIXSSL || BR2_PACKAGE_MINI_HTTPD_OPENSSL

--- a/openwrt/package/miredo/Config.in
+++ b/openwrt/package/miredo/Config.in
@ -1,5 +1,5 @@
 config BR2_COMPILE_MIREDO
-	bool
+	tristate
 	default n
 	depends BR2_PACKAGE_MIREDO || BR2_PACKAGE_MIREDO_SERVER

--- a/openwrt/package/monit/Config.in
+++ b/openwrt/package/monit/Config.in
@ -1,7 +1,7 @@
 #menu "monit............................. System services monitoring utility"

 config BR2_COMPILE_MONIT
-	bool
+	tristate
 	default n
 	depends BR2_PACKAGE_MONIT || BR2_PACKAGE_MONIT_NOSSL

--- a/openwrt/package/mysql/Config.in
+++ b/openwrt/package/mysql/Config.in
@ -1,5 +1,5 @@
 config BR2_COMPILE_MYSQL
-	bool
+	tristate
 	default n
 	depends BR2_PACKAGE_LIBMYSQLCLIENT

--- a/openwrt/package/ncurses/Config.in
+++ b/openwrt/package/ncurses/Config.in
@ -1,5 +1,5 @@
 config BR2_COMPILE_NCURSES
-	bool
+	tristate
 	depends BR2_PACKAGE_LIBNCURSES

 config BR2_PACKAGE_LIBNCURSES
--- a/openwrt/package/ndisc/Config.in
+++ b/openwrt/package/ndisc/Config.in
@ -1,7 +1,7 @@
 menu "ndisc6............................ IPv6 discovery tools"

 config BR2_COMPILE_NDISC6
-	bool
+	tristate
 	default n
 	depends BR2_PACKAGE_NDISC6 || BR2_PACKAGE_RDISC6 || BR2_PACKAGE_TCPTRACEROUTE6

--- a/openwrt/package/net-snmp/Config.in
+++ b/openwrt/package/net-snmp/Config.in
@ -1,7 +1,7 @@
 menu "net-snmp.......................... Open source SNMP (Simple Network Management Protocol) implementation"

 config BR2_COMPILE_NET_SNMP
-	bool
+	tristate
 	default n
 	depends BR2_PACKAGE_LIBNETSNMP || BR2_PACKAGE_SNMPD_STATIC

--- a/openwrt/package/opencdk/Config.in
+++ b/openwrt/package/opencdk/Config.in
@ -1,5 +1,5 @@
 config BR2_PACKAGE_OPENCDK
-	bool
+	tristate
 	default n
 	depends BR2_PACKAGE_LIBOPENCDK

--- a/openwrt/package/openldap/Config.in
+++ b/openwrt/package/openldap/Config.in
@ -1,5 +1,5 @@
 config BR2_COMPILE_OPENLDAP
-	bool
+	tristate
 	default n
 	depends BR2_PACKAGE_LIBOPENLDAP

--- a/openwrt/package/openssh/Config.in
+++ b/openwrt/package/openssh/Config.in
@ -1,7 +1,7 @@
 menu "openssh........................... A free implementation of the Secure Shell protocol"

 config BR2_COMPILE_OPENSSH
-	bool
+	tristate
 	default n
 	depends BR2_PACKAGE_OPENSSH_CLIENT || BR2_PACKAGE_OPENSSH_SERVER || BR2_PACKAGE_OPENSSH_SFTP_CLIENT || BR2_PACKAGE_OPENSSH_SFTP_SERVER

--- a/openwrt/package/openssl/Config.in
+++ b/openwrt/package/openssl/Config.in
@ -1,5 +1,5 @@
 config BR2_COMPILE_OPENSSL
-	bool
+	tristate
 	default n
 	depends BR2_PACKAGE_LIBOPENSSL
 	
--- a/openwrt/package/osiris/Config.in
+++ b/openwrt/package/osiris/Config.in
@ -1,5 +1,5 @@
 config BR2_COMPILE_OSIRIS
-	bool
+	tristate
 	default n
 	depends BR2_PACKAGE_OSIRISD

--- a/openwrt/package/pcre/Config.in
+++ b/openwrt/package/pcre/Config.in
@ -1,5 +1,5 @@
 config BR2_COMPILE_PCRE
-	bool
+	tristate
 	default n
 	depends BR2_PACKAGE_LIBPCRE

--- a/openwrt/package/php4/Config.in
+++ b/openwrt/package/php4/Config.in
@ -1,7 +1,7 @@
 menu "php4.............................. PHP4 Hypertext preprocessor"

 config BR2_COMPILE_PHP4
-	bool
+	tristate
 	default y
 	depends BR2_PACKAGE_PHP4_CLI || BR2_PACKAGE_PHP4_CGI || BR2_PACKAGE_PHP4_FASTCGI
 	 
--- a/openwrt/package/php5/Config.in
+++ b/openwrt/package/php5/Config.in
@ -1,7 +1,7 @@
 menu "php5.............................. PHP5 Hypertext preprocessor"

 config BR2_COMPILE_PHP5
-	bool
+	tristate
 	default n
 	depends BR2_PACKAGE_PHP5_CLI || BR2_PACKAGE_PHP5_CGI || BR2_PACKAGE_PHP5_FASTCGI
 	 
--- a/openwrt/package/popt/Config.in
+++ b/openwrt/package/popt/Config.in
@ -1,5 +1,5 @@
 config BR2_COMPILE_POPT
-	bool
+	tristate
 	depends BR2_PACKAGE_LIBPOPT

 config BR2_PACKAGE_LIBPOPT
--- a/openwrt/package/postgresql/Config.in
+++ b/openwrt/package/postgresql/Config.in
@ -1,5 +1,5 @@
 config BR2_COMPILE_POSTGRESQL
-	bool
+	tristate
 	default n
 	depends BR2_PACKAGE_LIBPQ

--- a/openwrt/package/readline/Config.in
+++ b/openwrt/package/readline/Config.in
@ -1,5 +1,5 @@
 config BR2_COMPILE_READLINE
-	bool
+	tristate
 	default n
 	depends BR2_PACKAGE_LIBREADLINE

--- a/openwrt/package/rp-pppoe/Config.in
+++ b/openwrt/package/rp-pppoe/Config.in
@ -1,7 +1,7 @@
 #menu "rp-pppoe.......................... Roaring Penguin PPPoE (PPP over Ethernet) implementation"

 config BR2_COMPILE_RP_PPPOE
-	bool
+	tristate
 	default n
 	depends BR2_PACKAGE_PPPOE_CLIENT || BR2_PACKAGE_PPPOE_RELAY || BR2_PACKAGE_PPPOE_SERVER || BR2_PACKAGE_PPPOE_SNIFF

--- a/openwrt/package/rrdtool1/Config.in
+++ b/openwrt/package/rrdtool1/Config.in
@ -1,7 +1,7 @@
 config BR2_COMPILE_RRDTOOL1
 	prompt "rrdtool1.......................... Round Robin Database (RRD) tools (v1.0.x)"
-	bool
-	default y
+	tristate
+	default m if CONFIG_DEVEL

 config BR2_PACKAGE_LIBRRD1
 	prompt   "librrd1......................... Round Robin Database (RRD) management library (v1.0.x)"
@ -53,6 +53,7 @@ config BR2_PACKAGE_RRDCGI1
 config BR2_PACKAGE_RRDTOOL1
 	prompt   "rrdtool1........................ Round Robin Database (RRD) management tools (v1.0.x)"
 	tristate
+	default m if CONFIG_DEVEL
 	depends BR2_COMPILE_RRDTOOL1
 	select BR2_PACKAGE_LIBRRD1
 	help
--- a/openwrt/package/rrs/Config.in
+++ b/openwrt/package/rrs/Config.in
@ -1,7 +1,7 @@
 #menu "rrs............................... A reverse (connecting) remote shell"

 config BR2_COMPILE_RRS
-	bool
+	tristate
 	default n
 	depends BR2_PACKAGE_RRS || BR2_PACKAGE_RRS_NOSSL

--- a/openwrt/package/sablevm-classpath/Config.in
+++ b/openwrt/package/sablevm-classpath/Config.in
@ -1,5 +1,5 @@
 config BR2_COMPILE_SABLEVM_CLASSPATH
-	bool
+	tristate
 	default n
 	depends BR2_PACKAGE_LIBSABLEVM_CLASSPATH

--- a/openwrt/package/samba/Config.in
+++ b/openwrt/package/samba/Config.in
@ -1,7 +1,7 @@
 #menu "samba............................. A NetBIOS/SMB implementation"

 config BR2_COMPILE_SAMBA
-	bool
+	tristate
 	default n
 	depends BR2_PACKAGE_SAMBA || BR2_PACKAGE_SAMBA_CLIENT || BR2_PACKAGE_SMBFS

--- a/openwrt/package/shfs/Config.in
+++ b/openwrt/package/shfs/Config.in
@ -1,5 +1,5 @@
 config BR2_COMPILE_SHFS
-	bool
+	tristate
 	default n
 	depends BR2_PACKAGE_SHFS_UTILS

--- a/openwrt/package/speex/Config.in
+++ b/openwrt/package/speex/Config.in
@ -1,5 +1,5 @@
 config BR2_COMPILE_SPEEX
-	bool
+	tristate
 	default n
 	depends BR2_PACKAGE_LIBSPEEX

--- a/openwrt/package/sqlite/Config.in
+++ b/openwrt/package/sqlite/Config.in
@ -1,5 +1,5 @@
 config BR2_COMPILE_SQLITE
-	bool
+	tristate
 	default n
 	depends BR2_PACKAGE_LIBSQLITE

--- a/openwrt/package/sqlite2/Config.in
+++ b/openwrt/package/sqlite2/Config.in
@ -1,5 +1,5 @@
 config BR2_COMPILE_SQLITE2
-	bool
+	tristate
 	default n
 	depends BR2_PACKAGE_LIBSQLITE2

--- a/openwrt/package/usbutils/Config.in
+++ b/openwrt/package/usbutils/Config.in
@ -1,5 +1,5 @@
 config BR2_COMPILE_USBUTILS
-	bool
+	tristate
 	depends BR2_PACKAGE_LSUSB

 config BR2_PACKAGE_LSUSB
--- a/openwrt/package/util-linux/Config.in
+++ b/openwrt/package/util-linux/Config.in
@ -1,7 +1,7 @@
 menu "util-linux"

 config BR2_COMPILE_UTIL_LINUX
-	bool
+	tristate
 	default n
 	depends BR2_PACKAGE_FDISK || BR2_PACKAGE_SWAP_UTILS