diff options
37 files changed, 65 insertions, 131 deletions
diff --git a/package/acx-mac80211/Makefile b/package/acx-mac80211/Makefile index ca5572d381..fb2216ff0d 100644 --- a/package/acx-mac80211/Makefile +++ b/package/acx-mac80211/Makefile @@ -24,7 +24,7 @@ include $(INCLUDE_DIR)/package.mk define KernelPackage/acx-mac80211 SUBMENU:=Wireless Drivers TITLE:=ACX111 Mac80211 driver - DEPENDS:=@LINUX_2_6 @PCI_SUPPORT||TARGET_ar7 +kmod-mac80211 + DEPENDS:=@PCI_SUPPORT||TARGET_ar7 +kmod-mac80211 FILES:=$(PKG_BUILD_DIR)/acx-mac80211.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,50,acx-mac80211) endef diff --git a/package/acx/Makefile b/package/acx/Makefile index 9accc33e8b..b5d211ca49 100644 --- a/package/acx/Makefile +++ b/package/acx/Makefile @@ -25,7 +25,7 @@ include $(INCLUDE_DIR)/package.mk define KernelPackage/acx TITLE:=Driver for TI ACX1xx chipset - DEPENDS:=@LINUX_2_6 @PCI_SUPPORT||TARGET_ar7 +wireless-tools + DEPENDS:=@PCI_SUPPORT||TARGET_ar7 +wireless-tools URL:=http://acx100.sourceforge.net/ SUBMENU:=Wireless Drivers FILES:= $(PKG_BUILD_DIR)/acx.$(LINUX_KMOD_SUFFIX) diff --git a/package/button-hotplug/Makefile b/package/button-hotplug/Makefile index b75f1079de..f5a7fcd392 100644 --- a/package/button-hotplug/Makefile +++ b/package/button-hotplug/Makefile @@ -16,7 +16,6 @@ include $(INCLUDE_DIR)/package.mk define KernelPackage/button-hotplug SUBMENU:=Other modules TITLE:=Button Hotplug driver - DEPENDS:=@LINUX_2_6 FILES:=$(PKG_BUILD_DIR)/button-hotplug.$(LINUX_KMOD_SUFFIX) KCONFIG:= endef diff --git a/package/compcache/Makefile b/package/compcache/Makefile index eb2e2d11b9..c8a4c0a04c 100644 --- a/package/compcache/Makefile +++ b/package/compcache/Makefile @@ -20,7 +20,7 @@ include $(INCLUDE_DIR)/package.mk define KernelPackage/ramzswap SUBMENU:=Other modules - DEPENDS:=@LINUX_2_6 @BUSYBOX_CONFIG_SWAPONOFF + DEPENDS:=@BUSYBOX_CONFIG_SWAPONOFF TITLE:=Driver for compressed ram swap device VERSION:=$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)+$(PKG_RELEASE) FILES:=$(PKG_BUILD_DIR)/ramzswap.$(LINUX_KMOD_SUFFIX) \ diff --git a/package/crda/Makefile b/package/crda/Makefile index 402bee53b0..a9a216151d 100644 --- a/package/crda/Makefile +++ b/package/crda/Makefile @@ -28,7 +28,7 @@ define Package/crda SECTION:=net CATEGORY:=Network TITLE:=Central Regulatory Domain Agent (CRDA) - DEPENDS:=@LINUX_2_6 +hotplug2 +kmod-mac80211 +libnl-tiny + DEPENDS:=+hotplug2 +kmod-mac80211 +libnl-tiny URL:=http://wireless.kernel.org/en/developers/Regulatory/CRDA endef diff --git a/package/ifenslave/Makefile b/package/ifenslave/Makefile index 31174702e9..5292e451cc 100644 --- a/package/ifenslave/Makefile +++ b/package/ifenslave/Makefile @@ -16,7 +16,7 @@ include $(INCLUDE_DIR)/package.mk define Package/ifenslave SECTION:=net CATEGORY:=Network - DEPENDS:=@LINUX_2_6 +kmod-bonding + DEPENDS:=+kmod-bonding TITLE:=A utility to manipulate kernel ethernet bonding devices VERSION:=$(LINUX_VERSION)-$(PKG_RELEASE) URL:=http://www.kernel.org diff --git a/package/ipset/Makefile b/package/ipset/Makefile index 012505fe8c..efd439b7fe 100644 --- a/package/ipset/Makefile +++ b/package/ipset/Makefile @@ -19,7 +19,7 @@ PKG_MD5SUM:=9060d549a18c1c0794fa47a71343d627 include $(INCLUDE_DIR)/package.mk define Package/ipset/Default - DEPENDS:= @LINUX_2_6 @(!(TARGET_ps3||TARGET_pxcab)||BROKEN) + DEPENDS:= @(!(TARGET_ps3||TARGET_pxcab)||BROKEN) endef define Package/ipset diff --git a/package/iptables/Makefile b/package/iptables/Makefile index b37a66fd3f..7da5464c86 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -143,7 +143,7 @@ Includes: endef define Package/iptables-mod-ipset -$(call Package/iptables/Module, @LINUX_2_6) +$(call Package/iptables/Module,) TITLE:=IPset iptables extensions endef diff --git a/package/iw/Makefile b/package/iw/Makefile index 226e8ca590..b7ad749a76 100644 --- a/package/iw/Makefile +++ b/package/iw/Makefile @@ -48,11 +48,9 @@ MAKE_FLAGS += \ LIBS="-lm -lnl-tiny" \ V=1 -ifneq ($(CONFIG_LINUX_2_6),) - define Package/iw/install +define Package/iw/install $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_BUILD_DIR)/iw $(1)/usr/sbin/ - endef -endif +endef $(eval $(call BuildPackage,iw)) diff --git a/package/kernel/modules/block.mk b/package/kernel/modules/block.mk index 8a4c68a882..25024c6979 100644 --- a/package/kernel/modules/block.mk +++ b/package/kernel/modules/block.mk @@ -10,7 +10,6 @@ BLOCK_MENU:=Block Devices define KernelPackage/aoe SUBMENU:=$(BLOCK_MENU) TITLE:=ATA over Ethernet support - DEPENDS:=@LINUX_2_6 KCONFIG:=CONFIG_ATA_OVER_ETH FILES:=$(LINUX_DIR)/drivers/block/aoe/aoe.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,30,aoe) @@ -26,7 +25,7 @@ $(eval $(call KernelPackage,aoe)) define KernelPackage/ata-core SUBMENU:=$(BLOCK_MENU) TITLE:=Serial and Parallel ATA support - DEPENDS:=@PCI_SUPPORT @LINUX_2_6 +kmod-scsi-core @(!TARGET_ubicom32||!TARGET_etrax||!TARGET_x86) + DEPENDS:=@PCI_SUPPORT +kmod-scsi-core @(!TARGET_ubicom32||!TARGET_etrax||!TARGET_x86) KCONFIG:=CONFIG_ATA FILES:=$(LINUX_DIR)/drivers/ata/libata.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,21,libata,1) @@ -165,7 +164,6 @@ $(eval $(call KernelPackage,ata-via-sata)) define KernelPackage/block2mtd SUBMENU:=$(BLOCK_MENU) TITLE:=Block device MTD emulation - DEPENDS:=@LINUX_2_6 KCONFIG:=CONFIG_MTD_BLOCK2MTD FILES:=$(LINUX_DIR)/drivers/mtd/devices/block2mtd.$(LINUX_KMOD_SUFFIX) endef @@ -176,7 +174,6 @@ $(eval $(call KernelPackage,block2mtd)) define KernelPackage/dm SUBMENU:=$(BLOCK_MENU) TITLE:=Device Mapper - DEPENDS:=@LINUX_2_6 # All the "=n" are unnecessary, they're only there # to stop the config from asking the question. # MIRROR is M because I've needed it for pvmove. @@ -283,7 +280,6 @@ $(eval $(call KernelPackage,ide-generic)) define KernelPackage/ide-generic-old SUBMENU:=$(BLOCK_MENU) - DEPENDS:=@LINUX_2_6 TITLE:=Kernel support for generic (legacy) IDE chipsets KCONFIG:=CONFIG_IDE_GENERIC FILES:=$(LINUX_DIR)/drivers/ide/ide-generic.$(LINUX_KMOD_SUFFIX) @@ -337,7 +333,7 @@ $(eval $(call KernelPackage,ide-pdc202xx)) define KernelPackage/ide-it821x TITLE:=ITE IT821x IDE driver - DEPENDS:=@LINUX_2_6 @PCI_SUPPORT + DEPENDS:=@PCI_SUPPORT KCONFIG:=CONFIG_BLK_DEV_IT821X FILES=$(LINUX_DIR)/drivers/ide/it821x.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,30,it821x,1) diff --git a/package/kernel/modules/crypto.mk b/package/kernel/modules/crypto.mk index a371e96116..d2c9dc4993 100644 --- a/package/kernel/modules/crypto.mk +++ b/package/kernel/modules/crypto.mk @@ -14,14 +14,12 @@ CRYPTO_MENU:=Cryptographic API modules # - sha1 > sha1_generic (2.6.24) # - sha256 > sha256_generic (2.6.24) # - sha512 > sha512_generic (2.6.26) -ifneq ($(CONFIG_LINUX_2_6),) - CRYPTO_GENERIC:=_generic - AES_SUFFIX:=$(CRYPTO_GENERIC) - DES_SUFFIX:=$(CRYPTO_GENERIC) - SHA1_SUFFIX:=$(CRYPTO_GENERIC) - SHA256_SUFFIX:=$(CRYPTO_GENERIC) - SHA512_SUFFIX:=$(CRYPTO_GENERIC) -endif +CRYPTO_GENERIC:=_generic +AES_SUFFIX:=$(CRYPTO_GENERIC) +DES_SUFFIX:=$(CRYPTO_GENERIC) +SHA1_SUFFIX:=$(CRYPTO_GENERIC) +SHA256_SUFFIX:=$(CRYPTO_GENERIC) +SHA512_SUFFIX:=$(CRYPTO_GENERIC) CRYPTO_MODULES = \ ALGAPI=crypto_algapi \ @@ -64,7 +62,6 @@ endef define KernelPackage/crypto-hw-padlock TITLE:=VIA PadLock ACE with AES/SHA hw crypto module - DEPENDS:=@LINUX_2_6 KCONFIG:= \ CONFIG_CRYPTO_HW=y \ CONFIG_CRYPTO_DEV_PADLOCK \ @@ -82,7 +79,6 @@ $(eval $(call KernelPackage,crypto-hw-padlock)) define KernelPackage/crypto-hw-geode TITLE:=AMD Geode hardware crypto module - DEPENDS:=@LINUX_2_6 KCONFIG:= \ CONFIG_CRYPTO_HW=y \ CONFIG_CRYPTO_DEV_GEODE @@ -96,7 +92,7 @@ $(eval $(call KernelPackage,crypto-hw-geode)) define KernelPackage/crypto-hw-hifn-795x TITLE:=HIFN 795x crypto accelerator - DEPENDS:=@LINUX_2_6 @!TARGET_ubicom32 + DEPENDS:=@!TARGET_ubicom32 KCONFIG:= \ CONFIG_CRYPTO_HW=y \ CONFIG_HW_RANDOM=y \ diff --git a/package/kernel/modules/fs.mk b/package/kernel/modules/fs.mk index d411b1e518..6cbf4450ff 100644 --- a/package/kernel/modules/fs.mk +++ b/package/kernel/modules/fs.mk @@ -26,7 +26,7 @@ define KernelPackage/fs-btrfs SUBMENU:=$(FS_MENU) TITLE:=BTRFS filesystem support # for crc32c - DEPENDS:=@LINUX_2_6 +kmod-crypto-core +kmod-crypto-misc + DEPENDS:=+kmod-crypto-core +kmod-crypto-misc KCONFIG:=\ CONFIG_LIBCRC32C \ CONFIG_BTRFS_FS \ @@ -120,7 +120,7 @@ define KernelPackage/fs-ext4 CONFIG_EXT4_FS_SECURITY=y \ CONFIG_EXT4_FS \ CONFIG_JBD2 - DEPENDS:= @LINUX_2_6 $(if $(DUMP)$(CONFIG_FS_MBCACHE),+kmod-fs-mbcache) + DEPENDS:= $(if $(DUMP)$(CONFIG_FS_MBCACHE),+kmod-fs-mbcache) FILES:= \ $(LINUX_DIR)/fs/ext4/ext4.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/fs/jbd2/jbd2.$(LINUX_KMOD_SUFFIX) @@ -277,7 +277,7 @@ define KernelPackage/fs-nfs-common-v4 CONFIG_SUNRPC_GSS\ CONFIG_NFS_V4=y\ CONFIG_NFSD_V4=y - DEPENDS:= @LINUX_2_6 @BROKEN + DEPENDS:= @BROKEN FILES+=$(LINUX_DIR)/net/sunrpc/auth_gss/auth_rpcgss.$(LINUX_KMOD_SUFFIX) AUTOLOAD=$(call AutoLoad,30,auth_rpcgss) endef diff --git a/package/kernel/modules/hwmon.mk b/package/kernel/modules/hwmon.mk index 1e97c3733a..3b4a39c75a 100644 --- a/package/kernel/modules/hwmon.mk +++ b/package/kernel/modules/hwmon.mk @@ -10,7 +10,6 @@ HWMON_MENU:=Hardware Monitoring Support define KernelPackage/hwmon-core SUBMENU:=$(HWMON_MENU) TITLE:=Hardware monitoring support - DEPENDS:=@LINUX_2_6 KCONFIG:= \ CONFIG_HWMON \ CONFIG_HWMON_DEBUG_CHIP=n diff --git a/package/kernel/modules/i2c.mk b/package/kernel/modules/i2c.mk index 86f1b3bd9b..2d2a3e908a 100644 --- a/package/kernel/modules/i2c.mk +++ b/package/kernel/modules/i2c.mk @@ -27,7 +27,7 @@ I2C_CORE_MODULES:= \ define KernelPackage/i2c-core $(call i2c_defaults,$(I2C_CORE_MODULES),51) TITLE:=I2C support - DEPENDS:=@LINUX_2_6 @!TARGET_etrax + DEPENDS:=@!TARGET_etrax endef define KernelPackage/i2c-core/description diff --git a/package/kernel/modules/netdevices.mk b/package/kernel/modules/netdevices.mk index 241fbfe692..9095357146 100644 --- a/package/kernel/modules/netdevices.mk +++ b/package/kernel/modules/netdevices.mk @@ -10,7 +10,6 @@ NETWORK_DEVICES_MENU:=Network Devices define KernelPackage/libphy SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=PHY library - DEPENDS:=@LINUX_2_6 KCONFIG:=CONFIG_PHYLIB FILES:=$(LINUX_DIR)/drivers/net/phy/libphy.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,40,libphy) @@ -321,7 +320,7 @@ define KernelPackage/tg3 TITLE:=Broadcom Tigon3 Gigabit Ethernet FILES:=$(LINUX_DIR)/drivers/net/tg3.$(LINUX_KMOD_SUFFIX) KCONFIG:=CONFIG_TIGON3 - DEPENDS:=@LINUX_2_6 +!TARGET_brcm47xx:kmod-libphy @!TARGET_ubicom32 + DEPENDS:=+!TARGET_brcm47xx:kmod-libphy @!TARGET_ubicom32 SUBMENU:=$(NETWORK_DEVICES_MENU) AUTOLOAD:=$(call AutoLoad,50,tg3) endef @@ -349,7 +348,7 @@ $(eval $(call KernelPackage,ssb-gige)) define KernelPackage/hfcmulti TITLE:=HFC multiport cards (HFC-4S/8S/E1) KCONFIG:=CONFIG_MISDN_HFCMULTI - DEPENDS:=@LINUX_2_6 +kmod-misdn + DEPENDS:=+kmod-misdn SUBMENU:=$(NETWORK_DEVICES_MENU) FILES:=$(LINUX_DIR)/drivers/isdn/hardware/mISDN/hfcmulti.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,31,hfcmulti) @@ -365,7 +364,7 @@ $(eval $(call KernelPackage,hfcmulti)) define KernelPackage/gigaset SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=Siemens Gigaset support (isdn) - DEPENDS:=@LINUX_2_6 @USB_SUPPORT +kmod-isdn4linux +kmod-crc-ccitt +kmod-usb-core + DEPENDS:=@USB_SUPPORT +kmod-isdn4linux +kmod-crc-ccitt +kmod-usb-core URL:=http://gigaset307x.sourceforge.net/ KCONFIG:= \ CONFIG_ISDN_DRV_GIGASET \ @@ -395,7 +394,6 @@ $(eval $(call KernelPackage,gigaset)) define KernelPackage/macvlan SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=MAC-VLAN support - DEPENDS:=@LINUX_2_6 KCONFIG:=CONFIG_MACVLAN FILES:=$(LINUX_DIR)/drivers/net/macvlan.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,50,macvlan) @@ -411,7 +409,6 @@ $(eval $(call KernelPackage,macvlan)) define KernelPackage/tulip TITLE:=Tulip family network device support SUBMENU:=$(NETWORK_DEVICES_MENU) - DEPENDS:=@LINUX_2_6 KCONFIG:= \ CONFIG_NET_TULIP=y \ CONFIG_DE2104X \ diff --git a/package/kernel/modules/netfilter.mk b/package/kernel/modules/netfilter.mk index 3fbd641318..54d2ba4dd5 100644 --- a/package/kernel/modules/netfilter.mk +++ b/package/kernel/modules/netfilter.mk @@ -86,7 +86,7 @@ define KernelPackage/ipt-filter KCONFIG:=$(KCONFIG_IPT_FILTER) FILES:=$(foreach mod,$(IPT_FILTER-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_FILTER-m))) - $(call AddDepends/ipt,+LINUX_2_6:kmod-textsearch) + $(call AddDepends/ipt,+kmod-textsearch) endef define KernelPackage/ipt-filter/description @@ -206,7 +206,7 @@ define KernelPackage/ipt-nathelper-extra KCONFIG:=$(KCONFIG_IPT_NATHELPER_EXTRA) FILES:=$(foreach mod,$(IPT_NATHELPER_EXTRA-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_NATHELPER_EXTRA-m))) - $(call AddDepends/ipt,+kmod-ipt-nat +LINUX_2_6:kmod-textsearch) + $(call AddDepends/ipt,+kmod-ipt-nat +kmod-textsearch) endef define KernelPackage/ipt-nathelper-extra/description @@ -285,7 +285,6 @@ $(eval $(call KernelPackage,ipt-ulog)) define KernelPackage/ipt-tproxy TITLE:=Transparent proxying support - DEPENDS:=@LINUX_2_6 KCONFIG:= \ CONFIG_NETFILTER_TPROXY \ CONFIG_NETFILTER_XT_MATCH_SOCKET \ @@ -378,7 +377,6 @@ $(eval $(call KernelPackage,arptables)) define KernelPackage/ebtables SUBMENU:=$(NF_MENU) TITLE:=Bridge firewalling modules - DEPENDS:=@LINUX_2_6 FILES:=$(foreach mod,$(EBTABLES-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) KCONFIG:=CONFIG_BRIDGE_NETFILTER=y \ $(KCONFIG_EBTABLES) @@ -451,7 +449,7 @@ $(eval $(call KernelPackage,ebtables-watchers)) define KernelPackage/nfnetlink SUBMENU:=$(NF_MENU) TITLE:=Netlink-based userspace interface - DEPENDS:=@LINUX_2_6 +kmod-ipt-core + DEPENDS:=+kmod-ipt-core FILES:=$(LINUX_DIR)/net/netfilter/nfnetlink.$(LINUX_KMOD_SUFFIX) KCONFIG:=CONFIG_NETFILTER_NETLINK AUTOLOAD:=$(call AutoLoad,48,nfnetlink) @@ -466,7 +464,7 @@ $(eval $(call KernelPackage,nfnetlink)) define AddDepends/nfnetlink SUBMENU:=$(NF_MENU) - DEPENDS+=@LINUX_2_6 +kmod-nfnetlink $(1) + DEPENDS+=+kmod-nfnetlink $(1) endef diff --git a/package/kernel/modules/netsupport.mk b/package/kernel/modules/netsupport.mk index 32448d4811..0ad636fbdb 100644 --- a/package/kernel/modules/netsupport.mk +++ b/package/kernel/modules/netsupport.mk @@ -10,7 +10,6 @@ NETWORK_SUPPORT_MENU:=Network Support define KernelPackage/atm SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=ATM support - DEPENDS:=@LINUX_2_6 KCONFIG:= \ CONFIG_ATM \ CONFIG_ATM_BR2684 @@ -30,7 +29,7 @@ $(eval $(call KernelPackage,atm)) define KernelPackage/atmtcp SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=ATM over TCP - DEPENDS:=@LINUX_2_6 kmod-atm + DEPENDS:=kmod-atm KCONFIG:=CONFIG_ATM_TCP CONFIG_ATM_DRIVERS=y FILES:=$(LINUX_DIR)/drivers/atm/atmtcp.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,40,atmtcp) @@ -46,7 +45,6 @@ $(eval $(call KernelPackage,atmtcp)) define KernelPackage/appletalk SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=Appletalk protocol support - DEPENDS:=@LINUX_2_6 KCONFIG:= \ CONFIG_ATALK \ CONFIG_DEV_APPLETALK \ @@ -84,7 +82,6 @@ $(eval $(call KernelPackage,bonding)) define KernelPackage/capi SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=CAPI (ISDN) Support - DEPENDS:=@LINUX_2_6 KCONFIG:= \ CONFIG_ISDN_CAPI \ CONFIG_ISDN_CAPI_CAPI20 \ @@ -128,7 +125,6 @@ $(eval $(call KernelPackage,misdn)) define KernelPackage/isdn4linux SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=Old ISDN4Linux (deprecated) - DEPENDS:=@LINUX_2_6 KCONFIG:= \ CONFIG_ISDN=y \ CONFIG_ISDN_I4L \ @@ -160,7 +156,7 @@ $(eval $(call KernelPackage,isdn4linux)) define KernelPackage/ipip SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=IP-in-IP encapsulation - DEPENDS:=+LINUX_2_6:kmod-iptunnel4 + DEPENDS:=+kmod-iptunnel4 KCONFIG:=CONFIG_NET_IPIP FILES:=$(LINUX_DIR)/net/ipv4/ipip.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,32,ipip) @@ -181,7 +177,7 @@ IPSEC-m:= \ define KernelPackage/ipsec SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=IPsec related modules (IPv4 and IPv6) - DEPENDS:=@LINUX_2_6 +kmod-crypto-core +kmod-crypto-des +kmod-crypto-hmac +kmod-crypto-md5 +kmod-crypto-sha1 + DEPENDS:=+kmod-crypto-core +kmod-crypto-des +kmod-crypto-hmac +kmod-crypto-md5 +kmod-crypto-sha1 KCONFIG:= \ CONFIG_NET_KEY \ CONFIG_XFRM_USER \ @@ -285,7 +281,6 @@ $(eval $(call KernelPackage,ipsec6)) define KernelPackage/iptunnel4 SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=IPv4 tunneling - DEPENDS:=@LINUX_2_6 KCONFIG:= \ CONFIG_NET_IPIP \ CONFIG_INET_TUNNEL @@ -303,7 +298,7 @@ $(eval $(call KernelPackage,iptunnel4)) define KernelPackage/iptunnel6 SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=IPv6 tunneling - DEPENDS:= @LINUX_2_6 +kmod-ipv6 + DEPENDS:= +kmod-ipv6 KCONFIG:= \ CONFIG_INET6_TUNNEL FILES:=$(LINUX_DIR)/net/ipv6/tunnel6.$(LINUX_KMOD_SUFFIX) @@ -357,7 +352,7 @@ $(eval $(call KernelPackage,sit)) define KernelPackage/ip6-tunnel SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=IP-in-IPv6 tunnelling - DEPENDS:= @LINUX_2_6 +kmod-ipv6 +kmod-iptunnel6 + DEPENDS:= +kmod-ipv6 +kmod-iptunnel6 KCONFIG:= CONFIG_IPV6_TUNNEL FILES:= $(foreach mod,ip6_tunnel, \ $(LINUX_DIR)/net/ipv6/$(mod).$(LINUX_KMOD_SUFFIX) \ @@ -404,7 +399,7 @@ $(eval $(call KernelPackage,tun)) define KernelPackage/ppp SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=PPP modules - DEPENDS:=+LINUX_2_6:kmod-crc-ccitt + DEPENDS:=+kmod-crc-ccitt KCONFIG:= \ CONFIG_PPP \ CONFIG_PPP_ASYNC \ @@ -475,7 +470,7 @@ $(eval $(call KernelPackage,pppoa)) define KernelPackage/pppol2tp SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=PPPoL2TP support - DEPENDS:=@LINUX_2_6 kmod-ppp +kmod-pppoe + DEPENDS:=kmod-ppp +kmod-pppoe KCONFIG:=CONFIG_PPPOL2TP FILES:=$(LINUX_DIR)/drivers/net/pppol2tp.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,40,pppol2tp) @@ -590,7 +585,6 @@ $(eval $(call KernelPackage,ax25)) define KernelPackage/mp-alg SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=ECMP caching algorithms - DEPENDS:=@LINUX_2_6 KCONFIG:= \ CONFIG_IP_ROUTE_MULTIPATH_RR \ CONFIG_IP_ROUTE_MULTIPATH_RANDOM \ @@ -618,7 +612,6 @@ $(eval $(call KernelPackage,mp-alg)) define KernelPackage/pktgen SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=Network packet generator - DEPENDS:=@LINUX_2_6 KCONFIG:=CONFIG_NET_PKTGEN FILES:=$(LINUX_DIR)/net/core/pktgen.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,99,pktgen) diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk index 960b730d83..071645984b 100644 --- a/package/kernel/modules/other.mk +++ b/package/kernel/modules/other.mk @@ -57,7 +57,6 @@ $(eval $(call KernelPackage,bluetooth)) define KernelPackage/crc-ccitt SUBMENU:=$(OTHER_MENU) TITLE:=CRC-CCITT support - DEPENDS:=@LINUX_2_6 KCONFIG:=CONFIG_CRC_CCITT FILES:=$(LINUX_DIR)/lib/crc-ccitt.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,20,crc-ccitt) @@ -73,7 +72,6 @@ $(eval $(call KernelPackage,crc-ccitt)) define KernelPackage/crc-itu-t SUBMENU:=$(OTHER_MENU) TITLE:=CRC ITU-T V.41 support - DEPENDS:=@LINUX_2_6 KCONFIG:=CONFIG_CRC_ITU_T FILES:=$(LINUX_DIR)/lib/crc-itu-t.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,20,crc-itu-t) @@ -89,7 +87,6 @@ $(eval $(call KernelPackage,crc-itu-t)) define KernelPackage/crc7 SUBMENU:=$(OTHER_MENU) TITLE:=CRC7 support - DEPENDS:=@LINUX_2_6 KCONFIG:=CONFIG_CRC7 FILES:=$(LINUX_DIR)/lib/crc7.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,20,crc7) @@ -121,7 +118,6 @@ $(eval $(call KernelPackage,crc16)) define KernelPackage/eeprom-93cx6 SUBMENU:=$(OTHER_MENU) TITLE:=EEPROM 93CX6 support - DEPENDS:=@LINUX_2_6 KCONFIG:=CONFIG_EEPROM_93CX6 FILES:=$(LINUX_DIR)/drivers/misc/eeprom/eeprom_93cx6.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,20,eeprom_93cx6) @@ -333,7 +329,6 @@ $(eval $(call KernelPackage,input-joydev)) define KernelPackage/input-polldev SUBMENU:=$(OTHER_MENU) TITLE:=Polled Input device support - DEPENDS:=@LINUX_2_6 KCONFIG:=CONFIG_INPUT_POLLDEV FILES:=$(LINUX_DIR)/drivers/input/input-polldev.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,20,input-polldev) @@ -446,7 +441,6 @@ $(eval $(call KernelPackage,leds-wrap)) define KernelPackage/ledtrig-morse SUBMENU:=$(OTHER_MENU) TITLE:=LED Morse Trigger - DEPENDS:=@LINUX_2_6 KCONFIG:=CONFIG_LEDS_TRIGGER_MORSE FILES:=$(LINUX_DIR)/drivers/leds/ledtrig-morse.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,50,ledtrig-morse) @@ -462,7 +456,6 @@ $(eval $(call KernelPackage,ledtrig-morse)) define KernelPackage/ledtrig-netdev SUBMENU:=$(OTHER_MENU) TITLE:=LED NETDEV Trigger - DEPENDS:=@LINUX_2_6 KCONFIG:=CONFIG_LEDS_TRIGGER_NETDEV FILES:=$(LINUX_DIR)/drivers/leds/ledtrig-netdev.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,50,ledtrig-netdev) @@ -496,7 +489,6 @@ $(eval $(call KernelPackage,lp)) define KernelPackage/mmc SUBMENU:=$(OTHER_MENU) TITLE:=MMC/SD Card Support - DEPENDS:=@LINUX_2_6 KCONFIG:= \ CONFIG_MMC \ CONFIG_MMC_BLOCK \ @@ -582,7 +574,7 @@ $(eval $(call KernelPackage,softdog)) define KernelPackage/ssb SUBMENU:=$(OTHER_MENU) TITLE:=Silicon Sonics Backplane glue code - DEPENDS:=@LINUX_2_6 @PCI_SUPPORT @!TARGET_brcm47xx @!TARGET_brcm63xx + DEPENDS:=@PCI_SUPPORT @!TARGET_brcm47xx @!TARGET_brcm63xx KCONFIG:=\ CONFIG_SSB \ CONFIG_SSB_B43_PCI_BRIDGE=y \ @@ -608,7 +600,6 @@ $(eval $(call KernelPackage,ssb)) define KernelPackage/textsearch SUBMENU:=$(OTHER_MENU) TITLE:=Textsearch support is selected if needed - DEPENDS:=@LINUX_2_6 KCONFIG:= \ CONFIG_TEXTSEARCH=y \ CONFIG_TEXTSEARCH_KMP \ @@ -627,7 +618,7 @@ $(eval $(call KernelPackage,textsearch)) define KernelPackage/wdt-geode SUBMENU:=$(OTHER_MENU) TITLE:=Geode/LX Watchdog timer - DEPENDS:=@TARGET_x86 @LINUX_2_6 + DEPENDS:=@TARGET_x86 KCONFIG:=CONFIG_GEODE_WDT FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/geodewdt.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,50,geodewdt) diff --git a/package/kernel/modules/pcmcia.mk b/package/kernel/modules/pcmcia.mk index 5e5c765511..e782e7b239 100644 --- a/package/kernel/modules/pcmcia.mk +++ b/package/kernel/modules/pcmcia.mk @@ -50,7 +50,7 @@ $(eval $(call KernelPackage,pcmcia-core)) define KernelPackage/pcmcia-yenta SUBMENU:=$(PCMCIA_MENU) TITLE:=yenta socket driver - DEPENDS:=@LINUX_2_6 kmod-pcmcia-core + DEPENDS:=kmod-pcmcia-core KCONFIG:= \ CONFIG_PCCARD_NONSTATIC \ CONFIG_YENTA diff --git a/package/kernel/modules/sound.mk b/package/kernel/modules/sound.mk index 8a1b4ef63c..f925ebce75 100644 --- a/package/kernel/modules/sound.mk +++ b/package/kernel/modules/sound.mk @@ -10,7 +10,6 @@ SOUND_MENU:=Sound Support define KernelPackage/pcspkr SUBMENU:=$(SOUND_MENU) TITLE:=PC speaker support - DEPENDS:=@LINUX_2_6 KCONFIG:=CONFIG_INPUT_PCSPKR FILES:=$(LINUX_DIR)/drivers/input/misc/pcspkr.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,50,pcspkr) diff --git a/package/kernel/modules/spi.mk b/package/kernel/modules/spi.mk index 94c98548e9..ccba3c2b43 100644 --- a/package/kernel/modules/spi.mk +++ b/package/kernel/modules/spi.mk @@ -10,7 +10,7 @@ SPI_MENU:=SPI Support define KernelPackage/mmc-spi SUBMENU:=$(SPI_MENU) TITLE:=MMC/SD over SPI Support - DEPENDS:=@LINUX_2_6 +kmod-mmc +kmod-crc-itu-t +kmod-crc7 + DEPENDS:=+kmod-mmc +kmod-crc-itu-t +kmod-crc7 KCONFIG:=CONFIG_MMC_SPI \ CONFIG_SPI=y \ CONFIG_SPI_MASTER=y @@ -28,7 +28,6 @@ $(eval $(call KernelPackage,mmc-spi)) define KernelPackage/spi-bitbang SUBMENU:=$(SPI_MENU) TITLE:=Serial Peripheral Interface bitbanging library - DEPENDS:=@LINUX_2_6 KCONFIG:=CONFIG_SPI_BITBANG \ CONFIG_SPI=y \ CONFIG_SPI_MASTER=y @@ -76,7 +75,6 @@ $(eval $(call KernelPackage,spi-gpio)) define KernelPackage/spi-dev SUBMENU:=$(SPI_MENU) TITLE:=User mode SPI device driver - DEPENDS:=@LINUX_2_6 KCONFIG:=CONFIG_SPI_SPIDEV \ CONFIG_SPI=y \ CONFIG_SPI_MASTER=y diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk index dc0479f605..5acc23a572 100644 --- a/package/kernel/modules/usb.mk +++ b/package/kernel/modules/usb.mk @@ -14,7 +14,7 @@ USBINPUT_DIR?=input/misc define KernelPackage/usb-core SUBMENU:=$(USB_MENU) TITLE:=Support for USB - DEPENDS:=@USB_SUPPORT +LINUX_2_6_31:kmod-nls-base +LINUX_2_6_32:kmod-nls-base +LINUX_2_6_33:kmod-nls-base +LINUX_2_6_34:kmod-nls-base + DEPENDS:=@USB_SUPPORT +kmod-nls-base KCONFIG:=CONFIG_USB FILES:=$(LINUX_DIR)/drivers/usb/core/usbcore.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,20,usbcore,1) @@ -176,7 +176,6 @@ endef define KernelPackage/usb-serial-airprime TITLE:=Support for Airprime (EVDO) - DEPENDS:=@LINUX_2_6 KCONFIG:=CONFIG_USB_SERIAL_AIRPRIME FILES:=$(LINUX_DIR)/drivers/usb/serial/airprime.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,65,airprime) @@ -207,7 +206,6 @@ $(eval $(call KernelPackage,usb-serial-belkin)) define KernelPackage/usb-serial-ch341 TITLE:=Support for CH341 devices - DEPENDS:=@LINUX_2_6 KCONFIG:=CONFIG_USB_SERIAL_CH341 FILES:=$(LINUX_DIR)/drivers/usb/serial/ch341.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,65,ch341) @@ -268,7 +266,6 @@ $(eval $(call KernelPackage,usb-serial-pl2303)) define KernelPackage/usb-serial-cp210x TITLE:=Support for Silicon Labs cp210x devices - DEPENDS:=@LINUX_2_6 KCONFIG:=CONFIG_USB_SERIAL_CP210X FILES:=$(LINUX_DIR)/drivers/usb/serial/cp210x.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,65,cp210x) @@ -284,7 +281,6 @@ $(eval $(call KernelPackage,usb-serial-cp210x)) define KernelPackage/usb-serial-ark3116 TITLE:=Support for ArkMicroChips ARK3116 devices - DEPENDS:=@LINUX_2_6 KCONFIG:=CONFIG_USB_SERIAL_ARK3116 FILES:=$(LINUX_DIR)/drivers/usb/serial/ark3116.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,65,ark3116) @@ -300,7 +296,6 @@ $(eval $(call KernelPackage,usb-serial-ark3116)) define KernelPackage/usb-serial-oti6858 TITLE:=Support for Ours Technology OTI6858 devices - DEPENDS:=@LINUX_2_6 KCONFIG:=CONFIG_USB_SERIAL_OTI6858 FILES:=$(LINUX_DIR)/drivers/usb/serial/oti6858.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,65,oti6858) @@ -331,7 +326,6 @@ $(eval $(call KernelPackage,usb-serial-sierrawireless)) define KernelPackage/usb-serial-motorola-phone TITLE:=Support for Motorola usb phone - DEPENDS:=@LINUX_2_6 KCONFIG:=CONFIG_USB_SERIAL_MOTOROLA FILES:=$(LINUX_DIR)/drivers/usb/serial/moto_modem.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,65,moto_modem) @@ -362,7 +356,6 @@ $(eval $(call KernelPackage,usb-serial-visor)) define KernelPackage/usb-serial-cypress-m8 TITLE:=Support for CypressM8 USB-Serial - DEPENDS:=@LINUX_2_6 KCONFIG:=CONFIG_USB_SERIAL_CYPRESS_M8 FILES:=$(LINUX_DIR)/drivers/usb/serial/cypress_m8.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,65,cypress_m8) @@ -409,7 +402,6 @@ $(eval $(call KernelPackage,usb-serial-keyspan)) define KernelPackage/usb-serial-option TITLE:=Support for Option HSDPA modems - DEPENDS:=@LINUX_2_6 KCONFIG:=CONFIG_USB_SERIAL_OPTION FILES:=$(LINUX_DIR)/drivers/usb/serial/option.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,65,option) @@ -442,7 +434,7 @@ $(eval $(call KernelPackage,usb-storage)) define KernelPackage/usb-storage-extras SUBMENU:=$(USB_MENU) TITLE:=Extra drivers for usb-storage - DEPENDS:=@LINUX_2_6 +kmod-usb-storage + DEPENDS:=+kmod-usb-storage KCONFIG:= \ CONFIG_USB_STORAGE_ALAUDA \ CONFIG_USB_STORAGE_CYPRESS_ATACB \ @@ -480,7 +472,6 @@ $(eval $(call KernelPackage,usb-storage-extras)) define KernelPackage/usb-video TITLE:=Support for USB video devices - DEPENDS:=@LINUX_2_6 KCONFIG:=CONFIG_VIDEO_USBVIDEO FILES:=$(LINUX_DIR)/drivers/media/video/usbvideo/usbvideo.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,61,usbvideo) @@ -496,7 +487,7 @@ $(eval $(call KernelPackage,usb-video)) define KernelPackage/usb-atm TITLE:=Support for ATM on USB bus - DEPENDS:=@LINUX_2_6 +kmod-atm + DEPENDS:=+kmod-atm KCONFIG:=CONFIG_USB_ATM FILES:=$(LINUX_DIR)/drivers/usb/atm/usbatm.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,60,usbatm) @@ -518,7 +509,6 @@ endef define KernelPackage/usb-atm-speedtouch TITLE:=SpeedTouch USB ADSL modems support - DEPENDS:=@LINUX_2_6 KCONFIG:=CONFIG_USB_SPEEDTOUCH FILES:=$(LINUX_DIR)/drivers/usb/atm/speedtch.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,70,speedtch) @@ -534,7 +524,6 @@ $(eval $(call KernelPackage,usb-atm-speedtouch)) define KernelPackage/usb-atm-ueagle TITLE:=Eagle 8051 based USB ADSL modems support - DEPENDS:=@LINUX_2_6 FILES:=$(LINUX_DIR)/drivers/usb/atm/ueagle-atm.$(LINUX_KMOD_SUFFIX) KCONFIG:=CONFIG_USB_UEAGLEATM AUTOLOAD:=$(call AutoLoad,70,ueagle-atm) @@ -550,7 +539,6 @@ $(eval $(call KernelPackage,usb-atm-ueagle)) define KernelPackage/usb-atm-cxacru TITLE:=cxacru - DEPENDS:=@LINUX_2_6 FILES:=$(LINUX_DIR)/drivers/usb/atm/cxacru.$(LINUX_KMOD_SUFFIX) KCONFIG:=CONFIG_USB_CXACRU AUTOLOAD:=$(call AutoLoad,70,cxacru) @@ -587,7 +575,6 @@ endef define KernelPackage/usb-net-asix TITLE:=Kernel module for USB-to-Ethernet Asix convertors - DEPENDS:=@LINUX_2_6 KCONFIG:=CONFIG_USB_NET_AX8817X FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/asix.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,61,asix) @@ -603,7 +590,6 @@ $(eval $(call KernelPackage,usb-net-asix)) define KernelPackage/usb-net-hso TITLE:=Kernel module for Option USB High Speed Mobile Devices - DEPENDS:=@LINUX_2_6 KCONFIG:=CONFIG_USB_HSO FILES:= \ $(LINUX_DIR)/drivers/$(USBNET_DIR)/hso.$(LINUX_KMOD_SUFFIX) @@ -621,7 +607,6 @@ $(eval $(call KernelPackage,usb-net-hso)) define KernelPackage/usb-net-kaweth TITLE:=Kernel module for USB-to-Ethernet Kaweth convertors - DEPENDS:=@LINUX_2_6 KCONFIG:=CONFIG_USB_KAWETH FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/kaweth.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,61,kaweth) @@ -637,7 +622,6 @@ $(eval $(call KernelPackage,usb-net-kaweth)) define KernelPackage/usb-net-pegasus TITLE:=Kernel module for USB-to-Ethernet Pegasus convertors - DEPENDS:=@LINUX_2_6 KCONFIG:=CONFIG_USB_PEGASUS FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/pegasus.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,61,pegasus) @@ -653,7 +637,6 @@ $(eval $(call KernelPackage,usb-net-pegasus)) define KernelPackage/usb-net-mcs7830 TITLE:=Kernel module for USB-to-Ethernet MCS7830 convertors - DEPENDS:=@LINUX_2_6 KCONFIG:=CONFIG_USB_NET_MCS7830 FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/mcs7830.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,61,mcs7830) @@ -669,7 +652,6 @@ $(eval $(call KernelPackage,usb-net-mcs7830)) define KernelPackage/usb-net-dm9601-ether TITLE:=Support for DM9601 ethernet connections - DEPENDS:=@LINUX_2_6 KCONFIG:=CONFIG_USB_NET_DM9601 FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/dm9601.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,61,dm9601) @@ -684,7 +666,6 @@ $(eval $(call KernelPackage,usb-net-dm9601-ether)) define KernelPackage/usb-net-cdc-ether TITLE:=Support for cdc ethernet connections - DEPENDS:=@LINUX_2_6 KCONFIG:=CONFIG_USB_NET_CDCETHER FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/cdc_ether.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,61,cdc_ether) @@ -700,7 +681,6 @@ $(eval $(call KernelPackage,usb-net-cdc-ether)) define KernelPackage/usb-net-rndis TITLE:=Support for RNDIS connections - DEPENDS:=@LINUX_2_6 KCONFIG:=CONFIG_USB_NET_RNDIS_HOST FILES:= $(LINUX_DIR)/drivers/$(USBNET_DIR)/rndis_host.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,62,rndis_host) @@ -716,7 +696,6 @@ $(eval $(call KernelPackage,usb-net-rndis)) define KernelPackage/usb-hid TITLE:=Support for USB Human Input Devices - DEPENDS:=@LINUX_2_6 KCONFIG:=CONFIG_HID_SUPPORT=y CONFIG_USB_HID FILES:=$(LINUX_DIR)/drivers/$(USBHID_DIR)/usbhid.ko AUTOLOAD:=$(call AutoLoad,70,usbhid) @@ -735,7 +714,6 @@ $(eval $(call KernelPackage,usb-hid)) define KernelPackage/usb-yealink TITLE:=USB Yealink VOIP phone - DEPENDS:=@LINUX_2_6 KCONFIG:=CONFIG_USB_YEALINK CONFIG_INPUT_YEALINK CONFIG_INPUT=m CONFIG_INPUT_MISC=y FILES:=$(LINUX_DIR)/drivers/$(USBINPUT_DIR)/yealink.ko AUTOLOAD:=$(call AutoLoad,70,yealink) @@ -752,7 +730,6 @@ $(eval $(call KernelPackage,usb-yealink)) define KernelPackage/usb-cm109 TITLE:=Support for CM109 device - DEPENDS:=@LINUX_2_6 KCONFIG:=CONFIG_USB_CM109 CONFIG_INPUT_CM109 CONFIG_INPUT=m CONFIG_INPUT_MISC=y FILES:=$(LINUX_DIR)/drivers/$(USBINPUT_DIR)/cm109.ko AUTOLOAD:=$(call AutoLoad,70,cm109) @@ -769,7 +746,7 @@ $(eval $(call KernelPackage,usb-cm109)) define KernelPackage/usb-test TITLE:=USB Testing Driver - DEPENDS:=@LINUX_2_6 @DEVEL + DEPENDS:=@DEVEL KCONFIG:=CONFIG_USB_TEST FILES:=$(LINUX_DIR)/drivers/usb/misc/usbtest.ko $(call AddDepends/usb) @@ -784,7 +761,6 @@ $(eval $(call KernelPackage,usb-test)) define KernelPackage/usb-phidget TITLE:=USB Phidget Driver - DEPENDS:=@LINUX_2_6 KCONFIG:=CONFIG_USB_PHIDGET CONFIG_USB_PHIDGETKIT CONFIG_USB_PHIDGETMOTORCONTROL CONFIG_USB_PHIDGETSERVO FILES:=$(LINUX_DIR)/drivers/usb/misc/phidget*.ko $(call AddDepends/usb) diff --git a/package/kernel/modules/video.mk b/package/kernel/modules/video.mk index 170e3424f1..577d4115f9 100644 --- a/package/kernel/modules/video.mk +++ b/package/kernel/modules/video.mk @@ -53,7 +53,7 @@ endef define KernelPackage/video-cpia2 TITLE:=CPIA2 video driver - DEPENDS:=@LINUX_2_6 @USB_SUPPORT +kmod-usb-core + DEPENDS:=@USB_SUPPORT +kmod-usb-core KCONFIG:=CONFIG_VIDEO_CPIA2 FILES:=$(LINUX_DIR)/drivers/media/video/cpia2/cpia2.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,70,cpia2) @@ -69,7 +69,7 @@ $(eval $(call KernelPackage,video-cpia2)) define KernelPackage/video-konica TITLE:=Konica USB webcam support - DEPENDS:=@LINUX_2_6 @USB_SUPPORT +kmod-usb-core + DEPENDS:=@USB_SUPPORT +kmod-usb-core KCONFIG:=CONFIG_USB_KONICAWC FILES:=$(LINUX_DIR)/drivers/media/video/usbvideo/konicawc.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,70,konicawc) @@ -85,7 +85,7 @@ $(eval $(call KernelPackage,video-konica)) define KernelPackage/video-ov511 -$(call AddDepends/video,@LINUX_2_6 @USB_SUPPORT +kmod-usb-core) +$(call AddDepends/video,@USB_SUPPORT +kmod-usb-core) TITLE:=OV511 USB webcam support KCONFIG:=CONFIG_VIDEO_OV511 FILES:=$(LINUX_DIR)/drivers/media/video/ov511.$(LINUX_KMOD_SUFFIX) @@ -102,7 +102,7 @@ $(eval $(call KernelPackage,video-ov511)) define KernelPackage/video-ovcamchip -$(call AddDepends/video,@LINUX_2_6 @USB_SUPPORT +kmod-i2c-core) +$(call AddDepends/video,@USB_SUPPORT +kmod-i2c-core) TITLE:=OV6xxx/OV7xxx Camera Chip support KCONFIG:=CONFIG_VIDEO_OVCAMCHIP FILES:=$(LINUX_DIR)/drivers/media/video/ovcamchip/ovcamchip.$(LINUX_KMOD_SUFFIX) @@ -120,7 +120,7 @@ $(eval $(call KernelPackage,video-ovcamchip)) define KernelPackage/video-sn9c102 -$(call AddDepends/video,@LINUX_2_6 @USB_SUPPORT +kmod-usb-core) +$(call AddDepends/video,@USB_SUPPORT +kmod-usb-core) TITLE:=SN9C102 Camera Chip support KCONFIG:=CONFIG_USB_SN9C102 FILES:=$(LINUX_DIR)/drivers/media/video/sn9c102/sn9c102.$(LINUX_KMOD_SUFFIX) @@ -138,7 +138,7 @@ $(eval $(call KernelPackage,video-sn9c102)) define KernelPackage/video-pwc -$(call AddDepends/video,@LINUX_2_6 @USB_SUPPORT +kmod-usb-core) +$(call AddDepends/video,@USB_SUPPORT +kmod-usb-core) TITLE:=Philips USB webcam support KCONFIG:= \ CONFIG_USB_PWC \ @@ -156,7 +156,7 @@ endef $(eval $(call KernelPackage,video-pwc)) define KernelPackage/video-uvc -$(call AddDepends/video,@LINUX_2_6 @USB_SUPPORT +kmod-usb-core) +$(call AddDepends/video,@USB_SUPPORT +kmod-usb-core) TITLE:=USB Video Class (UVC) support KCONFIG:= CONFIG_USB_VIDEO_CLASS FILES:=$(LINUX_DIR)/drivers/media/video/uvc/uvcvideo.$(LINUX_KMOD_SUFFIX) @@ -175,7 +175,7 @@ $(eval $(call KernelPackage,video-uvc)) define KernelPackage/video-gspca-core MENU:=1 TITLE:=GSPCA webcam core support framework - DEPENDS:=@LINUX_2_6 @USB_SUPPORT +kmod-usb-core + DEPENDS:=@USB_SUPPORT +kmod-usb-core KCONFIG:=CONFIG_USB_GSPCA FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_main.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,70,gspca_main) diff --git a/package/kernel/modules/w1.mk b/package/kernel/modules/w1.mk index 1fa44e6d4e..578abd1176 100644 --- a/package/kernel/modules/w1.mk +++ b/package/kernel/modules/w1.mk @@ -12,7 +12,6 @@ W1_SLAVES_DIR:=$(LINUX_DIR)/drivers/w1/slaves define KernelPackage/w1 SUBMENU:=$(W1_MENU) TITLE:=Dallas's 1-wire support - DEPENDS:=@LINUX_2_6 KCONFIG:=CONFIG_W1 FILES:=$(LINUX_DIR)/drivers/w1/wire.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,50,wire) diff --git a/package/kernel/modules/wireless.mk b/package/kernel/modules/wireless.mk index 0818153b5d..d7afa48e2e 100644 --- a/package/kernel/modules/wireless.mk +++ b/package/kernel/modules/wireless.mk @@ -58,7 +58,7 @@ $(eval $(call KernelPackage,net-airo)) define KernelPackage/net-hermes SUBMENU:=$(WIRELESS_MENU) TITLE:=Hermes 802.11b chipset support - DEPENDS:=@LINUX_2_6 @PCI_SUPPORT||PCMCIA_SUPPORT + DEPENDS:=@PCI_SUPPORT||PCMCIA_SUPPORT KCONFIG:=CONFIG_HERMES \ CONFIG_HERMES_CACHE_FW_ON_INIT=n FILES:= \ diff --git a/package/libnl/Makefile b/package/libnl/Makefile index 6802ed16f8..eb9831a21e 100644 --- a/package/libnl/Makefile +++ b/package/libnl/Makefile @@ -37,18 +37,16 @@ define Build/Compile install endef -ifneq ($(CONFIG_LINUX_2_6),) - define Build/InstallDev +define Build/InstallDev $(INSTALL_DIR) $(1) $(CP) $(PKG_INSTALL_DIR)/* $(1)/ mkdir -p $(1)/usr/include/libnl $(CP) $(PKG_BUILD_DIR)/include/linux $(1)/usr/include/libnl/ - endef +endef - define Package/libnl/install +define Package/libnl/install $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnl.so.* $(1)/usr/lib/ - endef -endif +endef $(eval $(call BuildPackage,libnl)) diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile index c7078bc451..a46863b20d 100644 --- a/package/mac80211/Makefile +++ b/package/mac80211/Makefile @@ -35,7 +35,7 @@ define KernelPackage/mac80211/Default SUBMENU:=$(WMENU) URL:=http://linuxwireless.org/ MAINTAINER:=Felix Fietkau <nbd@openwrt.org> - DEPENDS:=@LINUX_2_6 @(!(TARGET_avr32||TARGET_ep93xx||TARGET_ps3||TARGET_pxcab)||BROKEN) + DEPENDS:=@(!(TARGET_avr32||TARGET_ep93xx||TARGET_ps3||TARGET_pxcab)||BROKEN) endef define KernelPackage/cfg80211 diff --git a/package/madwifi/Makefile b/package/madwifi/Makefile index 4f01f008fd..9a2d23faad 100644 --- a/package/madwifi/Makefile +++ b/package/madwifi/Makefile @@ -162,7 +162,7 @@ define KernelPackage/madwifi TITLE:=Driver for Atheros wireless chipsets URL:=http://madwifi-project.org/ MAINTAINER:=Felix Fietkau <nbd@openwrt.org> - DEPENDS:=+wireless-tools @LINUX_2_6 @PCI_SUPPORT @(!(TARGET_avr32||TARGET_cobalt||TARGET_ep93xx||TARGET_etrax||TARGET_octeon||TARGET_pxcab||TARGET_sibyte)||BROKEN) + DEPENDS:=+wireless-tools @PCI_SUPPORT @(!(TARGET_avr32||TARGET_cobalt||TARGET_ep93xx||TARGET_etrax||TARGET_octeon||TARGET_pxcab||TARGET_sibyte)||BROKEN) FILES:=$(MADWIFI_FILES) AUTOLOAD:=$(call AutoLoad,50,$(MADWIFI_AUTOLOAD)) MENU:=1 diff --git a/package/mountd/Makefile b/package/mountd/Makefile index bfee3585e8..e218783e91 100644 --- a/package/mountd/Makefile +++ b/package/mountd/Makefile @@ -17,7 +17,7 @@ define Package/mountd SECTION:=utils CATEGORY:=Utilities TITLE:=OpenWrt automount daemon - DEPENDS:=@LINUX_2_6 @USB_SUPPORT +uci +kmod-usb-storage +kmod-fs-autofs4 + DEPENDS:=@USB_SUPPORT +uci +kmod-usb-storage +kmod-fs-autofs4 URL:=http://www.openwrt.org endef diff --git a/package/spi-ks8995/Makefile b/package/spi-ks8995/Makefile index 84c5250ec0..7075faa9b8 100644 --- a/package/spi-ks8995/Makefile +++ b/package/spi-ks8995/Makefile @@ -16,7 +16,6 @@ include $(INCLUDE_DIR)/package.mk define KernelPackage/spi-ks8995 SUBMENU:=SPI Support TITLE:=Micrel/Kendin KS8995 Ethernet switch control - DEPENDS:=@LINUX_2_6 FILES:=$(PKG_BUILD_DIR)/spi_ks8995.$(LINUX_KMOD_SUFFIX) KCONFIG:=CONFIG_SPI=y \ CONFIG_SPI_MASTER=y diff --git a/package/spidev_test/Makefile b/package/spidev_test/Makefile index 4750ba01b3..e0a989e60f 100644 --- a/package/spidev_test/Makefile +++ b/package/spidev_test/Makefile @@ -16,7 +16,7 @@ include $(INCLUDE_DIR)/package.mk define Package/spidev-test SECTION:=utils CATEGORY:=Utilities - DEPENDS:=@LINUX_2_6 +kmod-spi-dev + DEPENDS:=+kmod-spi-dev TITLE:=SPI testing utility VERSION:=$(LINUX_VERSION)-$(PKG_RELEASE) URL:=http://www.kernel.org diff --git a/package/swconfig/Makefile b/package/swconfig/Makefile index b0a72ceeb7..24ebaee456 100644 --- a/package/swconfig/Makefile +++ b/package/swconfig/Makefile @@ -16,7 +16,7 @@ include $(INCLUDE_DIR)/kernel.mk define Package/swconfig SECTION:=base CATEGORY:=Base system - DEPENDS:=@LINUX_2_6 @!TARGET_brcm47xx +libuci +libnl-tiny + DEPENDS:=@!TARGET_brcm47xx +libuci +libnl-tiny TITLE:=Switch configuration utility endef diff --git a/package/uboot-envtools/Makefile b/package/uboot-envtools/Makefile index fe95d89ca9..32574db69e 100644 --- a/package/uboot-envtools/Makefile +++ b/package/uboot-envtools/Makefile @@ -20,7 +20,7 @@ define Package/uboot-envtools SECTION:=utils CATEGORY:=Utilities TITLE:=read/modify U-Boot bootloader environment - DEPENDS:= @LINUX_2_6 +zlib + DEPENDS:= +zlib URL:=http://www.denx.de/wiki/U-Boot endef diff --git a/package/udev/Makefile b/package/udev/Makefile index 26bfe8bba2..bae8a1f5c8 100644 --- a/package/udev/Makefile +++ b/package/udev/Makefile @@ -22,7 +22,6 @@ PKG_INSTALL=1 define Package/udev SECTION:=base CATEGORY:=Base system - DEPENDS:=@LINUX_2_6 TITLE:=Dynamic device management subsystem URL:=http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html MAINTAINER:=Geoff Levand <geoffrey.levand@am.sony.com> diff --git a/package/udevtrigger/Makefile b/package/udevtrigger/Makefile index d229c13032..e644339597 100644 --- a/package/udevtrigger/Makefile +++ b/package/udevtrigger/Makefile @@ -22,7 +22,6 @@ include $(INCLUDE_DIR)/package.mk define Package/udevtrigger SECTION:=base CATEGORY:=Base system - DEPENDS:=@LINUX_2_6 TITLE:=Small utility to request kernel devices events for coldplug URL:=http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html MAINTAINER:=Geoff Levand <geoffrey.levand@am.sony.com> diff --git a/package/wprobe/Makefile b/package/wprobe/Makefile index ab34f50d6b..d8e5a3b064 100644 --- a/package/wprobe/Makefile +++ b/package/wprobe/Makefile @@ -24,7 +24,7 @@ include $(INCLUDE_DIR)/package.mk # wprobe-lib.c:149: error: 'packed' attribute ignored for field of type 'struct <anonymous>' define Package/wprobe/Default - DEPENDS:=@LINUX_2_6 @(!(TARGET_ps3||TARGET_pxcab||cris)||BROKEN) + DEPENDS:=@(!(TARGET_ps3||TARGET_pxcab||cris)||BROKEN) endef define KernelPackage/wprobe diff --git a/package/wrt55agv2-spidevs/Makefile b/package/wrt55agv2-spidevs/Makefile index ab3e7429dd..ab5c451347 100644 --- a/package/wrt55agv2-spidevs/Makefile +++ b/package/wrt55agv2-spidevs/Makefile @@ -16,7 +16,7 @@ include $(INCLUDE_DIR)/package.mk define KernelPackage/wrt55agv2-spidevs SUBMENU:=Other modules TITLE:=WRT55AG v2 SPI devices support - DEPENDS:=@LINUX_2_6 @TARGET_atheros +kmod-spi-gpio-old +kmod-spi-ks8995 + DEPENDS:=@TARGET_atheros +kmod-spi-gpio-old +kmod-spi-ks8995 FILES:=$(PKG_BUILD_DIR)/wrt55agv2_spidevs.$(LINUX_KMOD_SUFFIX) endef |