updated linux-uvc, from #2512

[openwrt.git] / package / mac80211 / Makefile

diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile
index 6d72986..416507f 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_NAME:=mac80211
 PKG_RELEASE:=1
 

-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)
-

 include $(INCLUDE_DIR)/package.mk
 ifeq ($(DUMP),)
   include $(LINUX_DIR)/.config
 include $(INCLUDE_DIR)/package.mk
 ifeq ($(DUMP),)
   include $(LINUX_DIR)/.config


@@ -22,11 +20,8 @@ endif
 define KernelPackage/mac80211
   SUBMENU:=Wireless Drivers
   TITLE:=Linux 802.11 Wireless Networking Stack
 define KernelPackage/mac80211
   SUBMENU:=Wireless Drivers
   TITLE:=Linux 802.11 Wireless Networking Stack

-  DEPENDS:=@LINUX_2_6
+  DEPENDS:=@LINUX_2_6 +kmod-crypto-arc4 +kmod-crypto-aes

   KCONFIG:=CONFIG_MAC80211
   KCONFIG:=CONFIG_MAC80211

-  DESCRIPTION:=\
-       This package contains the DeviceScape 80211 wireless stack.
-  VERSION:=$(PKG_RELEASE)+$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)

   FILES:= \
        $(PKG_BUILD_DIR)/mac80211/mac80211.$(LINUX_KMOD_SUFFIX) \
        $(PKG_BUILD_DIR)/mac80211/rc80211_lowest.$(LINUX_KMOD_SUFFIX) \
   FILES:= \
        $(PKG_BUILD_DIR)/mac80211/mac80211.$(LINUX_KMOD_SUFFIX) \
        $(PKG_BUILD_DIR)/mac80211/rc80211_lowest.$(LINUX_KMOD_SUFFIX) \


@@ -35,6 +30,10 @@ define KernelPackage/mac80211
   AUTOLOAD:=$(call AutoLoad,20,cfg80211 mac80211 rc80211_simple)
 endef
 
   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
        mkdir -p $(PKG_BUILD_DIR)/mac80211
        $(CP) ./src/mac80211/* $(PKG_BUILD_DIR)/mac80211/
 define Build/Prepare
        mkdir -p $(PKG_BUILD_DIR)/mac80211
        $(CP) ./src/mac80211/* $(PKG_BUILD_DIR)/mac80211/


@@ -63,12 +62,17 @@ define Build/Compile
 endef
 
 define Build/InstallDev
 endef
 
 define Build/InstallDev

-       mkdir -p $(STAGING_DIR)/usr/include/mac80211
-       $(CP) $(PKG_BUILD_DIR)/mac80211/{hostapd_ioctl,ieee80211_common}.h $(STAGING_DIR)/usr/include/mac80211/
+       mkdir -p $(1)/usr/include/mac80211
+       $(CP) $(PKG_BUILD_DIR)/mac80211/{hostapd_ioctl,ieee80211_common}.h $(1)/usr/include/mac80211/

 endef
 
 define Build/UninstallDev
 endef
 
 define Build/UninstallDev

-       rm -rf  $(STAGING_DIR)/usr/include/mac80211
+       rm -rf  $(1)/usr/include/mac80211
+endef
+
+define KernelPackage/mac80211/install
+       $(INSTALL_DIR) $(1)/lib/wifi
+       $(INSTALL_DATA) ./files/lib/wifi/mac80211.sh $(1)/lib/wifi

 endef
 
 $(eval $(call KernelPackage,mac80211))
 endef
 
 $(eval $(call KernelPackage,mac80211))