upgrade acx and acx-mac80211, removed two patches now unneeded

[openwrt.git] / package / mac80211 / Makefile

diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile
index 7514fb9..63d7fff 100644 (file)
--- a/package/mac80211/Makefile
+++ b/package/mac80211/Makefile
@@ -12,8 +12,6 @@ include $(INCLUDE_DIR)/kernel.mk
 PKG_NAME:=mac80211
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)
-
 include $(INCLUDE_DIR)/package.mk
 ifeq ($(DUMP),)
   include $(LINUX_DIR)/.config
@@ -21,19 +19,19 @@ endif
 
 define KernelPackage/mac80211
   SUBMENU:=Wireless Drivers
-  TITLE:=DeviceScape 802.11 Wireless Networking Stack
-  DEPENDS:=@LINUX_2_6 +kmod-ieee80211
-  DESCRIPTION:=\
-       This package contains the DeviceScape 80211 wireless stack.
-  VERSION:=$(PKG_RELEASE)+$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)
-  ifneq ($(KERNEL_PATCHVER),2.6.21)
-   FILES:= \
+  TITLE:=Linux 802.11 Wireless Networking Stack
+  DEPENDS:=@LINUX_2_6 +kmod-crypto-arc4 +kmod-crypto-aes
+  KCONFIG:=CONFIG_MAC80211
+  FILES:= \
        $(PKG_BUILD_DIR)/mac80211/mac80211.$(LINUX_KMOD_SUFFIX) \
        $(PKG_BUILD_DIR)/mac80211/rc80211_lowest.$(LINUX_KMOD_SUFFIX) \
        $(PKG_BUILD_DIR)/mac80211/rc80211_simple.$(LINUX_KMOD_SUFFIX) \
        $(PKG_BUILD_DIR)/wireless/cfg80211.$(LINUX_KMOD_SUFFIX)
-   AUTOLOAD:=$(call AutoLoad,20,cfg80211 mac80211 rc80211_lowest rc80211_simple)
-  endif
+  AUTOLOAD:=$(call AutoLoad,20,cfg80211 mac80211 rc80211_simple)
+endef
+
+define KernelPackage/mac80211/description
+ This package contains the DeviceScape 80211 wireless stack.
 endef
 
 define Build/Prepare
@@ -43,18 +41,33 @@ define Build/Prepare
        $(CP) ./src/wireless/* $(PKG_BUILD_DIR)/wireless/
 endef
 
-MAKE_OPTS:=-C "$(LINUX_DIR)" \
+ifneq ($(CONFIG_MAC80211),)
+
+  MAKE_OPTS:= \
        CROSS_COMPILE="$(TARGET_CROSS)" \
        ARCH="$(LINUX_KARCH)" \
-       EXTRA_CFLAGS="$(BUILDFLAGS) -DCONFIG_MAC80211_LEDS" \
+       EXTRA_CFLAGS="$(BUILDFLAGS) -DCONFIG_MAC80211_LEDS -DCONFIG_LEDS_TRIGGERS" \
        CONFIG_MAC80211=m \
-       CONFIG_MAC80211_LEDS=y
+       CONFIG_MAC80211_LEDS=$(CONFIG_LEDS_TRIGGERS) \
 
-ifneq ($(KERNEL_PATCHVER),2.6.21)
-  define Build/Compile
-       $(MAKE) $(MAKE_OPTS) SUBDIRS="$(PKG_BUILD_DIR)/wireless" modules
-       $(MAKE) $(MAKE_OPTS) SUBDIRS="$(PKG_BUILD_DIR)/mac80211" modules
+  define Build/Compile/it
+       $(MAKE) -C "$(LINUX_DIR)" $(MAKE_OPTS) SUBDIRS="$(PKG_BUILD_DIR)/wireless" modules
+       $(MAKE) -C "$(LINUX_DIR)" $(MAKE_OPTS) SUBDIRS="$(PKG_BUILD_DIR)/mac80211" modules
   endef
+
 endif
 
+define Build/Compile
+       $(call Build/Compile/it)
+endef
+
+define Build/InstallDev
+       mkdir -p $(1)/usr/include/mac80211
+       $(CP) $(PKG_BUILD_DIR)/mac80211/{hostapd_ioctl,ieee80211_common}.h $(1)/usr/include/mac80211/
+endef
+
+define Build/UninstallDev
+       rm -rf  $(1)/usr/include/mac80211
+endef
+
 $(eval $(call KernelPackage,mac80211))