From 87c3e33b151efb5fea20d2dd3c9c62d3a5c61c8f Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 2 Mar 2015 04:04:48 +0100 Subject: default m approach for selecting kernel stuff by packages does not work well. remove it for now --- target/linux/config/Config.in.block | 4 ---- target/linux/config/Config.in.crypto | 14 -------------- target/linux/config/Config.in.debug | 1 - target/linux/config/Config.in.fs | 4 ---- target/linux/config/Config.in.fsnet | 4 ---- target/linux/config/Config.in.graphics | 3 --- target/linux/config/Config.in.input | 2 -- target/linux/config/Config.in.ipsec | 14 -------------- target/linux/config/Config.in.ipvs | 1 - target/linux/config/Config.in.netfilter.core | 1 - target/linux/config/Config.in.netfilter.ebt | 1 - target/linux/config/Config.in.netfilter.ip4 | 6 ------ 12 files changed, 55 deletions(-) diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block index a72a95012..d9d13a616 100644 --- a/target/linux/config/Config.in.block +++ b/target/linux/config/Config.in.block @@ -411,7 +411,6 @@ config ADK_KERNEL_DM_CRYPT select ADK_KERNEL_CRYPTO_CBC select ADK_KERNEL_CRYPTO_BLKCIPHER depends on ADK_KERNEL_BLK_DEV_DM - default m if ADK_PACKAGE_CRYPTSETUP default n help This device-mapper target allows you to create a device that @@ -439,7 +438,6 @@ config ADK_KERNEL_BLK_DEV_DRBD tristate "DRBD support (Network RAID 1)" select ADK_KERNEL_BLK_DEV select ADK_KERNEL_CONNECTOR - default m if ADK_PACKAGE_DRBD default n help DRBD - http://www.drbd.org @@ -447,8 +445,6 @@ config ADK_KERNEL_BLK_DEV_DRBD config ADK_KERNEL_BLK_DEV_LOOP tristate "Loop mount support" select ADK_KERNEL_BLK_DEV - default m if ADK_PACKAGE_LOSETUP - default m if ADK_PACKAGE_LTP default n help Saying Y here will allow you to use a regular file as a block diff --git a/target/linux/config/Config.in.crypto b/target/linux/config/Config.in.crypto index 3454077b0..8b1ceb056 100644 --- a/target/linux/config/Config.in.crypto +++ b/target/linux/config/Config.in.crypto @@ -154,9 +154,6 @@ config ADK_KERNEL_CRYPTO_CBC tristate select ADK_KERNEL_CRYPTO_BLKCIPHER select ADK_KERNEL_CRYPTO_MANAGER - default m if ADK_PACKAGE_CRYPTSETUP - default m if ADK_PACKAGE_STRONGSWAN - default m if ADK_PACKAGE_OPENSWAN default n help CBC: Cipher Block Chaining mode @@ -210,8 +207,6 @@ config ADK_KERNEL_CRYPTO_HMAC tristate select ADK_KERNEL_CRYPTO_HASH select ADK_KERNEL_CRYPTO_MANAGER - default m if ADK_PACKAGE_STRONGSWAN - default m if ADK_PACKAGE_OPENSWAN default n help HMAC: Keyed-Hashing for Message Authentication (RFC2104). @@ -242,8 +237,6 @@ config ADK_KERNEL_CRYPTO_MD5 prompt "MD5 digest algorithm" tristate select ADK_KERNEL_CRYPTO_HASH - default m if ADK_PACKAGE_STRONGSWAN - default m if ADK_PACKAGE_OPENSWAN default n help MD5 message digest algorithm (RFC1321). @@ -252,8 +245,6 @@ config ADK_KERNEL_CRYPTO_SHA1 prompt "SHA1 digest algorithm" tristate select ADK_KERNEL_CRYPTO_HASH - default m if ADK_PACKAGE_STRONGSWAN - default m if ADK_PACKAGE_OPENSWAN default n help SHA-1 secure hash standard (FIPS 180-1/DFIPS 180-2). @@ -262,7 +253,6 @@ config ADK_KERNEL_CRYPTO_SHA256 prompt "SHA256 digest algorithm" tristate select ADK_KERNEL_CRYPTO_HASH - default m if ADK_PACKAGE_CRYPTSETUP default n help SHA256 secure hash standard (DFIPS 180-2). @@ -444,8 +434,6 @@ config ADK_KERNEL_CRYPTO_DES prompt "DES and Triple DES EDE cipher algorithms" tristate select ADK_KERNEL_CRYPTO_ALGAPI - default m if ADK_PACKAGE_STRONGSWAN - default m if ADK_PACKAGE_OPENSWAN default n help DES cipher algorithm (FIPS 46-2), and Triple DES EDE (FIPS 46-3). @@ -546,8 +534,6 @@ config ADK_KERNEL_CRYPTO_NULL select ADK_KERNEL_CRYPTO_ALGAPI select ADK_KERNEL_CRYPTO_BLKCIPHER select ADK_KERNEL_CRYPTO_HASH - default m if ADK_PACKAGE_STRONGSWAN - default m if ADK_PACKAGE_OPENSWAN default n help These are 'Null' algorithms, used by IPsec, which do nothing. diff --git a/target/linux/config/Config.in.debug b/target/linux/config/Config.in.debug index a2287f5f5..f2a00666e 100644 --- a/target/linux/config/Config.in.debug +++ b/target/linux/config/Config.in.debug @@ -123,7 +123,6 @@ config ADK_KERNEL_OPROFILE tristate select ADK_KERNEL_PROFILING depends on !ADK_TARGET_ARCH_M68K - default m if ADK_PACKAGE_OPROFILE default n help use oprofile package to make use of the kernel support. diff --git a/target/linux/config/Config.in.fs b/target/linux/config/Config.in.fs index 5bf161bf6..6ff67959d 100644 --- a/target/linux/config/Config.in.fs +++ b/target/linux/config/Config.in.fs @@ -195,10 +195,6 @@ config ADK_KERNEL_BTRFS_FS config ADK_KERNEL_FUSE_FS prompt "Filesystem in Userspace support" tristate - default m if ADK_PACKAGE_DAVFS2 - default m if ADK_PACKAGE_FUSE - default m if ADK_PACKAGE_NTFS_3G - default m if ADK_PACKAGE_WDFS default n help With FUSE it is possible to implement a fully functional diff --git a/target/linux/config/Config.in.fsnet b/target/linux/config/Config.in.fsnet index ad91da1e3..26f78090a 100644 --- a/target/linux/config/Config.in.fsnet +++ b/target/linux/config/Config.in.fsnet @@ -16,7 +16,6 @@ config ADK_KERNEL_CIFS select ADK_KERNEL_CRYPTO_DES select ADK_KERNEL_CRYPTO_SHA256 select ADK_KERNEL_NLS_UTF8 - default m if ADK_PACKAGE_CIFS_UTILS default n help This is the client VFS module for the Common Internet File System @@ -68,7 +67,6 @@ config ADK_KERNEL_NFS_FS select ADK_KERNEL_SUNRPC select ADK_KERNEL_LOCKD select ADK_KERNEL_NETWORK_FILESYSTEMS - default m if ADK_PACKAGE_NFS_UTILS_CLIENT default n help If you are connected to some other (usually local) Unix computer @@ -124,7 +122,6 @@ config ADK_KERNEL_NFSD select ADK_KERNEL_SUNRPC select ADK_KERNEL_LOCKD select ADK_KERNEL_NETWORK_FILESYSTEMS - default m if ADK_PACKAGE_NFS_UTILS_SERVER default n help If you want your Linux box to act as an NFS *server*, so that other @@ -175,7 +172,6 @@ config ADK_KERNEL_RPCSEC_GSS_KRB5 select ADK_KERNEL_CRYPTO_SHA1 select ADK_KERNEL_CRYPTO_AES select ADK_KERNEL_CRYPTO_ARC4 - default m if ADK_PACKAGE_NFS_UTILS_V4 default n help diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics index dbd6185d0..3c8c683ef 100644 --- a/target/linux/config/Config.in.graphics +++ b/target/linux/config/Config.in.graphics @@ -71,7 +71,6 @@ config ADK_KERNEL_MXC_GPU_VIV config ADK_KERNEL_MXC_ASRC tristate - default m if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 config ADK_KERNEL_MXC_HDMI_CEC boolean @@ -183,7 +182,6 @@ config ADK_KERNEL_DRM_DW_HDMI_AUDIO tristate depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 depends on ADK_KERNEL_VERSION_3_16 - #default m if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 default n help @@ -191,7 +189,6 @@ config ADK_KERNEL_DRM_DW_HDMI_CEC tristate depends on ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 depends on ADK_KERNEL_VERSION_3_16 - #default m if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 default n help diff --git a/target/linux/config/Config.in.input b/target/linux/config/Config.in.input index c636de8fa..0eeb235c4 100644 --- a/target/linux/config/Config.in.input +++ b/target/linux/config/Config.in.input @@ -145,8 +145,6 @@ config ADK_KERNEL_MOUSE_PS2 config ADK_KERNEL_INPUT_EVDEV tristate "Event device support" select ADK_KERNEL_INPUT - default m if ADK_PACKAGE_XF86_INPUT_EVDEV - default m if ADK_PACKAGE_XF86_INPUT_EVTOUCH default n endmenu diff --git a/target/linux/config/Config.in.ipsec b/target/linux/config/Config.in.ipsec index 8f0323291..da638c40c 100644 --- a/target/linux/config/Config.in.ipsec +++ b/target/linux/config/Config.in.ipsec @@ -3,8 +3,6 @@ menu "IPSec support" config ADK_KERNEL_NET_KEY prompt "PF_KEYv2 socket family" tristate - default m if ADK_PACKAGE_STRONGSWAN - default m if ADK_PACKAGE_OPENSWAN default n help PF_KEYv2 socket family, compatible to KAME ones. @@ -12,8 +10,6 @@ config ADK_KERNEL_NET_KEY config ADK_KERNEL_XFRM_USER prompt "IPsec usertools support" tristate - default m if ADK_PACKAGE_STRONGSWAN - default m if ADK_PACKAGE_OPENSWAN default n help @@ -21,8 +17,6 @@ config ADK_KERNEL_INET_AH prompt "IPsec AH support" tristate select ADK_KERNEL_CRYPTO_HASH - default m if ADK_PACKAGE_STRONGSWAN - default m if ADK_PACKAGE_OPENSWAN default n help Support for IPsec AH. @@ -31,8 +25,6 @@ config ADK_KERNEL_INET_ESP prompt "IPsec ESP support" tristate select ADK_KERNEL_CRYPTO_AEAD - default m if ADK_PACKAGE_STRONGSWAN - default m if ADK_PACKAGE_OPENSWAN default n help Support for IPsec ESP. @@ -42,8 +34,6 @@ config ADK_KERNEL_INET_IPCOMP tristate select ADK_KERNEL_CRYPTO_DEFLATE select ADK_KERNEL_INET_TUNNEL - default m if ADK_PACKAGE_STRONGSWAN - default m if ADK_PACKAGE_OPENSWAN default n help Support for IP Payload Compression Protocol (IPComp) (RFC3173), @@ -52,8 +42,6 @@ config ADK_KERNEL_INET_IPCOMP config ADK_KERNEL_INET_XFRM_MODE_TRANSPORT prompt "IPsec transport mode" tristate - default m if ADK_PACKAGE_STRONGSWAN - default m if ADK_PACKAGE_OPENSWAN default n help Support for IPsec transport mode. @@ -61,8 +49,6 @@ config ADK_KERNEL_INET_XFRM_MODE_TRANSPORT config ADK_KERNEL_INET_XFRM_MODE_TUNNEL prompt "IPsec tunnel mode" tristate - default m if ADK_PACKAGE_STRONGSWAN - default m if ADK_PACKAGE_OPENSWAN default n help Support for IPsec tunnel mode. diff --git a/target/linux/config/Config.in.ipvs b/target/linux/config/Config.in.ipvs index 16106e7a3..b5526fe93 100644 --- a/target/linux/config/Config.in.ipvs +++ b/target/linux/config/Config.in.ipvs @@ -5,7 +5,6 @@ config ADK_KERNEL_IP_VS tristate select ADK_KERNEL_NETFILTER select ADK_KERNEL_NF_CONNTRACK - default m if ADK_PACKAGE_IPVSADM default n config ADK_KERNEL_IP_VS_DEBUG diff --git a/target/linux/config/Config.in.netfilter.core b/target/linux/config/Config.in.netfilter.core index 5a42efd04..4b3cb48eb 100644 --- a/target/linux/config/Config.in.netfilter.core +++ b/target/linux/config/Config.in.netfilter.core @@ -1,7 +1,6 @@ config ADK_KERNEL_NF_CONNTRACK tristate 'Netfilter connection tracking support' select ADK_KERNEL_NETFILTER_XTABLES - default m if ADK_PACKAGE_IPTABLES default n help Connection tracking keeps a record of what packets have passed diff --git a/target/linux/config/Config.in.netfilter.ebt b/target/linux/config/Config.in.netfilter.ebt index 76eeb5e7b..16d2cab5a 100644 --- a/target/linux/config/Config.in.netfilter.ebt +++ b/target/linux/config/Config.in.netfilter.ebt @@ -2,7 +2,6 @@ config ADK_KERNEL_BRIDGE_NF_EBTABLES prompt 'Ethernet Bridge tables support' tristate select ADK_KERNEL_BRIDGE_NETFILTER - default m if ADK_PACKAGE_EBTABLES default n help ebtables is a general, extensible frame/packet identification diff --git a/target/linux/config/Config.in.netfilter.ip4 b/target/linux/config/Config.in.netfilter.ip4 index 77617ea12..648a412a7 100644 --- a/target/linux/config/Config.in.netfilter.ip4 +++ b/target/linux/config/Config.in.netfilter.ip4 @@ -7,7 +7,6 @@ config ADK_KERNEL_NF_NAT_IPV4 config ADK_KERNEL_IP_NF_IPTABLES tristate 'IP tables support' select ADK_KERNEL_NETFILTER_XTABLES - default m if ADK_PACKAGE_IPTABLES default n help iptables is a general, extensible packet identification framework. @@ -18,7 +17,6 @@ config ADK_KERNEL_IP_NF_IPTABLES config ADK_KERNEL_IP_NF_FILTER tristate 'IP Packet Filtering table support' depends on ADK_KERNEL_IP_NF_IPTABLES - default m if ADK_PACKAGE_IPTABLES default n help Packet filtering defines a table `filter', which has a series of @@ -31,7 +29,6 @@ config ADK_KERNEL_IP_NF_NAT select ADK_KERNEL_NF_NAT select ADK_KERNEL_NF_NAT_IPV4 depends on ADK_KERNEL_IP_NF_IPTABLES - default m if ADK_PACKAGE_IPTABLES default n help @@ -48,7 +45,6 @@ config ADK_KERNEL_NF_CONNTRACK_IPV4 tristate 'IP connection tracking support (required for NAT)' select ADK_KERNEL_NF_CONNTRACK select ADK_KERNEL_NETFILTER_XT_MATCH_CONNTRACK - default m if ADK_PACKAGE_IPTABLES default n help Connection tracking keeps a record of what packets have passed @@ -70,7 +66,6 @@ menu "IP target support" config ADK_KERNEL_IP_NF_TARGET_MASQUERADE tristate 'MASQUERADE target support' depends on ADK_KERNEL_NF_NAT - default m if ADK_PACKAGE_IPTABLES default n help Masquerading is a special case of NAT: all outgoing connections are @@ -82,7 +77,6 @@ config ADK_KERNEL_IP_NF_TARGET_MASQUERADE config ADK_KERNEL_IP_NF_TARGET_REJECT tristate 'REJECT target support' depends on ADK_KERNEL_IP_NF_FILTER - default m if ADK_PACKAGE_IPTABLES default n help The REJECT target allows a filtering rule to specify that an ICMP -- cgit v1.2.3