GPIODEV: Fix open-count race condition.

[openwrt.git] / package / acx-mac80211 / Makefile

diff --git a/package/acx-mac80211/Makefile b/package/acx-mac80211/Makefile
index ee3f653..c365037 100644 (file)
--- a/package/acx-mac80211/Makefile
+++ b/package/acx-mac80211/Makefile
@@ -10,12 +10,12 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=acx-mac80211
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=acx-mac80211

-PKG_VERSION:=20070610
-PKG_RELEASE:=
+PKG_VERSION:=20080112
+PKG_RELEASE:=1

 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2

-PKG_SOURCE_URL:=http://www.hauke-m.de/fileadmin/acx
-PKG_MD5SUM:=7c6c70722a5a2ad6ad25075467ea4909
+PKG_SOURCE_URL:=@SF/acx100
+PKG_MD5SUM:=3d2253c3a639ebccf06113be888118fb

 
 PKG_FW_NAME:=tiacx111c16
 PKG_FW_URL:=http://teknoraver.campuslife.it/software/acx-mac80211/
 
 PKG_FW_NAME:=tiacx111c16
 PKG_FW_URL:=http://teknoraver.campuslife.it/software/acx-mac80211/


@@ -23,35 +23,50 @@ PKG_FW_MD5SUM:=7026826460376f6b174f9225bd7781b9
 
 include $(INCLUDE_DIR)/package.mk
 
 
 include $(INCLUDE_DIR)/package.mk
 

+# XXX: remove @!TARGET_* later when we have PCI support properly detected on all targets

 define KernelPackage/acx-mac80211
   SUBMENU:=Wireless Drivers
   TITLE:=ACX111 Mac80211 driver
 define KernelPackage/acx-mac80211
   SUBMENU:=Wireless Drivers
   TITLE:=ACX111 Mac80211 driver

-  DESCRIPTION:=Driver for acx111 cards (Mac80211 version)
-  DEPENDS:=@LINUX_2_6 +kmod-mac80211
-  VERSION:=$(PKG_VERSION)+$(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE)
-  KCONFIG:=CONFIG_MAC80211
+  DEPENDS:=+kmod-mac80211 @!TARGET_atheros

   FILES:=$(PKG_BUILD_DIR)/acx-mac80211.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,acx-mac80211)
 endef
 
   FILES:=$(PKG_BUILD_DIR)/acx-mac80211.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,acx-mac80211)
 endef
 

+define KernelPackage/acx-mac80211/description
+       Driver for acx111 cards (Mac80211 version)
+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)
 
 $(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)
 

+PKG_EXTRA_KCONFIG:= \
+       CONFIG_ACX_MAC80211=m \
+       CONFIG_ACX_MAC80211_PCI=m \
+
+PKG_EXTRA_CFLAGS:= \
+       $(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=m,%,$(filter %=m,$(PKG_EXTRA_KCONFIG)))) \
+       $(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=y,%,$(filter %=y,$(PKG_EXTRA_KCONFIG)))) \
+

 define Build/Compile
        $(MAKE) -C "$(LINUX_DIR)" \
 define Build/Compile
        $(MAKE) -C "$(LINUX_DIR)" \

-               CROSS_COMPILE="$(TARGET_CROSS)" \

                ARCH="$(LINUX_KARCH)" \
                ARCH="$(LINUX_KARCH)" \

+               CROSS_COMPILE="$(TARGET_CROSS)" \

                SUBDIRS="$(PKG_BUILD_DIR)" \
                SUBDIRS="$(PKG_BUILD_DIR)" \

-               CONFIG_ACX_MAC80211=m \
-               CONFIG_ACX_MAC80211_PCI=m \
-               EXTRA_CFLAGS="-DCONFIG_ACX_MAC80211_PCI -DCONFIG_ACX_PCI_DEBUG_MAX -I$(PKG_BUILD_DIR)/../mac80211" \
+               $(PKG_EXTRA_KCONFIG) \
+               EXTRA_CFLAGS="$(PKG_EXTRA_CFLAGS)" \
+               LINUXINCLUDE="-I$(STAGING_DIR)/usr/include/mac80211 -I$(LINUX_DIR)/include \
+                       -include linux/autoconf.h" \
+               V="$(V)" \

                modules
 endef
 
                modules
 endef
 

+define Build/Configure
+endef
+

 define KernelPackage/acx-mac80211/install
 define KernelPackage/acx-mac80211/install

-       mkdir -p $(1)/lib/firmware
+       $(INSTALL_DIR) $(1)/lib/firmware

        $(INSTALL_DATA) $(DL_DIR)/$(PKG_FW_NAME) $(1)/lib/firmware/
 endef
 
        $(INSTALL_DATA) $(DL_DIR)/$(PKG_FW_NAME) $(1)/lib/firmware/
 endef