package/rt2x00 fixes:

[openwrt.git] / package / rt2x00 / Makefile

diff --git a/package/rt2x00/Makefile b/package/rt2x00/Makefile
index 4ab5a12..6f99259 100644 (file)
--- a/package/rt2x00/Makefile
+++ b/package/rt2x00/Makefile
@@ -10,30 +10,31 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=rt2x00
-#PKG_VERSION:=cvs-20070725
-PKG_VERSION:=git-200706018
+PKG_VERSION:=cvs-20070712
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/rt2x00/Default
   SUBMENU:=Wireless Drivers
   TITLE:=Ralink GPL Drivers
+  DEPENDS:=@LINUX_2_6
+  KCONFIG:=CONFIG_MAC80211
   DESCRIPTION:=Ralink GPL Drivers for rt2x00 cards
   VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(LINUX_RELEASE)
 endef
 
 define KernelPackage/rt2x00-lib
   $(call Package/rt2x00/Default)
-  DEPENDS:=+kmod-mac80211
+  DEPENDS+= +kmod-mac80211 +kmod-crypto
   TITLE+= (LIB)
   DESCRIPTION+= (LIB)
   FILES:=$(PKG_BUILD_DIR)/rt2x00lib.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,25,rt2x00lib)
+  AUTOLOAD:=$(call AutoLoad,25,ecb arc4 rt2x00lib)
 endef
 
 define KernelPackage/rt2x00-pci
   $(call Package/rt2x00/Default)
-  DEPENDS:=@PCI_SUPPORT +kmod-rt2x00-lib
+  DEPENDS+= @PCI_SUPPORT +kmod-rt2x00-lib
   TITLE+= (PCI)
   DESCRIPTION+= (PCI)
   FILES:=$(PKG_BUILD_DIR)/rt2x00pci.$(LINUX_KMOD_SUFFIX)
@@ -42,7 +43,7 @@ endef
 
 define KernelPackage/rt2x00-usb
   $(call Package/rt2x00/Default)
-  DEPENDS:=@USB_SUPPORT +kmod-rt2x00-lib
+  DEPENDS+= @USB_SUPPORT +kmod-rt2x00-lib +kmod-usb-core
   TITLE+= (USB)
   DESCRIPTION+= (USB)
   FILES:=$(PKG_BUILD_DIR)/rt2x00usb.$(LINUX_KMOD_SUFFIX)
@@ -51,7 +52,7 @@ endef
 
 define KernelPackage/rt2400-pci
   $(call Package/rt2x00/Default)
-  DEPENDS:=+kmod-rt2x00-pci
+  DEPENDS+= +kmod-rt2x00-pci
   TITLE+= (RT2400 PCI)
   DESCRIPTION+= (RT2400 PCI)
   FILES:=$(PKG_BUILD_DIR)/rt2400pci.$(LINUX_KMOD_SUFFIX)
@@ -60,7 +61,7 @@ endef
 
 define KernelPackage/rt2500-pci
   $(call Package/rt2x00/Default)
-  DEPENDS:=+kmod-rt2x00-pci
+  DEPENDS+= +kmod-rt2x00-pci
   TITLE+= (RT2500 PCI)
   DESCRIPTION+= (RT2500 PCI)
   FILES:=$(PKG_BUILD_DIR)/rt2500pci.$(LINUX_KMOD_SUFFIX)
@@ -69,7 +70,7 @@ endef
 
 define KernelPackage/rt2500-usb
   $(call Package/rt2x00/Default)
-  DEPENDS:=+kmod-rt2x00-usb
+  DEPENDS+= +kmod-rt2x00-usb
   TITLE+= (RT2500 USB)
   DESCRIPTION+= (RT2500 USB)
   FILES:=$(PKG_BUILD_DIR)/rt2500usb.$(LINUX_KMOD_SUFFIX)
@@ -78,7 +79,7 @@ endef
 
 define KernelPackage/rt61-pci
   $(call Package/rt2x00/Default)
-  DEPENDS:=+kmod-rt2x00-pci
+  DEPENDS+= +kmod-rt2x00-pci
   TITLE+= (RT2x61 PCI)
   DESCRIPTION+= (RT2x61 PCI)
   FILES:=$(PKG_BUILD_DIR)/rt61pci.$(LINUX_KMOD_SUFFIX)
@@ -92,7 +93,7 @@ endef
 
 define KernelPackage/rt73-usb
   $(call Package/rt2x00/Default)
-  DEPENDS:=+kmod-rt2x00-usb
+  DEPENDS+= +kmod-rt2x00-usb
   TITLE+= (RT73 USB)
   DESCRIPTION+= (RT73 USB)
   FILES:=$(PKG_BUILD_DIR)/rt73usb.$(LINUX_KMOD_SUFFIX)
@@ -107,18 +108,23 @@ endef
 define Build/Prepare
        $(call Build/Prepare/Default)
        $(CP) -r src/* $(PKG_BUILD_DIR)/
-       sed 's/\$$$$(CONFIG_RT.*)/m\t\t/g' src/Makefile > $(PKG_BUILD_DIR)/Makefile
+       wget -N -P $(DL_DIR) http://www.ralinktech.com.tw/data/RT61_Firmware_V1.2.zip
+       wget -N -P $(DL_DIR) http://www.ralinktech.com.tw/data/RT71W_Firmware_V1.8.zip
+       unzip -jod $(PKG_BUILD_DIR) $(DL_DIR)/RT61_Firmware_V1.2.zip
+       unzip -jod $(PKG_BUILD_DIR) $(DL_DIR)/RT71W_Firmware_V1.8.zip
 endef
 
 define Build/Compile
-#      $(MAKE) -C "$(PKG_BUILD_DIR)" config_header
+       $(MAKE) -C "$(PKG_BUILD_DIR)" \
+               KERNDIR="$(LINUX_DIR)" \
+               config_header
+
        $(MAKE) -C "$(LINUX_DIR)" \
                CROSS_COMPILE="$(TARGET_CROSS)" \
                ARCH="$(LINUX_KARCH)" V="$(V)" \
                SUBDIRS="$(PKG_BUILD_DIR)" \
                KERNELVERSION="$(KERNEL)" \
-               KERNEL_SOURCE="$(LINUX_DIR)" \
-               CFLAGS_MODULE="-DMODULE -include $(PKG_BUILD_DIR)/rt2x00_compat.h" \
+               KERNEL_SOURCES="$(LINUX_DIR)" \
                KDIR="$(LINUX_DIR)"
 endef