diff options
author | Felix Fietkau <nbd@openwrt.org> | 2007-10-13 22:41:08 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2007-10-13 22:41:08 +0000 |
commit | 099b35adb98a2cf436723dc2ec3671c959034507 (patch) | |
tree | a5b647b9a9c39c7ea7e595d7d69e8920dd6d1121 /package/mac80211/Makefile | |
parent | 3309db425e32bec9b2a6201d7798993b2073d488 (diff) | |
download | upstream-099b35adb98a2cf436723dc2ec3671c959034507.tar.gz upstream-099b35adb98a2cf436723dc2ec3671c959034507.tar.bz2 upstream-099b35adb98a2cf436723dc2ec3671c959034507.zip |
add updated mac80211 - this no longer relies on patching includes in the kernel trees, but just uses its own instead
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9290 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/Makefile')
-rw-r--r-- | package/mac80211/Makefile | 55 |
1 files changed, 28 insertions, 27 deletions
diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile index 416507f9ed..1898998a1e 100644 --- a/package/mac80211/Makefile +++ b/package/mac80211/Makefile @@ -21,58 +21,59 @@ define KernelPackage/mac80211 SUBMENU:=Wireless Drivers 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_simple) endef define KernelPackage/mac80211/description - This package contains the DeviceScape 80211 wireless stack. +Linux 802.11 Wireless Networking Stack 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/ -endef +CONFOPTS:=MAC80211 CFG80211 NL80211 -ifneq ($(CONFIG_MAC80211),) +BUILDFLAGS:= \ + $(foreach opt,$(CONFOPTS),-DCONFIG_$(opt) ) \ + $(if $(CONFIG_LEDS_TRIGGERS), -DCONFIG_MAC80211_LEDS -DCONFIG_LEDS_TRIGGERS) - MAKE_OPTS:= \ +MAKE_OPTS:= \ CROSS_COMPILE="$(TARGET_CROSS)" \ ARCH="$(LINUX_KARCH)" \ - EXTRA_CFLAGS="$(BUILDFLAGS) -DCONFIG_MAC80211_LEDS -DCONFIG_LEDS_TRIGGERS" \ - CONFIG_MAC80211=m \ + EXTRA_CFLAGS="$(BUILDFLAGS)" \ + $(foreach opt,$(CONFOPTS),CONFIG_$(opt)=m) \ CONFIG_MAC80211_LEDS=$(CONFIG_LEDS_TRIGGERS) \ + LINUXINCLUDE="-I${CURDIR}/src/include -I$(LINUX_DIR)/include -include linux/autoconf.h" \ + V=1 + + +ifneq ($(findstring 2.6.23,$(LINUX_VERSION)),) + 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/ + endef - define Build/Compile/it + define Build/Compile $(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 + define Build/InstallDev mkdir -p $(1)/usr/include/mac80211 - $(CP) $(PKG_BUILD_DIR)/mac80211/{hostapd_ioctl,ieee80211_common}.h $(1)/usr/include/mac80211/ -endef + $(CP) ./src/include $(1)/usr/include/mac80211/ + endef -define Build/UninstallDev + define Build/UninstallDev rm -rf $(1)/usr/include/mac80211 -endef + endef -define KernelPackage/mac80211/install + define KernelPackage/mac80211/install $(INSTALL_DIR) $(1)/lib/wifi $(INSTALL_DATA) ./files/lib/wifi/mac80211.sh $(1)/lib/wifi -endef + endef +endif $(eval $(call KernelPackage,mac80211)) |