update wrt54g3g pattern version, add wrt54g3g-em pattern (#2663)

[openwrt.git] / package / madwifi / Makefile

diff --git a/package/madwifi/Makefile b/package/madwifi/Makefile
index 9f3d795..952da7e 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:=r2834-20071106

 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:=3de6b07146001b53bc45de5d3dd95bc2

 
 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


@@ -50,6 +53,11 @@ else
   endif
 endif
 
   endif
 endif
 

+# XXX: remove this check later when we have PCI support properly detected on all targets
+ifneq ($(CONFIG_TARGET_uml),)
+ BUS:=
+endif
+

 RATE_CONTROL:=minstrel
 
 MADWIFI_FILES:= \
 RATE_CONTROL:=minstrel
 
 MADWIFI_FILES:= \


@@ -89,7 +97,7 @@ define KernelPackage/madwifi
   SUBMENU:=Wireless Drivers
   TITLE:=Driver for Atheros wireless chipsets
   URL:=http://madwifi.org/
   SUBMENU:=Wireless Drivers
   TITLE:=Driver for Atheros wireless chipsets
   URL:=http://madwifi.org/

-  DEPENDS:=+wireless-tools @PCI_SUPPORT||TARGET_atheros @!TARGET_avr32 @!TARGET_etrax
+  DEPENDS:=+wireless-tools @PCI_SUPPORT||TARGET_atheros @!TARGET_avr32 @!TARGET_etrax @!TARGET_uml

   FILES:=$(MADWIFI_FILES)
   AUTOLOAD:=$(call AutoLoad,50,$(MADWIFI_AUTOLOAD))
 endef
   FILES:=$(MADWIFI_FILES)
   AUTOLOAD:=$(call AutoLoad,50,$(MADWIFI_AUTOLOAD))
 endef


@@ -138,14 +146,14 @@ define Build/Compile
 endef
 
 define Build/InstallDev
 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/
+       mkdir -p $(1)/usr/include/madwifi
+       $(CP) $(PKG_BUILD_DIR)/include $(1)/usr/include/madwifi/
+       mkdir -p $(1)/usr/include/madwifi/net80211
+       $(CP) $(PKG_BUILD_DIR)/net80211/*.h $(1)/usr/include/madwifi/net80211/

 endef
 
 define Build/UninstallDev
 endef
 
 define Build/UninstallDev

-       rm -rf  $(STAGING_DIR)/usr/include/madwifi
+       rm -rf $(1)/usr/include/madwifi

 endef
 
 define KernelPackage/madwifi/install
 endef
 
 define KernelPackage/madwifi/install