From 83790f74ad846ab2a50c71fab34a2d7755df4a95 Mon Sep 17 00:00:00 2001 From: nbd Date: Wed, 18 Apr 2007 12:28:38 +0000 Subject: Improved autorebuild for kernel related stuff. - make modules_install in the kernel tree is no longer called - make modules is called on every target/compile run - kmod packages pull the kernel modules directly out of the kernel tree and have proper file depends on them git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6998 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/wireless.mk | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'package/kernel/modules/wireless.mk') diff --git a/package/kernel/modules/wireless.mk b/package/kernel/modules/wireless.mk index ff5b79684..f4c1686c4 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)) -- cgit v1.2.3