Add the 93cx6 patch to generic-2.6, correctly fix dependencies on the rt2x00 drivers...

[openwrt.git] / package / rt61 / Makefile

diff --git a/package/rt61/Makefile b/package/rt61/Makefile
index c7554d2..6e7c600 100644 (file)
--- a/package/rt61/Makefile
+++ b/package/rt61/Makefile
@@ -4,48 +4,49 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: $
+# $Id$
 
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=rt61
-PKG_VERSION:=1.1.0-b1
+PKG_VERSION:=cvs-2007060307
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/rt61-$(PKG_VERSION)/
-PKG_SOURCE:=rt61-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/rt2400
-PKG_MD5SUM:=3f2600400a3d6d878a5d27d0a2e47eed
-PKG_CAT:=zcat
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=@openwrt/
+PKG_MD5SUM:=8d71fee47bdaac4c7d79180a4ea33649
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/kmod-rt61
-  SECTION:=kernel
-  CATEGORY:=Kernel drivers
-  DEPENDS:=@LINUX_2_6_RDC
-  TITLE:=Driver for Ralink RT61xx based boards
+define KernelPackage/rt61
+  SUBMENU:=Wireless Drivers
+  TITLE:=Driver for ralink MiMo pci chipsets 
+  DEPENDS:=@PCI_SUPPORT +wireless-tools
+  DESCRIPTION:=\
+        This package contains a driver for ralink rt2x61 pci chipsets.
   URL:=http://rt2x00.serialmonkey.com/
   VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
+  FILES:= \
+                $(PKG_BUILD_DIR)/Module/rt61.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,50,rt61)
 endef
 
+define KernelPackage/rt61/install
+       mkdir $(1)/lib/firmware
+       $(CP) -L $(PKG_BUILD_DIR)/Module/rt2*.bin $(1)/lib/firmware
+endef
+
+LINUX_PATCHLEVEL:=$(shell echo "$(LINUX_VERSION)" | cut -d. -f2)
+
 define Build/Compile
        $(MAKE) -C $(LINUX_DIR) \
                ARCH="$(LINUX_KARCH)" \
                CROSS_COMPILE="$(TARGET_CROSS)" \
-               PATCHLEVEL="$(LINUX_VERSION)" \
+               PATCHLEVEL="$(LINUX_PATCHLEVEL)" \
                KERNDIR="$(LINUX_DIR)" \
                SUBDIRS="$(PKG_BUILD_DIR)/Module" \
                modules
 endef
 
-define Package/kmod-rt61/install
-       mkdir -p $(1)/etc/modules.d
-       $(INSTALL_DATA) ./files/rt61.modules $(1)/etc/modules.d/10-ralink
-       $(INSTALL_DIR) $(1)/lib/modules/$(LINUX_VERSION)
-       $(CP) $(PKG_BUILD_DIR)/Module/rt61.$(LINUX_KMOD_SUFFIX) \
-               $(1)/lib/modules/$(LINUX_VERSION)/
-endef
-
-$(eval $(call BuildPackage,kmod-rt61))
+$(eval $(call KernelPackage,rt61))