diff options
Diffstat (limited to 'package/kernel')
| -rw-r--r-- | package/kernel/Makefile | 1 | ||||
| -rw-r--r-- | package/kernel/modules/block.mk | 4 | ||||
| -rw-r--r-- | package/kernel/modules/fs.mk | 48 | ||||
| -rw-r--r-- | package/kernel/modules/i2c.mk | 10 | ||||
| -rw-r--r-- | package/kernel/modules/netfilter.mk | 36 | ||||
| -rw-r--r-- | package/kernel/modules/network.mk | 88 | ||||
| -rw-r--r-- | package/kernel/modules/other.mk | 106 | ||||
| -rw-r--r-- | package/kernel/modules/usb.mk | 58 | ||||
| -rw-r--r-- | package/kernel/modules/wireless.mk | 24 |
9 files changed, 187 insertions, 188 deletions
diff --git a/package/kernel/Makefile b/package/kernel/Makefile index bc0b88ba2f..e58b310259 100644 --- a/package/kernel/Makefile +++ b/package/kernel/Makefile @@ -14,7 +14,6 @@ PKG_VERSION:=$(LINUX_VERSION)-$(BOARD) PKG_RELEASE:=$(LINUX_RELEASE) PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/packages -PKG_FILE_DEPEND:=$(MODULES_DIR) # build all in-tree kmod-* packages by default KMOD_DEFAULT:=m diff --git a/package/kernel/modules/block.mk b/package/kernel/modules/block.mk index a6df0fc662..b9f4c0dbd4 100644 --- a/package/kernel/modules/block.mk +++ b/package/kernel/modules/block.mk @@ -5,7 +5,7 @@ define KernelPackage/libata DESCRIPTION:=libata KCONFIG:=$(CONFIG_ATA) SUBMENU:=$(BLMENU) - FILES:=$(MODULES_DIR)/kernel/drivers/ata/libata.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/ata/libata.$(LINUX_KMOD_SUFFIX) endef $(eval $(call KernelPackage,libata)) @@ -15,7 +15,7 @@ define KernelPackage/ata-piix KCONFIG:=$(CONFIG_ATA_PIIX) SUBMENU:=$(BLMENU) AUTOLOAD:=$(call AutoLoad,30,scsi_mod libata sd_mod ata_piix) - FILES:=$(MODULES_DIR)/kernel/drivers/ata/ata_piix.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/ata/ata_piix.$(LINUX_KMOD_SUFFIX) DEPENDS:=+kmod-libata +kmod-ide-core +kmod-scsi-core endef $(eval $(call KernelPackage,ata-piix)) diff --git a/package/kernel/modules/fs.mk b/package/kernel/modules/fs.mk index 2106881ec8..762a8984d3 100644 --- a/package/kernel/modules/fs.mk +++ b/package/kernel/modules/fs.mk @@ -7,7 +7,7 @@ define KernelPackage/fs-cifs KCONFIG:=$(CONFIG_CIFS) SUBMENU:=$(FSMENU) AUTOLOAD:=$(call AutoLoad,30,cifs) - FILES:=$(MODULES_DIR)/kernel/fs/cifs/cifs.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/fs/cifs/cifs.$(LINUX_KMOD_SUFFIX) endef $(eval $(call KernelPackage,fs-cifs)) @@ -17,7 +17,7 @@ define KernelPackage/fs-minix KCONFIG:=$(CONFIG_MINIX_FS) SUBMENU:=$(FSMENU) AUTOLOAD:=$(call AutoLoad,30,minix) - FILES:=$(MODULES_DIR)/kernel/fs/minix/minix.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/fs/minix/minix.$(LINUX_KMOD_SUFFIX) endef $(eval $(call KernelPackage,fs-minix)) @@ -27,7 +27,7 @@ define KernelPackage/fs-ext2 KCONFIG:=$(CONFIG_EXT2_FS) SUBMENU:=$(FSMENU) AUTOLOAD:=$(call AutoLoad,30,ext2) - FILES:=$(MODULES_DIR)/kernel/fs/ext2/ext2.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/fs/ext2/ext2.$(LINUX_KMOD_SUFFIX) endef $(eval $(call KernelPackage,fs-ext2)) @@ -38,8 +38,8 @@ define KernelPackage/fs-ext3 SUBMENU:=$(FSMENU) AUTOLOAD:=$(call AutoLoad,30,jbd ext3) FILES:= \ - $(MODULES_DIR)/kernel/fs/jbd/jbd.$(LINUX_KMOD_SUFFIX) \ - $(MODULES_DIR)/kernel/fs/ext3/ext3.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/fs/jbd/jbd.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/fs/ext3/ext3.$(LINUX_KMOD_SUFFIX) endef $(eval $(call KernelPackage,fs-ext3)) @@ -50,7 +50,7 @@ define KernelPackage/fs-hfsplus KCONFIG:=$(CONFIG_HFSPLUS_FS) SUBMENU:=$(FSMENU) AUTOLOAD:=$(call AutoLoad,30,hfsplus) - FILES:=$(MODULES_DIR)/kernel/fs/hfsplus/hfsplus.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/fs/hfsplus/hfsplus.$(LINUX_KMOD_SUFFIX) endef $(eval $(call KernelPackage,fs-hfsplus)) @@ -61,7 +61,7 @@ define KernelPackage/fs-isofs KCONFIG:=$(CONFIG_ISO9660_FS) SUBMENU:=$(FSMENU) AUTOLOAD:=$(call AutoLoad,30,isofs) - FILES:=$(MODULES_DIR)/kernel/fs/isofs/isofs.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/fs/isofs/isofs.$(LINUX_KMOD_SUFFIX) endef $(eval $(call KernelPackage,fs-isofs)) @@ -72,7 +72,7 @@ define KernelPackage/fs-udf KCONFIG:=$(CONFIG_UDF_FS) SUBMENU:=$(FSMENU) AUTOLOAD:=$(call AutoLoad,30,udf) - FILES:=$(MODULES_DIR)/kernel/fs/udf/udf.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/fs/udf/udf.$(LINUX_KMOD_SUFFIX) endef $(eval $(call KernelPackage,fs-udf)) @@ -83,9 +83,9 @@ define KernelPackage/fs-nfs SUBMENU:=$(FSMENU) AUTOLOAD:=$(call AutoLoad,30,sunrpc lockd nfs) FILES:= \ - $(MODULES_DIR)/kernel/net/sunrpc/sunrpc.$(LINUX_KMOD_SUFFIX) \ - $(MODULES_DIR)/kernel/fs/lockd/lockd.$(LINUX_KMOD_SUFFIX) \ - $(MODULES_DIR)/kernel/fs/nfs/nfs.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/net/sunrpc/sunrpc.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/fs/lockd/lockd.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/fs/nfs/nfs.$(LINUX_KMOD_SUFFIX) endef $(eval $(call KernelPackage,fs-nfs)) @@ -96,7 +96,7 @@ define KernelPackage/fs-nfsd SUBMENU:=$(FSMENU) AUTOLOAD:=$(call AutoLoad,30,nfsd) FILES:= \ - $(MODULES_DIR)/kernel/fs/nfsd/nfsd.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/fs/nfsd/nfsd.$(LINUX_KMOD_SUFFIX) endef $(eval $(call KernelPackage,fs-nfsd)) @@ -108,7 +108,7 @@ define KernelPackage/fs-msdos SUBMENU:=$(FSMENU) AUTOLOAD:=$(call AutoLoad,40,msdos) FILES:= \ - $(MODULES_DIR)/kernel/fs/msdos/msdos.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/fs/msdos/msdos.$(LINUX_KMOD_SUFFIX) endef $(eval $(call KernelPackage,fs-msdos)) @@ -120,8 +120,8 @@ define KernelPackage/fs-vfat SUBMENU:=$(FSMENU) AUTOLOAD:=$(call AutoLoad,30,fat vfat) FILES:= \ - $(MODULES_DIR)/kernel/fs/fat/fat.$(LINUX_KMOD_SUFFIX) \ - $(MODULES_DIR)/kernel/fs/vfat/vfat.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/fs/fat/fat.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/fs/vfat/vfat.$(LINUX_KMOD_SUFFIX) endef $(eval $(call KernelPackage,fs-vfat)) @@ -132,7 +132,7 @@ define KernelPackage/fs-xfs SUBMENU:=$(FSMENU) AUTOLOAD:=$(call AutoLoad,30,sunrpc lockd xfs) FILES:= \ - $(MODULES_DIR)/kernel/fs/xfs/xfs.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/fs/xfs/xfs.$(LINUX_KMOD_SUFFIX) endef $(eval $(call KernelPackage,fs-xfs)) @@ -143,7 +143,7 @@ define KernelPackage/nls-base KCONFIG:=$(CONFIG_NLS) SUBMENU:=$(FSMENU) MENU:=1 - FILES:=$(MODULES_DIR)/kernel/fs/nls/nls_base.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/fs/nls/nls_base.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,20,nls_base) endef $(eval $(call KernelPackage,nls-base)) @@ -155,7 +155,7 @@ define KernelPackage/nls-cp437 DEPENDS:=kmod-nls-base KCONFIG:=$(CONFIG_NLS_CODEPAGE_437) SUBMENU:=$(FSMENU) - FILES:=$(MODULES_DIR)/kernel/fs/nls/nls_cp437.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/fs/nls/nls_cp437.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,25,nls_cp437) endef $(eval $(call KernelPackage,nls-cp437)) @@ -167,7 +167,7 @@ define KernelPackage/nls-cp850 DEPENDS:=kmod-nls-base KCONFIG:=$(CONFIG_NLS_CODEPAGE_850) SUBMENU:=$(FSMENU) - FILES:=$(MODULES_DIR)/kernel/fs/nls/nls_cp850.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/fs/nls/nls_cp850.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,25,nls_cp850) endef $(eval $(call KernelPackage,nls-cp850)) @@ -178,7 +178,7 @@ define KernelPackage/nls-cp1250 DEPENDS:=kmod-nls-base KCONFIG:=$(CONFIG_NLS_CODEPAGE_1250) SUBMENU:=$(FSMENU) - FILES:=$(MODULES_DIR)/kernel/fs/nls/nls_cp1250.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/fs/nls/nls_cp1250.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,25,nls_cp1250) endef $(eval $(call KernelPackage,nls-cp1250)) @@ -189,7 +189,7 @@ define KernelPackage/nls-iso8859-1 DEPENDS:=kmod-nls-base KCONFIG:=$(CONFIG_NLS_ISO8859_1) SUBMENU:=$(FSMENU) - FILES:=$(MODULES_DIR)/kernel/fs/nls/nls_iso8859-1.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/fs/nls/nls_iso8859-1.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,25,nls_iso8859-1) endef $(eval $(call KernelPackage,nls-iso8859-1)) @@ -200,7 +200,7 @@ define KernelPackage/nls-iso8859-15 DEPENDS:=kmod-nls-base KCONFIG:=$(CONFIG_NLS_ISO8859_15) SUBMENU:=$(FSMENU) - FILES:=$(MODULES_DIR)/kernel/fs/nls/nls_iso8859-15.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/fs/nls/nls_iso8859-15.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,25,nls_iso8859-15) endef $(eval $(call KernelPackage,nls-iso8859-15)) @@ -211,7 +211,7 @@ define KernelPackage/nls-koi8r DEPENDS:=kmod-nls-base KCONFIG:=$(CONFIG_NLS_KOI8_R) SUBMENU:=$(FSMENU) - FILES:=$(MODULES_DIR)/kernel/fs/nls/nls_koi8-r.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/fs/nls/nls_koi8-r.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,25,nls_koi8-r) endef $(eval $(call KernelPackage,nls-koi8r)) @@ -222,7 +222,7 @@ define KernelPackage/nls-utf8 DEPENDS:=kmod-nls-base KCONFIG:=$(CONFIG_NLS_UTF8) SUBMENU:=$(FSMENU) - FILES:=$(MODULES_DIR)/kernel/fs/nls/nls_utf8.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/fs/nls/nls_utf8.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,25,nls_utf8) endef $(eval $(call KernelPackage,nls-utf8)) diff --git a/package/kernel/modules/i2c.mk b/package/kernel/modules/i2c.mk index 4d65b6ea3d..a0b121c334 100644 --- a/package/kernel/modules/i2c.mk +++ b/package/kernel/modules/i2c.mk @@ -13,7 +13,7 @@ define KernelPackage/i2c-core DESCRIPTION:=Kernel modules for i2c support SUBMENU:=$(I2CMENU) KCONFIG:=$(CONFIG_I2C) - FILES:=$(MODULES_DIR)/kernel/drivers/i2c/*.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/i2c/*.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,50,i2c-core i2c-dev) endef $(eval $(call KernelPackage,i2c-core)) @@ -24,7 +24,7 @@ define KernelPackage/i2c-algos DEPENDS:=kmod-i2c-core SUBMENU:=$(I2CMENU) KCONFIG:=$(CONFIG_I2C_ALGOBIT) - FILES:=$(MODULES_DIR)/kernel/drivers/i2c/algos/*.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/i2c/algos/*.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,60,i2c-algo-bit i2c-algo-pcf i2c-algo-pca) endef $(eval $(call KernelPackage,i2c-algos)) @@ -36,7 +36,7 @@ define KernelPackage/i2c-au1x00gpio DEPENDS:=kmod-i2c-core kmod-i2c-algos @LINUX_2_6_AU1000 SUBMENU:=$(I2CMENU) KCONFIG:=$(CONFIG_I2C_AU1X00GPIO) - FILES:=$(MODULES_DIR)/kernel/drivers/i2c/busses/i2c-au1x00gpio.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/i2c/busses/i2c-au1x00gpio.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call Autoload,70,i2c-au1x00gpio) endef $(eval $(call KernelPackage,i2c-au1x00gpio)) @@ -48,8 +48,8 @@ define KernelPackage/i2c-scx200 DEPENDS:=kmod-i2c-core kmod-i2c-algos @LINUX_2_6_X86_Soekris SUBMENU:=$(I2CMENU) KCONFIG:=$(CONFIG_I2C_SCX200) - FILES:=$(MODULES_DIR)/kernel/drivers/i2c/busses/scx200_i2c.$(LINUX_KMOD_SUFFIX) \ - $(MODULES_DIR)/kernel/drivers/i2c/busses/i2c-isa.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/i2c/busses/scx200_i2c.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/drivers/i2c/busses/i2c-isa.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,70,scx200_i2c) endef $(eval $(call KernelPackage,i2c-scx200)) diff --git a/package/kernel/modules/netfilter.mk b/package/kernel/modules/netfilter.mk index d1653b946e..18f9203a47 100644 --- a/package/kernel/modules/netfilter.mk +++ b/package/kernel/modules/netfilter.mk @@ -17,7 +17,7 @@ define KernelPackage/ipt-conntrack - ipt_conntrack \\\ - ipt_helper \\\ - ipt_connmark/CONNMARK - FILES:=$(foreach mod,$(IPT_CONNTRACK-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX)) + FILES:=$(foreach mod,$(IPT_CONNTRACK-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) SUBMENU:=$(NFMENU) AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_CONNTRACK-m))) endef @@ -31,7 +31,7 @@ define KernelPackage/ipt-filter Includes: \\\ - ipt_ipp2p \\\ - ipt_layer7 - FILES:=$(foreach mod,$(IPT_FILTER-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX)) + FILES:=$(foreach mod,$(IPT_FILTER-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) SUBMENU:=$(NFMENU) AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_FILTER-m))) endef @@ -52,7 +52,7 @@ define KernelPackage/ipt-ipopt - ipt_tcpmms \\\ - ipt_ttl/TTL \\\ - ipt_unclean - FILES:=$(foreach mod,$(IPT_IPOPT-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX)) + FILES:=$(foreach mod,$(IPT_IPOPT-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) SUBMENU:=$(NFMENU) AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_IPOPT-m))) endef @@ -66,7 +66,7 @@ define KernelPackage/ipt-ipsec Includes: \\\ - ipt_ah \\\ - ipt_esp - FILES:=$(foreach mod,$(IPT_IPSEC-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX)) + FILES:=$(foreach mod,$(IPT_IPSEC-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) SUBMENU:=$(NFMENU) AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_IPSEC-m))) endef @@ -80,7 +80,7 @@ define KernelPackage/ipt-nat Includes: \\\ - ipt_REDIRECT \\\ - ipt_NETMAP - FILES:=$(foreach mod,$(IPT_NAT-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX)) + FILES:=$(foreach mod,$(IPT_NAT-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) SUBMENU:=$(NFMENU) AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_NAT-m))) endef @@ -97,7 +97,7 @@ define KernelPackage/ipt-nathelper - ip_conntrack_irc \\\ - ip_nat_irc \\\ - ip_conntrack_tftp - FILES:=$(foreach mod,$(IPT_NAT_DEFAULT-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX)) + FILES:=$(foreach mod,$(IPT_NAT_DEFAULT-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) SUBMENU:=$(NFMENU) AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_NAT_DEFAULT-m))) endef @@ -117,7 +117,7 @@ define KernelPackage/ipt-nathelper-extra - ip_conntrack_sip \\\ - ip_nat_sip \\\ - ip_nat_snmp_basic - FILES:=$(foreach mod,$(IPT_NAT_EXTRA-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX)) + FILES:=$(foreach mod,$(IPT_NAT_EXTRA-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) SUBMENU:=$(NFMENU) AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_NAT_EXTRA-m))) endef @@ -128,9 +128,9 @@ define KernelPackage/ipt-imq DESCRIPTION:=\ Kernel support for Intermediate Queueing devices KCONFIG:=$(CONFIG_IP_NF_TARGET_IMQ) - FILES:=$(MODULES_DIR)/kernel/net/ipv4/netfilter/*IMQ*.$(LINUX_KMOD_SUFFIX) $(MODULES_DIR)/kernel/drivers/net/imq.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/net/ipv4/netfilter/*IMQ*.$(LINUX_KMOD_SUFFIX) $(LINUX_DIR)/drivers/net/imq.$(LINUX_KMOD_SUFFIX) SUBMENU:=$(NFMENU) - AUTOLOAD:=$(call AutoLoad,40,$(notdir $(patsubst %.ko,%,$(wildcard $(MODULES_DIR)/kernel/net/ipv4/netfilter/*IMQ*.$(LINUX_KMOD_SUFFIX) $(MODULES_DIR)/kernel/drivers/net/imq.$(LINUX_KMOD_SUFFIX))))) + AUTOLOAD:=$(call AutoLoad,40,$(notdir $(patsubst %.ko,%,$(wildcard $(LINUX_DIR)/net/ipv4/netfilter/*IMQ*.$(LINUX_KMOD_SUFFIX) $(LINUX_DIR)/drivers/net/imq.$(LINUX_KMOD_SUFFIX))))) endef $(eval $(call KernelPackage,ipt-imq)) @@ -142,7 +142,7 @@ define KernelPackage/ipt-queue \\\ Includes: \\\ - ipt_QUEUE - FILES:=$(foreach mod,$(IPT_QUEUE-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX)) + FILES:=$(foreach mod,$(IPT_QUEUE-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) SUBMENU:=$(NFMENU) AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_QUEUE-m))) endef @@ -155,7 +155,7 @@ define KernelPackage/ipt-ulog \\\ Includes: \\\ - ipt_ULOG - FILES:=$(foreach mod,$(IPT_ULOG-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX)) + FILES:=$(foreach mod,$(IPT_ULOG-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) SUBMENU:=$(NFMENU) AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_ULOG-m))) endef @@ -173,7 +173,7 @@ define KernelPackage/ipt-extra - ipt_recent \\\ - iptable_raw \\\ - xt_NOTRACK - FILES:=$(foreach mod,$(IPT_EXTRA-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX)) + FILES:=$(foreach mod,$(IPT_EXTRA-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) SUBMENU:=$(NFMENU) AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_EXTRA-m))) endef @@ -184,9 +184,9 @@ define KernelPackage/ip6tables DESCRIPTION:=\ Netfilter IPv6 firewalling support KCONFIG:=$(CONFIG_IP6_NF_IPTABLES) - FILES:=$(MODULES_DIR)/kernel/net/ipv6/netfilter/ip*.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/net/ipv6/netfilter/ip*.$(LINUX_KMOD_SUFFIX) SUBMENU:=$(NFMENU) - AUTOLOAD:=$(call AutoLoad,40,$(notdir $(patsubst %.ko,%,$(wildcard $(MODULES_DIR)/kernel/net/ipv6/netfilter/ip6_*.$(LINUX_KMOD_SUFFIX)) $(wildcard $(MODULES_DIR)/kernel/net/ipv6/netfilter/ip6table_*.$(LINUX_KMOD_SUFFIX)) $(wildcard $(MODULES_DIR)/kernel/net/ipv6/netfilter/ip6t_*.$(LINUX_KMOD_SUFFIX))))) + AUTOLOAD:=$(call AutoLoad,40,$(notdir $(patsubst %.ko,%,$(wildcard $(LINUX_DIR)/net/ipv6/netfilter/ip6_*.$(LINUX_KMOD_SUFFIX)) $(wildcard $(LINUX_DIR)/net/ipv6/netfilter/ip6table_*.$(LINUX_KMOD_SUFFIX)) $(wildcard $(LINUX_DIR)/net/ipv6/netfilter/ip6t_*.$(LINUX_KMOD_SUFFIX))))) endef $(eval $(call KernelPackage,ip6tables)) @@ -195,10 +195,10 @@ define KernelPackage/arptables TITLE:=ARP firewalling modules DESCRIPTION:=\ Kernel modules for ARP firewalling - FILES:=$(MODULES_DIR)/kernel/net/ipv4/netfilter/arp*.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/net/ipv4/netfilter/arp*.$(LINUX_KMOD_SUFFIX) KCONFIG:=$(CONFIG_IP_NF_ARPTABLES) SUBMENU:=$(NFMENU) - AUTOLOAD:=$(call AutoLoad,40,$(notdir $(patsubst %.ko,%,$(wildcard $(MODULES_DIR)/kernel/net/ipv4/netfilter/arp*.$(LINUX_KMOD_SUFFIX))))) + AUTOLOAD:=$(call AutoLoad,40,$(notdir $(patsubst %.ko,%,$(wildcard $(LINUX_DIR)/net/ipv4/netfilter/arp*.$(LINUX_KMOD_SUFFIX))))) endef $(eval $(call KernelPackage,arptables)) @@ -207,9 +207,9 @@ define KernelPackage/ebtables TITLE:=Bridge firewalling modules DESCRIPTION:=\ Kernel modules for Ethernet Bridge firewalling - FILES:=$(MODULES_DIR)/kernel/net/bridge/netfilter/*.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/net/bridge/netfilter/*.$(LINUX_KMOD_SUFFIX) KCONFIG:=$(CONFIG_BRIDGE_NF_EBTABLES) SUBMENU:=$(NFMENU) - AUTOLOAD:=$(call AutoLoad,40,$(notdir $(patsubst %.ko,%,ebtables.ko $(wildcard $(MODULES_DIR)/kernel/net/bridge/netfilter/ebtable_*.$(LINUX_KMOD_SUFFIX)) $(wildcard $(MODULES_DIR)/kernel/net/bridge/netfilter/ebt_*.$(LINUX_KMOD_SUFFIX))))) + AUTOLOAD:=$(call AutoLoad,40,$(notdir $(patsubst %.ko,%,ebtables.ko $(wildcard $(LINUX_DIR)/net/bridge/netfilter/ebtable_*.$(LINUX_KMOD_SUFFIX)) $(wildcard $(LINUX_DIR)/net/bridge/netfilter/ebt_*.$(LINUX_KMOD_SUFFIX))))) endef $(eval $(call KernelPackage,ebtables)) diff --git a/package/kernel/modules/network.mk b/package/kernel/modules/network.mk index 05355b30b8..5fe6c0ea57 100644 --- a/package/kernel/modules/network.mk +++ b/package/kernel/modules/network.mk @@ -14,8 +14,8 @@ define KernelPackage/atm DESCRIPTION:= \ Kernel modules for ATM support FILES:= \ - $(MODULES_DIR)/kernel/net/atm/atm.$(LINUX_KMOD_SUFFIX) \ - $(MODULES_DIR)/kernel/net/atm/br2684.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/net/atm/atm.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/net/atm/br2684.$(LINUX_KMOD_SUFFIX) KCONFIG:=$(CONFIG_ATM) SUBMENU:=$(NSMENU) AUTOLOAD:=$(call AutoLoad,30,atm br2684) @@ -27,7 +27,7 @@ define KernelPackage/atmtcp DESCRIPTION:= \ Kernel module for ATM over TCP support DEPENDS:=@LINUX_2_6 kmod-atm - FILES:=$(MODULES_DIR)/kernel/drivers/atm/atmtcp.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/atm/atmtcp.$(LINUX_KMOD_SUFFIX) KCONFIG:=$(CONFIG_ATM_TCP) SUBMENU:=$(NSMENU) AUTOLOAD:=$(call AutoLoad,40,atmtcp) @@ -39,7 +39,7 @@ define KernelPackage/bonding DESCRIPTION:= \ Kernel module for NIC bonding. DEPENDS:=@LINUX_2_6_X86 - FILES:=$(MODULES_DIR)/kernel/drivers/net/bonding/bonding.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/net/bonding/bonding.$(LINUX_KMOD_SUFFIX) KCONFIG:=$(CONFIG_BONDING) SUBMENU:=$(NSMENU) AUTOLOAD:=$(call AutoLoad,40,bonding) @@ -56,14 +56,14 @@ endef $(eval $(call KernelPackage,ipip)) define KernelPackage/ipip/2.4 - FILES:=$(MODULES_DIR)/kernel/net/ipv4/ipip.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/net/ipv4/ipip.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,30,ipip) endef define KernelPackage/ipip/2.6 FILES:= \ - $(MODULES_DIR)/kernel/net/ipv4/ipip.$(LINUX_KMOD_SUFFIX) \ - $(MODULES_DIR)/kernel/net/ipv4/tunnel4.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/net/ipv4/ipip.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/net/ipv4/tunnel4.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,30,ipip tunnel4) endef @@ -79,8 +79,8 @@ define KernelPackage/ipsec DEPENDS:=@LINUX_2_6 KCONFIG:=$(CONFIG_NET_KEY) FILES:= \ - $(MODULES_DIR)/kernel/net/key/af_key.$(LINUX_KMOD_SUFFIX) \ - $(MODULES_DIR)/kernel/net/xfrm/xfrm_user.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/net/key/af_key.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/net/xfrm/xfrm_user.$(LINUX_KMOD_SUFFIX) endef $(eval $(call KernelPackage,ipsec)) @@ -97,7 +97,7 @@ define KernelPackage/ipsec4 KCONFIG:=$(CONFIG_INET_AH) DEPENDS:=kmod-ipsec FILES:= $(foreach mod,ah4 esp4 ipcomp xfrm4_tunnel, \ - $(MODULES_DIR)/kernel/net/ipv4/$(mod).$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/net/ipv4/$(mod).$(LINUX_KMOD_SUFFIX) \ ) endef $(eval $(call KernelPackage,ipsec4)) @@ -115,7 +115,7 @@ define KernelPackage/ipsec6 KCONFIG:=$(CONFIG_INET6_AH) DEPENDS:=kmod-ipsec FILES:= $(foreach mod,ah6 esp6 ipcomp6 xfrm6_tunnel, \ - $(MODULES_DIR)/kernel/net/ipv6/{ah6,esp6,ipcomp6,xfrm6_tunnel}.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/net/ipv6/$(mod).$(LINUX_KMOD_SUFFIX) \ ) endef $(eval $(call KernelPackage,ipsec6)) @@ -129,12 +129,12 @@ define KernelPackage/ipv6 SUBMENU:=$(NSMENU) endef define KernelPackage/ipv6/2.4 - FILES:=$(MODULES_DIR)/kernel/net/ipv6/ipv6.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/net/ipv6/ipv6.$(LINUX_KMOD_SUFFIX) endef define KernelPackage/ipv6/2.6 FILES:= \ - $(MODULES_DIR)/kernel/net/ipv6/ipv6.$(LINUX_KMOD_SUFFIX) \ - $(MODULES_DIR)/kernel/net/ipv6/sit.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/net/ipv6/ipv6.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/net/ipv6/sit.$(LINUX_KMOD_SUFFIX) endef $(eval $(call KernelPackage,ipv6)) @@ -144,7 +144,7 @@ define KernelPackage/gre DESCRIPTION:=\ Generic Routing Encapsulation support KCONFIG=$(CONFIG_NET_IPGRE) - FILES=$(MODULES_DIR)/kernel/net/ipv4/ip_gre.$(LINUX_KMOD_SUFFIX) + FILES=$(LINUX_DIR)/net/ipv4/ip_gre.$(LINUX_KMOD_SUFFIX) SUBMENU:=$(NSMENU) endef $(eval $(call KernelPackage,gre)) @@ -155,7 +155,7 @@ define KernelPackage/tun DESCRIPTION:=\ Kernel support for the TUN/TAP tunneling device KCONFIG:=$(CONFIG_TUN) - FILES:=$(MODULES_DIR)/kernel/drivers/net/tun.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/net/tun.$(LINUX_KMOD_SUFFIX) SUBMENU:=$(NSMENU) AUTOLOAD:=$(call AutoLoad,30,tun) endef @@ -172,18 +172,18 @@ endef define KernelPackage/ppp/2.6 FILES:= \ - $(MODULES_DIR)/kernel/drivers/net/ppp_async.ko \ - $(MODULES_DIR)/kernel/drivers/net/ppp_generic.ko \ - $(MODULES_DIR)/kernel/drivers/net/slhc.ko \ - $(MODULES_DIR)/kernel/lib/crc-ccitt.ko + $(LINUX_DIR)/drivers/net/ppp_async.ko \ + $(LINUX_DIR)/drivers/net/ppp_generic.ko \ + $(LINUX_DIR)/drivers/net/slhc.ko \ + $(LINUX_DIR)/lib/crc-ccitt.ko AUTOLOAD:=$(call AutoLoad,30,crc-ccitt slhc ppp_generic ppp_async) endef define KernelPackage/ppp/2.4 FILES:= \ - $(MODULES_DIR)/kernel/drivers/net/ppp_async.o \ - $(MODULES_DIR)/kernel/drivers/net/ppp_generic.o \ - $(MODULES_DIR)/kernel/drivers/net/slhc.o + $(LINUX_DIR)/drivers/net/ppp_async.o \ + $(LINUX_DIR)/drivers/net/ppp_generic.o \ + $(LINUX_DIR)/drivers/net/slhc.o AUTOLOAD:=$(call AutoLoad,30,slhc ppp_generic ppp_async) endef $(eval $(call KernelPackage,ppp)) @@ -196,8 +196,8 @@ define KernelPackage/pppoe DEPENDS:=kmod-ppp KCONFIG:=$(CONFIG_PPPOE) FILES:= \ - $(MODULES_DIR)/kernel/drivers/net/pppoe.$(LINUX_KMOD_SUFFIX) \ - $(MODULES_DIR)/kernel/drivers/net/pppox.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/drivers/net/pppoe.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/drivers/net/pppox.$(LINUX_KMOD_SUFFIX) SUBMENU:=$(NSMENU) endef $(eval $(call KernelPackage,pppoe)) @@ -209,7 +209,7 @@ define KernelPackage/pppoa Kernel modules for PPPoA (PPP over ATM) support DEPENDS:=kmod-ppp KCONFIG:=$(CONFIG_PPPOATM) - FILES:=$(MODULES_DIR)/kernel/net/atm/pppoatm.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/net/atm/pppoatm.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,40,pppoatm) SUBMENU:=$(NSMENU) endef @@ -225,11 +225,11 @@ define KernelPackage/mppe endef define KernelPackage/mppe/2.4 - FILES:=$(MODULES_DIR)/kernel/drivers/net/ppp_mppe_mppc.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/net/ppp_mppe_mppc.$(LINUX_KMOD_SUFFIX) endef define KernelPackage/mppe/2.6 - FILES:=$(MODULES_DIR)/kernel/drivers/net/ppp_mppe.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/net/ppp_mppe.$(LINUX_KMOD_SUFFIX) endef $(eval $(call KernelPackage,mppe)) @@ -238,7 +238,7 @@ define KernelPackage/sched TITLE:=Traffic schedulers DESCRIPTION:=\ Kernel schedulers for IP traffic - FILES:=$(MODULES_DIR)/kernel/net/sched/*.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/net/sched/*.$(LINUX_KMOD_SUFFIX) SUBMENU:=$(NSMENU) endef $(eval $(call KernelPackage,sched)) @@ -251,8 +251,8 @@ define KernelPackage/ax25 SUBMENU:=$(NSMENU) KCONFIG:=$(CONFIG_AX25) FILES:= \ - $(MODULES_DIR)/kernel/net/ax25/ax25.$(LINUX_KMOD_SUFFIX) \ - $(MODULES_DIR)/kernel/drivers/net/hamradio/mkiss.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/net/ax25/ax25.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/drivers/net/hamradio/mkiss.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,80,ax25 mkiss) endef $(eval $(call KernelPackage,ax25)) @@ -267,7 +267,7 @@ define KernelPackage/natsemi DESCRIPTION:=\ Kernel modules for National Semiconductor DP8381x series PCI Ethernet \\\ adapters. - FILES:=$(MODULES_DIR)/kernel/drivers/net/natsemi.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/net/natsemi.$(LINUX_KMOD_SUFFIX) KCONFIG:=$(CONFIG_NATSEMI) DEPENDS:=@LINUX_2_6_X86 SUBMENU:=$(NDMENU) @@ -279,7 +279,7 @@ define KernelPackage/sis900 TITLE:=SiS 900 Ethernet support DESCRIPTION:=\ Kernel modules for Sis 900 Ethernet adapters. - FILES:=$(MODULES_DIR)/kernel/drivers/net/sis900.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/net/sis900.$(LINUX_KMOD_SUFFIX) KCONFIG:=$(CONFIG_SIS900) DEPENDS:=@LINUX_2_6_X86 SUBMENU:=$(NDMENU) @@ -291,7 +291,7 @@ define KernelPackage/via-rhine TITLE:=Via Rhine ethernet support DESCRIPTION:=\ Kernel modules for Via Rhine Ethernet chipsets. - FILES:=$(MODULES_DIR)/kernel/drivers/net/via-rhine.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/net/via-rhine.$(LINUX_KMOD_SUFFIX) KCONFIG:=$(CONFIG_VIA_RHINE) DEPENDS:=@LINUX_2_6_X86 SUBMENU:=$(NDMENU) @@ -303,7 +303,7 @@ define KernelPackage/8139too TITLE:=RealTek RTL-8139 PCI Fast Ethernet Adapter kernel support DESCRIPTION:=\ Kernel modules for RealTek RTL-8139 PCI Fast Ethernet adapters. - FILES:=$(MODULES_DIR)/kernel/drivers/net/8139too.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/net/8139too.$(LINUX_KMOD_SUFFIX) KCONFIG:=$(CONFIG_8139TOO) DEPENDS:=@LINUX_2_6_X86 SUBMENU:=$(NDMENU) @@ -315,7 +315,7 @@ define KernelPackage/r8169 TITLE:=RealTek RTL-8169 PCI Gigabit Ethernet Adapter kernel support DESCRIPTION:=\ Kernel modules for RealTek RTL-8169 PCI Gigabit Ethernet adapters. - FILES:=$(MODULES_DIR)/kernel/drivers/net/r8169.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/net/r8169.$(LINUX_KMOD_SUFFIX) KCONFIG:=$(CONFIG_R8169) DEPENDS:=@LINUX_2_6_X86 SUBMENU:=$(NDMENU) @@ -327,8 +327,8 @@ define KernelPackage/ne2k-pci TITLE:=ne2k-pci Ethernet Adapter kernel support DESCRIPTION:=\ ne2k-pci Ethernet Adapter kernel support. - FILES:=$(MODULES_DIR)/kernel/drivers/net/ne2k-pci.$(LINUX_KMOD_SUFFIX) \ - $(MODULES_DIR)/kernel/drivers/net/8390.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/net/ne2k-pci.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/drivers/net/8390.$(LINUX_KMOD_SUFFIX) KCONFIG:=$(CONFIG_NE2K_PCI) DEPENDS:=@LINUX_2_6_X86 SUBMENU:=$(NDMENU) @@ -340,9 +340,9 @@ define KernelPackage/ixp4xx-npe TITLE:=Intel(R) IXP4xx ethernet support DESCRIPTION:=\ Kernel modules for Intel(R) IXP4xx onboard ethernet. - FILES:=$(MODULES_DIR)/kernel/drivers/net/ixp4xx/ixp4xx_npe.$(LINUX_KMOD_SUFFIX) \ - $(MODULES_DIR)/kernel/drivers/net/ixp4xx/ixp4xx_qmgr.$(LINUX_KMOD_SUFFIX) \ - $(MODULES_DIR)/kernel/drivers/net/ixp4xx/ixp4xx_mac.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/net/ixp4xx/ixp4xx_npe.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/drivers/net/ixp4xx/ixp4xx_qmgr.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/drivers/net/ixp4xx/ixp4xx_mac.$(LINUX_KMOD_SUFFIX) KCONFIG:=$(CONFIG_IXP4XX_MAC) DEPENDS:=@LINUX_2_6_IXP4XX SUBMENU:=$(NDMENU) @@ -354,7 +354,7 @@ define KernelPackage/e100 TITLE:=Intel(R) PRO/100+ cards kernel support DESCRIPTION:=\ Kernel modules for Intel(R) PRO/100+ Ethernet adapters. - FILES:=$(MODULES_DIR)/kernel/drivers/net/e100.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/net/e100.$(LINUX_KMOD_SUFFIX) KCONFIG:=$(CONFIG_E100) DEPENDS:=@LINUX_2_6_X86 SUBMENU:=$(NDMENU) @@ -366,7 +366,7 @@ define KernelPackage/e1000 TITLE:=Intel(R) PRO/1000 cards kernel support DESCRIPTION:=\ Kernel modules for Intel(R) PRO/1000 Ethernet adapters. - FILES:=$(MODULES_DIR)/kernel/drivers/net/e1000/e1000.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/net/e1000/e1000.$(LINUX_KMOD_SUFFIX) KCONFIG:=$(CONFIG_E1000) DEPENDS:=@LINUX_2_6_X86 SUBMENU:=$(NDMENU) @@ -384,7 +384,7 @@ define KernelPackage/3c59x - "Cyclone" (3c540/3c900/3c905/3c980/3c575/3c656) PCI and Cardbus \\\ - "Tornado" (3c905) PCI \\\ - "Hurricane" (3c555/3cSOHO) PCI - FILES:=$(MODULES_DIR)/kernel/drivers/net/3c59x.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/net/3c59x.$(LINUX_KMOD_SUFFIX) KCONFIG:=$(CONFIG_3C59X) DEPENDS:=@LINUX_2_6_X86 SUBMENU:=$(NDMENU) diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk index 0b09dec330..bd598fc3bd 100644 --- a/package/kernel/modules/other.mk +++ b/package/kernel/modules/other.mk @@ -34,7 +34,7 @@ define KernelPackage/crypto $(CONFIG_CRYPTO_DEFLATE) \ $(CONFIG_CRYPTO_MICHAEL_MIC) \ $(CONFIG_CRYPTO_CRC32C) - FILES:=$(MODULES_DIR)/kernel/crypto/*.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/crypto/*.$(LINUX_KMOD_SUFFIX) SUBMENU:=$(EMENU) endef $(eval $(call KernelPackage,crypto)) @@ -49,7 +49,7 @@ define KernelPackage/ide-core - ide-detect \\\ - ide-disk KCONFIG:=$(CONFIG_IDE) - FILES:=$(MODULES_DIR)/kernel/drivers/ide/*.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/ide/*.$(LINUX_KMOD_SUFFIX) SUBMENU:=$(EMENU) AUTOLOAD:=$(call AutoLoad,20,ide-core) $(call AutoLoad,90,ide-generic ide-detect ide-disk) endef @@ -59,7 +59,7 @@ define KernelPackage/ide-pdc202xx TITLE:=PDC202xx IDE driver SUBMENU:=$(EMENU) KCONFIG:=$(CONFIG_BLK_DEV_PDC202XX_OLD) - FILES:=$(MODULES_DIR)/kernel/drivers/ide/pci/pdc202xx_old.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/ide/pci/pdc202xx_old.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,30,pdc202xx_old) endef $(eval $(call KernelPackage,ide-pdc202xx)) @@ -68,7 +68,7 @@ define KernelPackage/ide-aec62xx TITLE:=AEC62xx IDE driver SUBMENU:=$(EMENU) KCONFIG:=$(CONFIG_BLK_DEV_AEC62XX) - FILES:=$(MODULES_DIR)/kernel/drivers/ide/pci/aec62xx.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/ide/pci/aec62xx.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,30,aec62xx) endef $(eval $(call KernelPackage,ide-aec62xx)) @@ -78,8 +78,8 @@ define KernelPackage/scsi-core SUBMENU:=$(EMENU) KCONFIG:=$(CONFIG_BLK_DEV_SD) FILES:= \ - $(MODULES_DIR)/kernel/drivers/scsi/scsi_mod.$(LINUX_KMOD_SUFFIX) \ - $(MODULES_DIR)/kernel/drivers/scsi/sd_mod.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/drivers/scsi/scsi_mod.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/drivers/scsi/sd_mod.$(LINUX_KMOD_SUFFIX) endef $(eval $(call KernelPackage,scsi-core)) @@ -87,9 +87,9 @@ define KernelPackage/lp TITLE:=Parallel port and line printer support KCONFIG:=$(CONFIG_PARPORT) FILES:= \ - $(MODULES_DIR)/kernel/drivers/parport/parport.$(LINUX_KMOD_SUFFIX) \ - $(MODULES_DIR)/kernel/drivers/char/lp.$(LINUX_KMOD_SUFFIX) \ - $(MODULES_DIR)/kernel/drivers/char/ppdev.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/drivers/parport/parport.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/drivers/char/lp.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/drivers/char/ppdev.$(LINUX_KMOD_SUFFIX) SUBMENU:=$(EMENU) AUTOLOAD:=$(call AutoLoad,50, \ parport \ @@ -107,15 +107,15 @@ define KernelPackage/soundcore endef define KernelPackage/soundcore/2.4 - FILES:=$(MODULES_DIR)/kernel/drivers/sound/soundcore.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/sound/soundcore.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,30,soundcore) endef define KernelPackage/soundcore/2.6 FILES:= \ - $(MODULES_DIR)/kernel/sound/soundcore.$(LINUX_KMOD_SUFFIX) \ - $(MODULES_DIR)/kernel/sound/core/*.$(LINUX_KMOD_SUFFIX) \ - $(MODULES_DIR)/kernel/sound/core/oss/*.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/sound/soundcore.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/sound/core/*.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/sound/core/oss/*.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,30,soundcore snd snd-page-alloc snd-hwdep snd-rawmidi snd-timer snd-pcm snd-mixer-oss snd-pcm-oss) endef $(eval $(call KernelPackage,soundcore)) @@ -126,7 +126,7 @@ define KernelPackage/loop KCONFIG:=$(CONFIG_BLK_DEV_LOOP) SUBMENU:=$(EMENU) AUTOLOAD:=$(call AutoLoad,30,loop) - FILES:=$(MODULES_DIR)/kernel/drivers/block/loop.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/block/loop.$(LINUX_KMOD_SUFFIX) endef $(eval $(call KernelPackage,loop)) @@ -136,7 +136,7 @@ define KernelPackage/nbd KCONFIG:=$(CONFIG_BLK_DEV_NBD) SUBMENU:=$(EMENU) AUTOLOAD:=$(call AutoLoad,30,nbd) - FILES:=$(MODULES_DIR)/kernel/drivers/block/nbd.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/block/nbd.$(LINUX_KMOD_SUFFIX) endef $(eval $(call KernelPackage,nbd)) @@ -146,7 +146,7 @@ define KernelPackage/capi KCONFIG:=$(CONFIG_ISDN) $(CONFIG_ISDN_CAPI) $(CONFIG_ISDN_CAPI_CAPI20) SUBMENU:=$(EMENU) AUTOLOAD:=$(call AutoLoad,30,kernelcapi capi) - FILES:=$(MODULES_DIR)/kernel/drivers/isdn/capi/*capi.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/isdn/capi/*capi.$(LINUX_KMOD_SUFFIX) endef $(eval $(call KernelPackage,capi)) @@ -159,18 +159,18 @@ endef define KernelPackage/pcmcia-core/2.4 FILES:= \ - $(MODULES_DIR)/kernel/drivers/pcmcia/pcmcia_core.$(LINUX_KMOD_SUFFIX) \ - $(MODULES_DIR)/kernel/drivers/pcmcia/yenta_socket.$(LINUX_KMOD_SUFFIX) \ - $(MODULES_DIR)/kernel/drivers/pcmcia/ds.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/drivers/pcmcia/pcmcia_core.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/drivers/pcmcia/yenta_socket.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/drivers/pcmcia/ds.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,40,pcmcia_core yenta_socket ds) endef define KernelPackage/pcmcia-core/2.6 FILES:= \ - $(MODULES_DIR)/kernel/drivers/pcmcia/pcmcia_core.$(LINUX_KMOD_SUFFIX) \ - $(MODULES_DIR)/kernel/drivers/pcmcia/pcmcia.$(LINUX_KMOD_SUFFIX) \ - $(MODULES_DIR)/kernel/drivers/pcmcia/yenta_socket.$(LINUX_KMOD_SUFFIX) \ - $(MODULES_DIR)/kernel/drivers/pcmcia/rsrc_nonstatic.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/drivers/pcmcia/pcmcia_core.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/drivers/pcmcia/pcmcia.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/drivers/pcmcia/yenta_socket.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/drivers/pcmcia/rsrc_nonstatic.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,40,pcmcia_core pcmcia rsrc_nonstatic yenta_socket) endef $(eval $(call KernelPackage,pcmcia-core)) @@ -186,12 +186,12 @@ endef define KernelPackage/pcmcia-serial/2.4 KCONFIG:=$(CONFIG_PCMCIA_SERIAL_CS) - FILES:=$(MODULES_DIR)/kernel/drivers/char/pcmcia/serial_cs.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/char/pcmcia/serial_cs.$(LINUX_KMOD_SUFFIX) endef define KernelPackage/pcmcia-serial/2.6 KCONFIG:=$(CONFIG_SERIAL_8250_CS) - FILES:=$(MODULES_DIR)/kernel/drivers/serial/serial_cs.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/serial/serial_cs.$(LINUX_KMOD_SUFFIX) endef $(eval $(call KernelPackage,pcmcia-serial)) @@ -206,26 +206,26 @@ define KernelPackage/bluetooth define KernelPackage/bluetooth/2.4 KCONFIG:=$(CONFIG_BLUEZ) FILES:= \ - $(MODULES_DIR)/kernel/net/bluetooth/bluez.$(LINUX_KMOD_SUFFIX) \ - $(MODULES_DIR)/kernel/net/bluetooth/l2cap.$(LINUX_KMOD_SUFFIX) \ - $(MODULES_DIR)/kernel/net/bluetooth/sco.$(LINUX_KMOD_SUFFIX) \ - $(MODULES_DIR)/kernel/net/bluetooth/rfcomm/rfcomm.$(LINUX_KMOD_SUFFIX) \ - $(MODULES_DIR)/kernel/net/bluetooth/bnep/bnep.$(LINUX_KMOD_SUFFIX) \ - $(MODULES_DIR)/kernel/drivers/bluetooth/hci_uart.$(LINUX_KMOD_SUFFIX) \ - $(MODULES_DIR)/kernel/drivers/bluetooth/hci_usb.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/net/bluetooth/bluez.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/net/bluetooth/l2cap.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/net/bluetooth/sco.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/net/bluetooth/rfcomm/rfcomm.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/net/bluetooth/bnep/bnep.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/drivers/bluetooth/hci_uart.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/drivers/bluetooth/hci_usb.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,90,bluez l2cap sco rfcomm bnep hci_uart hci_usb) endef define KernelPackage/bluetooth/2.6 KCONFIG:=$(CONFIG_BT) FILES:= \ - $(MODULES_DIR)/kernel/net/bluetooth/bluetooth.$(LINUX_KMOD_SUFFIX) \ - $(MODULES_DIR)/kernel/net/bluetooth/l2cap.$(LINUX_KMOD_SUFFIX) \ - $(MODULES_DIR)/kernel/net/bluetooth/sco.$(LINUX_KMOD_SUFFIX) \ - $(MODULES_DIR)/kernel/net/bluetooth/rfcomm/rfcomm.$(LINUX_KMOD_SUFFIX) \ - $(MODULES_DIR)/kernel/net/bluetooth/bnep/bnep.$(LINUX_KMOD_SUFFIX) \ - $(MODULES_DIR)/kernel/drivers/bluetooth/hci_uart.$(LINUX_KMOD_SUFFIX) \ - $(MODULES_DIR)/kernel/drivers/bluetooth/hci_usb.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/net/bluetooth/bluetooth.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/net/bluetooth/l2cap.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/net/bluetooth/sco.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/net/bluetooth/rfcomm/rfcomm.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/net/bluetooth/bnep/bnep.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/drivers/bluetooth/hci_uart.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/drivers/bluetooth/hci_usb.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,90,bluetooth l2cap sco rfcomm bnep hci_uart hci_usb) endef $(eval $(call KernelPackage,bluetooth)) @@ -240,9 +240,9 @@ define KernelPackage/mmc define KernelPackage/mmc/2.6 KCONFIG:=$(CONFIG_MMC) FILES:= \ - $(MODULES_DIR)/kernel/drivers/mmc/mmc_core.$(LINUX_KMOD_SUFFIX) \ - $(MODULES_DIR)/kernel/drivers/mmc/mmc_block.$(LINUX_KMOD_SUFFIX) \ - $(MODULES_DIR)/kernel/drivers/mmc/at91_mci.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/drivers/mmc/mmc_core.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/drivers/mmc/mmc_block.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/drivers/mmc/at91_mci.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,90,mmc_core mmc_block at91_mci) endef $(eval $(call KernelPackage,mmc)) @@ -252,16 +252,16 @@ define KernelPackage/softdog DESCRIPTION:=Software watchdog driver SUBMENU:=$(EMENU) KCONFIG:=$(CONFIG_SOFT_WATCHDOG) - FILES:=$(MODULES_DIR)/kernel/drivers/char/softdog.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/char/softdog.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,50,softdog) endef define KernelPackage/softdog/2.4 - FILES:=$(MODULES_DIR)/kernel/drivers/char/softdog.o + FILES:=$(LINUX_DIR)/drivers/char/softdog.o endef define KernelPackage/softdog/2.6 - FILES:=$(MODULES_DIR)/kernel/drivers/char/watchdog/softdog.ko + FILES:=$(LINUX_DIR)/drivers/char/watchdog/softdog.ko endef $(eval $(call KernelPackage,softdog)) @@ -273,7 +273,7 @@ define KernelPackage/videodev DEPENDS:=@VIDEO_SUPPORT SUBMENU:=$(EMENU) KCONFIG:=$(CONFIG_VIDEO_DEV) - FILES:=$(MODULES_DIR)/kernel/drivers/media/video/*.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/media/video/*.$(LINUX_KMOD_SUFFIX) endef define KernelPackage/videodev/2.4 @@ -292,7 +292,7 @@ define KernelPackage/leds-net48xx DEPENDS:=@LINUX_2_6_X86_Soekris SUBMENU:=$(EMENU) KCONFIG:=$(CONFIG_LEDS_NET48XX) - FILES:=$(MODULES_DIR)/kernel/drivers/leds/leds-net48xx.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/leds/leds-net48xx.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,50,leds-net48xx) endef $(eval $(call KernelPackage,leds-net48xx)) @@ -304,7 +304,7 @@ define KernelPackage/nsc-gpio DEPENDS:=@LINUX_2_6_X86_Soekris SUBMENU:=$(EMENU) KCONFIG:=$(CONFIG_NSC_GPIO) - FILES:=$(MODULES_DIR)/kernel/drivers/char/nsc_gpio.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/char/nsc_gpio.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,40,nsc_gpio) endef $(eval $(call KernelPackage,nsc-gpio)) @@ -316,7 +316,7 @@ define KernelPackage/scx200-gpio DEPENDS:=kmod-nsc-gpio @LINUX_2_6_X86_Soekris SUBMENU:=$(EMENU) KCONFIG:=$(CONFIG_SCx200_GPIO) - FILES:=$(MODULES_DIR)/kernel/drivers/char/scx200_gpio.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/char/scx200_gpio.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,50,scx200_gpio) endef $(eval $(call KernelPackage,scx200-gpio)) @@ -328,7 +328,7 @@ define KernelPackage/scx200-wdt DEPENDS:=@LINUX_2_6_X86_Soekris SUBMENU:=$(EMENU) KCONFIG:=$(CONFIG_SC1200_WDT) - FILES:=$(MODULES_DIR)/kernel/drivers/char/watchdog/scx200_wdt.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/char/watchdog/scx200_wdt.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,50,scx200_wt) endef $(eval $(call KernelPackage,scx200-wdt)) @@ -340,8 +340,8 @@ define KernelPackage/hwmon SUBMENU:=$(EMENU) KCONFIG:=$(CONFIG_HWMON_VID) FILES:= \ - $(MODULES_DIR)/kernel/drivers/hwmon/hwmon.$(LINUX_KMOD_SUFFIX) \ - $(MODULES_DIR)/kernel/drivers/hwmon/hwmon-vid.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/drivers/hwmon/hwmon.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/drivers/hwmon/hwmon-vid.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,40,hwmon hwmon-vid) endef $(eval $(call KernelPackage,hwmon)) @@ -353,7 +353,7 @@ define KernelPackage/hwmon-pc87360 DEPENDS:=kmod-hwmon SUBMENU:=$(EMENU) KCONFIG:=$(CONFIG_SENSORS_PC87360) - FILES:=$(MODULES_DIR)/kernel/drivers/hwmon/pc87360.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/hwmon/pc87360.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,50,pc87360) endef $(eval $(call KernelPackage,hwmon-pc87360)) diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk index eb97262a76..99a497a92a 100644 --- a/package/kernel/modules/usb.mk +++ b/package/kernel/modules/usb.mk @@ -18,11 +18,11 @@ define KernelPackage/usb-core endef define KernelPackage/usb-core/2.4 - FILES:=$(MODULES_DIR)/kernel/drivers/usb/usbcore.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/usb/usbcore.$(LINUX_KMOD_SUFFIX) endef define KernelPackage/usb-core/2.6 - FILES:=$(MODULES_DIR)/kernel/drivers/usb/core/usbcore.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/usb/core/usbcore.$(LINUX_KMOD_SUFFIX) endef $(eval $(call KernelPackage,usb-core)) @@ -35,13 +35,13 @@ define KernelPackage/usb-uhci endef define KernelPackage/usb-uhci/2.4 - FILES:=$(MODULES_DIR)/kernel/drivers/usb/host/uhci.o + FILES:=$(LINUX_DIR)/drivers/usb/host/uhci.o KCONFIG:=$(CONFIG_USB_UHCI_ALT) AUTOLOAD:=$(call AutoLoad,50,uhci) endef define KernelPackage/usb-uhci/2.6 - FILES:=$(MODULES_DIR)/kernel/drivers/usb/host/uhci-hcd.ko + FILES:=$(LINUX_DIR)/drivers/usb/host/uhci-hcd.ko KCONFIG:=$(CONFIG_USB_UHCI_HCD) AUTOLOAD:=$(call AutoLoad,50,uhci-hcd) endef @@ -55,7 +55,7 @@ define KernelPackage/usb-uhci-iv endef define KernelPackage/usb-uhci-iv/2.4 - FILES:=$(MODULES_DIR)/kernel/drivers/usb/host/usb-uhci.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/usb/host/usb-uhci.$(LINUX_KMOD_SUFFIX) KCONFIG:=$(CONFIG_USB_UHCI) AUTOLOAD:=$(call AutoLoad,50,usb-uhci) endef @@ -69,13 +69,13 @@ define KernelPackage/usb-ohci endef define KernelPackage/usb-ohci/2.4 - FILES:=$(MODULES_DIR)/kernel/drivers/usb/host/usb-ohci.o + FILES:=$(LINUX_DIR)/drivers/usb/host/usb-ohci.o KCONFIG:=$(CONFIG_USB_OHCI) AUTOLOAD:=$(call AutoLoad,50,usb-ohci) endef define KernelPackage/usb-ohci/2.6 - FILES:=$(MODULES_DIR)/kernel/drivers/usb/host/ohci-hcd.ko + FILES:=$(LINUX_DIR)/drivers/usb/host/ohci-hcd.ko KCONFIG:=$(CONFIG_USB_OHCI_HCD) AUTOLOAD:=$(call AutoLoad,50,ohci-hcd) endef @@ -87,7 +87,7 @@ define KernelPackage/usb2 DEPENDS:=kmod-usb-core KCONFIG:=$(CONFIG_USB) SUBMENU:=$(USBMENU) - FILES:=$(MODULES_DIR)/kernel/drivers/usb/host/ehci-hcd.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/usb/host/ehci-hcd.$(LINUX_KMOD_SUFFIX) KCONFIG:=$(CONFIG_USB_EHCI_HCD) AUTOLOAD:=$(call AutoLoad,50,ehci-hcd) endef @@ -108,12 +108,12 @@ define KernelPackage/usb-acm endef define KernelPackage/usb-acm/2.4 - FILES:=$(MODULES_DIR)/kernel/drivers/usb/acm.o + FILES:=$(LINUX_DIR)/drivers/usb/acm.o AUTOLOAD:=$(call AutoLoad,60,acm) endef define KernelPackage/usb-acm/2.6 - FILES:=$(MODULES_DIR)/kernel/drivers/usb/class/cdc-acm.ko + FILES:=$(LINUX_DIR)/drivers/usb/class/cdc-acm.ko AUTOLOAD:=$(call AutoLoad,60,cdc-acm) endef $(eval $(call KernelPackage,usb-acm)) @@ -127,15 +127,15 @@ endef define KernelPackage/usb-audio/2.4 KCONFIG:=$(CONFIG_USB_AUDIO) - FILES:=$(MODULES_DIR)/kernel/drivers/usb/audio.o + FILES:=$(LINUX_DIR)/drivers/usb/audio.o AUTOLOAD:=$(call AutoLoad,60,audio) endef define KernelPackage/usb-audio/2.6 KCONFIG:=$(CONFIG_SND_USB_AUDIO) FILES:= \ - $(MODULES_DIR)/kernel/sound/usb/snd-usb-lib.ko \ - $(MODULES_DIR)/kernel/sound/usb/snd-usb-audio.ko + $(LINUX_DIR)/sound/usb/snd-usb-lib.ko \ + $(LINUX_DIR)/sound/usb/snd-usb-audio.ko AUTOLOAD:=$(call AutoLoad,60,snd-usb-lib snd-usb-audio) endef $(eval $(call KernelPackage,usb-audio)) @@ -149,12 +149,12 @@ define KernelPackage/usb-printer endef define KernelPackage/usb-printer/2.4 - FILES:=$(MODULES_DIR)/kernel/drivers/usb/printer.o + FILES:=$(LINUX_DIR)/drivers/usb/printer.o AUTOLOAD:=$(call AutoLoad,60,printer) endef define KernelPackage/usb-printer/2.6 - FILES:=$(MODULES_DIR)/kernel/drivers/usb/class/usblp.ko + FILES:=$(LINUX_DIR)/drivers/usb/class/usblp.ko AUTOLOAD:=$(call AutoLoad,60,usblp) endef $(eval $(call KernelPackage,usb-printer)) @@ -165,7 +165,7 @@ define KernelPackage/usb-serial TITLE:=Support for USB-to-Serial converters DESCRIPTION:=Kernel support for USB-to-Serial converters KCONFIG:=$(CONFIG_USB_SERIAL) - FILES:=$(MODULES_DIR)/kernel/drivers/usb/serial/usbserial.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/usb/serial/usbserial.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,60,usbserial) endef $(eval $(call KernelPackage,usb-serial)) @@ -177,7 +177,7 @@ define KernelPackage/usb-serial-belkin DEPENDS:=kmod-usb-serial SUBMENU:=$(USBMENU) KCONFIG:=$(CONFIG_USB_SERIAL_BELKIN) - FILES:=$(MODULES_DIR)/kernel/drivers/usb/serial/belkin_sa.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/usb/serial/belkin_sa.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,65,belkin_sa) endef $(eval $(call KernelPackage,usb-serial-belkin)) @@ -189,7 +189,7 @@ define KernelPackage/usb-serial-ftdi DEPENDS:=kmod-usb-serial SUBMENU:=$(USBMENU) KCONFIG:=$(CONFIG_USB_SERIAL_FTDI_SIO) - FILES:=$(MODULES_DIR)/kernel/drivers/usb/serial/ftdi_sio.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/usb/serial/ftdi_sio.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,65,ftdi_sio) endef $(eval $(call KernelPackage,usb-serial-ftdi)) @@ -201,7 +201,7 @@ define KernelPackage/usb-serial-mct DEPENDS:=kmod-usb-serial SUBMENU:=$(USBMENU) KCONFIG:=$(CONFIG_USB_SERIAL_MCT_U232) - FILES:=$(MODULES_DIR)/kernel/drivers/usb/serial/mct_u232.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/usb/serial/mct_u232.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,65,mct_u232) endef $(eval $(call KernelPackage,usb-serial-mct)) @@ -212,7 +212,7 @@ define KernelPackage/usb-serial-pl2303 DEPENDS:=kmod-usb-serial SUBMENU:=$(USBMENU) KCONFIG:=$(CONFIG_USB_SERIAL_PL2303) - FILES:=$(MODULES_DIR)/kernel/drivers/usb/serial/pl2303.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/usb/serial/pl2303.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,65,pl2303) endef $(eval $(call KernelPackage,usb-serial-pl2303)) @@ -224,7 +224,7 @@ define KernelPackage/usb-serial-visor DEPENDS:=kmod-usb-serial SUBMENU:=$(USBMENU) KCONFIG:=$(CONFIG_USB_SERIAL_VISOR) - FILES:=$(MODULES_DIR)/kernel/drivers/usb/serial/visor.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/usb/serial/visor.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,65,visor) endef $(eval $(call KernelPackage,usb-serial-visor)) @@ -236,7 +236,7 @@ define KernelPackage/usb-storage DESCRIPTION:=Kernel support for USB Mass Storage devices KCONFIG:=$(CONFIG_USB_STORAGE) FILES:= \ - $(MODULES_DIR)/kernel/drivers/usb/storage/usb-storage.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/drivers/usb/storage/usb-storage.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,60,scsi_mod sd_mod usb-storage) DEPENDS:=+kmod-scsi-core endef @@ -250,8 +250,8 @@ define KernelPackage/usb-speedtouch DESCRIPTION:=Kernel support for SpeedTouch USB ADSL modems KCONFIG:=$(CONFIG_USB_SPEEDTOUCH) FILES:= \ - $(MODULES_DIR)/kernel/drivers/usb/atm/usbatm.$(LINUX_KMOD_SUFFIX) \ - $(MODULES_DIR)/kernel/drivers/usb/atm/speedtch.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/drivers/usb/atm/usbatm.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/drivers/usb/atm/speedtch.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,70,usbatm speedtch) endef $(eval $(call KernelPackage,usb-speedtouch)) @@ -266,7 +266,7 @@ define KernelPackage/usb-pwc endef define KernelPackage/usb-pwc/2.4 - FILES:=$(MODULES_DIR)/kernel/drivers/usb/pwc.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/usb/pwc.$(LINUX_KMOD_SUFFIX) endef $(eval $(call KernelPackage,usb-pwc)) @@ -281,11 +281,11 @@ define KernelPackage/usb-net endef define KernelPackage/usb-net/2.4 - FILES:=$(MODULES_DIR)/kernel/drivers/usb/usbnet.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/usb/usbnet.$(LINUX_KMOD_SUFFIX) endef define KernelPackage/usb-net/2.6 - FILES:=$(MODULES_DIR)/kernel/drivers/usb/net/usbnet.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/usb/net/usbnet.$(LINUX_KMOD_SUFFIX) endef $(eval $(call KernelPackage,usb-net)) @@ -299,12 +299,12 @@ define KernelPackage/usb-net-asix endef define KernelPackage/usb-net-asix/2.4 - FILES:=$(MODULES_DIR)/kernel/drivers/usb/ax8817x.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/usb/ax8817x.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call Autoload,61,ax8817x) endef define KernelPackage/usb-net-asix/2.6 - FILES:=$(MODULES_DIR)/kernel/drivers/usb/net/asix.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/usb/net/asix.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call Autoload,61,asix) endef diff --git a/package/kernel/modules/wireless.mk b/package/kernel/modules/wireless.mk index ff5b79684e..f4c1686c43 100644 --- a/package/kernel/modules/wireless.mk +++ b/package/kernel/modules/wireless.mk @@ -21,7 +21,7 @@ define KernelPackage/ieee80211 DEPENDS:=@LINUX_2_6 +kmod-crypto KCONFIG:=$(CONFIG_IEEE80211) FILES:= \ - $(MODULES_DIR)/kernel/net/ieee80211/*.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/net/ieee80211/*.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,10, \ ieee80211_crypt \ ieee80211 \ @@ -39,7 +39,7 @@ define KernelPackage/ieee80211-softmac DEPENDS:=kmod-ieee80211 KCONFIG:=$(CONFIG_IEEE80211_SOFTMAC) FILES:= \ - $(MODULES_DIR)/kernel/net/ieee80211/softmac/*.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/net/ieee80211/softmac/*.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,20,ieee80211softmac) SUBMENU:=$(WIMENU) endef @@ -54,7 +54,7 @@ define KernelPackage/net-bcm43xx - bcm43xx DEPENDS:=kmod-ieee80211-softmac KCONFIG:=$(CONFIG_BCM43XX) - FILES:=$(MODULES_DIR)/kernel/drivers/net/wireless/bcm43xx/bcm43xx.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/net/wireless/bcm43xx/bcm43xx.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,50,bcm43xx) SUBMENU:=$(WIMENU) endef @@ -68,7 +68,7 @@ define KernelPackage/net-ipw2100 - ipw2100 DEPENDS:=kmod-ieee80211 KCONFIG:=$(CONFIG_IPW2100) - FILES:=$(MODULES_DIR)/kernel/drivers/net/wireless/ipw2100.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/net/wireless/ipw2100.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,50,ipw2100) SUBMENU:=$(WIMENU) endef @@ -82,7 +82,7 @@ define KernelPackage/net-ipw2200 - ipw2200 DEPENDS:=kmod-ieee80211 KCONFIG:=$(CONFIG_IPW2200) - FILES:=$(MODULES_DIR)/kernel/drivers/net/wireless/ipw2200.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/net/wireless/ipw2200.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,50,ipw2200) SUBMENU:=$(WIMENU) endef @@ -94,7 +94,7 @@ define KernelPackage/net-airo DESCRIPTION:=Driver for Cisco Aironet cards KCONFIG:=$(CONFIG_AIRO) SUBMENU:=$(WIMENU) - FILES:=$(MODULES_DIR)/kernel/drivers/net/wireless/airo.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/net/wireless/airo.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,50,airo) endef $(eval $(call KernelPackage,net-airo)) @@ -106,8 +106,8 @@ define KernelPackage/net-hermes KCONFIG:=$(CONFIG_HERMES) SUBMENU:=$(WIMENU) FILES:= \ - $(MODULES_DIR)/kernel/drivers/net/wireless/hermes.$(LINUX_KMOD_SUFFIX) \ - $(MODULES_DIR)/kernel/drivers/net/wireless/orinoco.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/drivers/net/wireless/hermes.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/drivers/net/wireless/orinoco.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,50,hermes orinoco) endef $(eval $(call KernelPackage,net-hermes)) @@ -119,7 +119,7 @@ define KernelPackage/net-hermes-pci KCONFIG:=$(CONFIG_PCI_HERMES) DEPENDS:=kmod-net-hermes SUBMENU:=$(WIMENU) - FILES:=$(MODULES_DIR)/kernel/drivers/net/wireless/orinoco_pci.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/net/wireless/orinoco_pci.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,55,orinoco_pci) endef $(eval $(call KernelPackage,net-hermes-pci)) @@ -131,7 +131,7 @@ define KernelPackage/net-hermes-plx KCONFIG:=$(CONFIG_PLX_HERMES) DEPENDS:=kmod-net-hermes SUBMENU:=$(WIMENU) - FILES:=$(MODULES_DIR)/kernel/drivers/net/wireless/orinoco_plx.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/net/wireless/orinoco_plx.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,55,orinoco_plx) endef $(eval $(call KernelPackage,net-hermes-plx)) @@ -142,7 +142,7 @@ define KernelPackage/net-prism54 DESCRIPTION:=Kernel modules for Intersil Prism54 support KCONFIG:=$(CONFIG_PRISM54) SUBMENU:=$(WIMENU) - FILES:=$(MODULES_DIR)/kernel/drivers/net/wireless/prism54/prism54.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/net/wireless/prism54/prism54.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,60,prism54) endef $(eval $(call KernelPackage,net-prism54)) @@ -154,7 +154,7 @@ define KernelPackage/net-zd1211rw KCONFIG:=$(CONFIG_ZD1211RW) DEPENDS:=+kmod-ieee80211 @LINUX_2_6 SUBMENU:=$(WIMENU) - FILES:=$(MODULES_DIR)/kernel/drivers/net/wireless/zd1211rw/zd1211rw.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/net/wireless/zd1211rw/zd1211rw.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,60,zd1211rw) endef $(eval $(call KernelPackage,net-zd1211rw)) |