Updated acx (#2394) and fixed acx-mac80211 build

[openwrt.git] / package / acx / Makefile

diff --git a/package/acx/Makefile b/package/acx/Makefile
index 210a80c..a0e087a 100644 (file)
--- a/package/acx/Makefile
+++ b/package/acx/Makefile
@@ -10,15 +10,19 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=acx
-PKG_VERSION:=20070101
+PKG_VERSION:=20070610
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@openwrt/
-PKG_MD5SUM:=ec6322b9c82781897a9433ef0cefda6f
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-#PKG_CAT:=bzcat
-PKG_UNPACK:=bzcat $(DL_DIR)/$(PKG_SOURCE) | \
+PKG_MD5SUM:=ce36d3d00f87a331d3dee6d5359d4499
+
+PKG_FW_NAME:=tiacx111c16
+PKG_FW_URL:=http://teknoraver.campuslife.it/software/acx-mac80211/
+PKG_FW_MD5SUM:=7026826460376f6b174f9225bd7781b9
+
+PKG_UNPACK:= \
+       bzcat $(DL_DIR)/$(PKG_SOURCE) | \
        $(TAR) -C $(KERNEL_BUILD_DIR) $(TAR_OPTIONS); \
        chmod -R u+w $(PKG_BUILD_DIR)
 
@@ -26,16 +30,23 @@ include $(INCLUDE_DIR)/package.mk
 
 define KernelPackage/acx
   TITLE:=Driver for TI ACX1xx chipset
-  DEPENDS:=@LINUX_2_6&&!LINUX_2_6_AVR32 +wireless-tools
-  DESCRIPTION:=\
-       This package contains a driver for TI ACX1xx 802.11a/b/g chipsets.
+  DEPENDS:=@LINUX_2_6 @!TARGET_avr32 +wireless-tools
   URL:=http://acx100.sourceforge.net/
   SUBMENU:=Wireless Drivers
-  FILES:= \
-               $(PKG_BUILD_DIR)/acx.$(LINUX_KMOD_SUFFIX)
+  FILES:= $(PKG_BUILD_DIR)/acx.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,acx)
 endef
 
+define KernelPackage/acx/description
+ This package contains a driver for TI ACX1xx 802.11a/b/g chipsets.
+endef
+
+$(STAMP_BUILT): $(DL_DIR)/$(PKG_FW_NAME)
+
+$(DL_DIR)/$(PKG_FW_NAME):
+       $(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(PKG_FW_NAME)" "$(PKG_FW_MD5SUM)" $(PKG_FW_URL)
+
+
 define Build/Compile
        $(MAKE) -C $(LINUX_DIR) \
                SUBDIRS="$(PKG_BUILD_DIR)" \
@@ -52,4 +63,9 @@ define Build/Compile
                modules
 endef
 
+define KernelPackage/acx/install
+       $(INSTALL_DIR) $(1)/lib/firmware
+       $(INSTALL_DATA) $(DL_DIR)/$(PKG_FW_NAME) $(1)/lib/firmware/
+endef
+
 $(eval $(call KernelPackage,acx))