X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/3912d46a72c934a0801c0baf8d7483434d4684f5..addc1928bde31342dc4e244d519036372bc5b4ff:/package/mac80211/Makefile?ds=sidebyside

diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile
index e44e6870f..42f8ad232 100644
--- a/package/mac80211/Makefile
+++ b/package/mac80211/Makefile
@@ -12,56 +12,65 @@ 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
-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)
+  TITLE:=Linux 802.11 Wireless Networking Stack
+  DEPENDS:=@LINUX_2_6_23 +kmod-crypto-arc4 +kmod-crypto-aes +wireless-tools
   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)
+	$(PKG_BUILD_DIR)/net/mac80211/mac80211.$(LINUX_KMOD_SUFFIX) \
+	$(PKG_BUILD_DIR)/net/wireless/cfg80211.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,20,cfg80211 mac80211)
 endef
 
-define Build/Prepare
-	mkdir -p $(PKG_BUILD_DIR)/mac80211
-	$(CP) ./src/mac80211/* $(PKG_BUILD_DIR)/mac80211/
-	mkdir -p $(PKG_BUILD_DIR)/wireless
-	$(CP) ./src/wireless/* $(PKG_BUILD_DIR)/wireless/
+define KernelPackage/mac80211/description
+Linux 802.11 Wireless Networking Stack
 endef
 
-MAKE_OPTS:=-C "$(LINUX_DIR)" \
+CONFOPTS:=MAC80211 CFG80211 NL80211
+
+BUILDFLAGS:= \
+	$(foreach opt,$(CONFOPTS),-DCONFIG_$(opt) -DCONFIG_MAC80211_RCSIMPLE=1) \
+	$(if $(CONFIG_LEDS_TRIGGERS), -DCONFIG_MAC80211_LEDS -DCONFIG_LEDS_TRIGGERS)
+
+MAKE_OPTS:= \
 	CROSS_COMPILE="$(TARGET_CROSS)" \
 	ARCH="$(LINUX_KARCH)" \
-	EXTRA_CFLAGS="$(BUILDFLAGS) -DCONFIG_MAC80211_LEDS" \
-	CONFIG_MAC80211=m \
-	CONFIG_MAC80211_LEDS=y
+	EXTRA_CFLAGS="$(BUILDFLAGS)" \
+	$(foreach opt,$(CONFOPTS),CONFIG_$(opt)=m) \
+	CONFIG_NL80211=y \
+	CONFIG_MAC80211_RCSIMPLE=y \
+	CONFIG_MAC80211_LEDS=$(CONFIG_LEDS_TRIGGERS) \
+	LINUXINCLUDE="-I$(PKG_BUILD_DIR)/include -I$(LINUX_DIR)/include -include linux/autoconf.h" \
+
+define Build/Prepare
+	rm -rf $(PKG_BUILD_DIR)
+	mkdir -p $(PKG_BUILD_DIR)
+	$(CP) ./src/* $(PKG_BUILD_DIR)/
+	$(Build/Patch)
+	$(if $(QUILT),touch $(PKG_BUILD_DIR)/.quilt_used)
+endef
 
 define Build/Compile
-	$(MAKE) $(MAKE_OPTS) SUBDIRS="$(PKG_BUILD_DIR)/wireless" modules
-	$(MAKE) $(MAKE_OPTS) SUBDIRS="$(PKG_BUILD_DIR)/mac80211" modules
+	$(MAKE) -C "$(LINUX_DIR)" $(MAKE_OPTS) SUBDIRS="$(PKG_BUILD_DIR)/net/wireless" modules
+	$(MAKE) -C "$(LINUX_DIR)" $(MAKE_OPTS) SUBDIRS="$(PKG_BUILD_DIR)/net/mac80211" modules
 endef
 
-#define Build/InstallDev
-#	mkdir -p $(STAGING_DIR)/usr/include/madwifi
-#	$(CP) $(PKG_BUILD_DIR)/include $(STAGING_DIR)/usr/include/madwifi/
-#	mkdir -p $(STAGING_DIR)/usr/include/madwifi/net80211
-#	$(CP) $(PKG_BUILD_DIR)/net80211/*.h $(STAGING_DIR)/usr/include/madwifi/net80211/
-#endef
+ifeq ($(CONFIG_LINUX_2_6_23),y)
+  define Build/InstallDev
+	mkdir -p $(1)/usr/include/mac80211
+	$(CP) $(PKG_BUILD_DIR)/net/mac80211/*.h $(PKG_BUILD_DIR)/include/* $(1)/usr/include/mac80211/
+  endef
 
-#define Build/UninstallDev
-#	rm -rf	$(STAGING_DIR)/usr/include/madwifi
-#endef
+  define Build/UninstallDev
+	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
+endif
 
 $(eval $(call KernelPackage,mac80211))