summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-06-22 04:47:48 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-06-22 04:47:48 +0000
commit9491b9412bbb059be91ba347c25d96714f31f4c7 (patch)
tree08b7fc1ee9dc39bb8a4450bd1007626368b01d17
parent0559407398bb3f420f0366f5fc1fa8668a78bc82 (diff)
do not attempt to compile mac80211 on 2.6.21
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7701 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/mac80211/Makefile23
1 files changed, 8 insertions, 15 deletions
diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile
index e44e6870f4..7514fb9108 100644
--- a/package/mac80211/Makefile
+++ b/package/mac80211/Makefile
@@ -26,12 +26,14 @@ define KernelPackage/mac80211
DESCRIPTION:=\
This package contains the DeviceScape 80211 wireless stack.
VERSION:=$(PKG_RELEASE)+$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)
- FILES:= \
+ ifneq ($(KERNEL_PATCHVER),2.6.21)
+ 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)
+ AUTOLOAD:=$(call AutoLoad,20,cfg80211 mac80211 rc80211_lowest rc80211_simple)
+ endif
endef
define Build/Prepare
@@ -48,20 +50,11 @@ MAKE_OPTS:=-C "$(LINUX_DIR)" \
CONFIG_MAC80211=m \
CONFIG_MAC80211_LEDS=y
-define Build/Compile
+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
-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
-
-#define Build/UninstallDev
-# rm -rf $(STAGING_DIR)/usr/include/madwifi
-#endef
+ endef
+endif
$(eval $(call KernelPackage,mac80211))