add iw utility (untested)

[openwrt.git] / package / madwifi / Makefile

diff --git a/package/madwifi/Makefile b/package/madwifi/Makefile
index f4f7fcd..0815c52 100644 (file)
--- a/package/madwifi/Makefile
+++ b/package/madwifi/Makefile
@@ -10,13 +10,13 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=madwifi
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=madwifi

-PKG_VERSION:=r2568-20070710
+PKG_VERSION:=r2978-20071127

 PKG_BRANCH:=madwifi-ng
 PKG_BRANCH:=madwifi-ng

-PKG_RELEASE:=2
+PKG_RELEASE:=1

 
 PKG_SOURCE:=$(PKG_BRANCH)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://snapshots.madwifi.org/$(PKG_BRANCH)
 
 PKG_SOURCE:=$(PKG_BRANCH)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://snapshots.madwifi.org/$(PKG_BRANCH)

-PKG_MD5SUM:=fe5d41acd085d2c46934be3f8839e694
+PKG_MD5SUM:=53d7e7c60caa4d613cf43763e33ce874

 
 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_BRANCH)-$(PKG_VERSION)
 
 
 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_BRANCH)-$(PKG_VERSION)
 


@@ -31,6 +31,9 @@ endif
 ifeq ($(ARCH),i386)
   HAL_TARGET:=i386-elf
 endif
 ifeq ($(ARCH),i386)
   HAL_TARGET:=i386-elf
 endif

+ifeq ($(ARCH),i686)
+  HAL_TARGET:=i386-elf
+endif

 ifeq ($(ARCH),armeb)
   HAL_TARGET:=xscale-be-elf
 endif
 ifeq ($(ARCH),armeb)
   HAL_TARGET:=xscale-be-elf
 endif


@@ -103,17 +106,6 @@ define KernelPackage/madwifi/description
  This package contains a driver for Atheros 802.11a/b/g chipsets.
 endef
 
  This package contains a driver for Atheros 802.11a/b/g chipsets.
 endef
 

-define KernelPackage/madwifi-karma
-  $(call KernelPackage/madwifi)
-  TITLE:=Madwifi for Karma support
-  URL:=http://www.digininja.org/
-endef
-
-define KernelPackage/madwifi-karma/description
-  This package contains a modified driver to be used with 
-  the Karma software for Atheros 802.11a/b/g chipsets.
-endef
-

 MAKE_ARGS:= \
        PATH="$(TARGET_PATH)" \
        ARCH="$(LINUX_KARCH)" \
 MAKE_ARGS:= \
        PATH="$(TARGET_PATH)" \
        ARCH="$(LINUX_KARCH)" \


@@ -146,9 +138,6 @@ endif
 
 define Build/Configure
        $(SED) 's,-E[LB] ,,g' $(PKG_BUILD_DIR)/hal/public/*.inc
 
 define Build/Configure
        $(SED) 's,-E[LB] ,,g' $(PKG_BUILD_DIR)/hal/public/*.inc

-ifneq ($(CONFIG_PACKAGE_kmod-madwifi-karma),)
-       $(PATCH) $(PKG_BUILD_DIR) ./files
-endif

 endef
 
 define Build/Compile
 endef
 
 define Build/Compile


@@ -174,12 +163,4 @@ define KernelPackage/madwifi/install
        $(CP) $(PKG_BUILD_DIR)/tools/{madwifi_multi,80211stats,athchans,athctrl,athkey,athstats,wlanconfig} $(1)/usr/sbin/
 endef
 
        $(CP) $(PKG_BUILD_DIR)/tools/{madwifi_multi,80211stats,athchans,athctrl,athkey,athstats,wlanconfig} $(1)/usr/sbin/
 endef
 

-define KernelPackage/madwifi-karma/install
-       $(INSTALL_DIR) $(1)/lib/wifi
-       $(INSTALL_DATA) ./files/lib/wifi/madwifi.sh $(1)/lib/wifi
-       $(INSTALL_DIR) $(1)/usr/sbin
-       $(CP) $(PKG_BUILD_DIR)/tools/{madwifi_multi,80211stats,athchans,athctrl,athkey,athstats,wlanconfig} $(1)/usr/sbin/
-endef
-

 $(eval $(call KernelPackage,madwifi))
 $(eval $(call KernelPackage,madwifi))

-$(eval $(call KernelPackage,madwifi-karma))