X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=package%2Fmadwifi%2FMakefile;h=f2fdac7b9d7f6a665ad49e2e27cbc558528e2cd5;hb=41696be697ac407621000be86fb56046c58ece0d;hp=f4f7fcd8b615a9323dbb9704c9276d4365b50915;hpb=e25a934150ac2895471c880a13aa1497a89168ce;p=openwrt.git diff --git a/package/madwifi/Makefile b/package/madwifi/Makefile index f4f7fcd8b6..f2fdac7b9d 100644 --- a/package/madwifi/Makefile +++ b/package/madwifi/Makefile @@ -10,18 +10,23 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=madwifi -PKG_VERSION:=r2568-20070710 -PKG_BRANCH:=madwifi-ng -PKG_RELEASE:=2 +PKG_REV:=3314 +PKG_VERSION:=r$(PKG_REV) +# PKG_BRANCH:=madwifi-dfs +PKG_RELEASE:=1 -PKG_SOURCE:=$(PKG_BRANCH)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://snapshots.madwifi.org/$(PKG_BRANCH) -PKG_MD5SUM:=fe5d41acd085d2c46934be3f8839e694 +PKG_SOURCE_PROTO:=svn +PKG_SOURCE_VERSION:=$(PKG_REV) +PKG_SOURCE_SUBDIR:=$(if $(PKG_BRANCH),$(PKG_BRANCH),madwifi-trunk)-$(PKG_VERSION) +PKG_SOURCE_URL:=http://svn.madwifi.org/madwifi/$(if $(PKG_BRANCH),branches/$(PKG_BRANCH),trunk) +PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz -PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_BRANCH)-$(PKG_VERSION) +PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(if $(PKG_BRANCH),$(PKG_BRANCH),madwifi-trunk)-$(PKG_VERSION) include $(INCLUDE_DIR)/package.mk +# MADWIFI_DEBUG=1 + ifeq ($(ARCH),mips) HAL_TARGET:=mips-be-elf endif @@ -31,10 +36,13 @@ endif ifeq ($(ARCH),i386) HAL_TARGET:=i386-elf endif -ifeq ($(ARCH),armeb) +ifeq ($(ARCH),i686) + HAL_TARGET:=i386-elf +endif +ifeq ($(BOARD),ixp4xx) HAL_TARGET:=xscale-be-elf endif -ifeq ($(ARCH),arm) +ifeq ($(BOARD),iop32x) HAL_TARGET:=xscale-le-elf endif ifeq ($(ARCH),powerpc) @@ -82,14 +90,20 @@ MADWIFI_AUTOLOAD:= \ wlan_xauth \ ifeq ($(findstring AHB,$(BUS)),AHB) - MADWIFI_FILES+= $(PKG_BUILD_DIR)/ath/ath_ahb.$(LINUX_KMOD_SUFFIX) - MADWIFI_AUTOLOAD+= ath_ahb + MADWIFI_FILES+= $(PKG_BUILD_DIR)/ath/ath_ahb.$(LINUX_KMOD_SUFFIX) + MADWIFI_AUTOLOAD+= ath_ahb endif ifeq ($(findstring PCI,$(BUS)),PCI) - MADWIFI_FILES+= $(PKG_BUILD_DIR)/ath/ath_pci.$(LINUX_KMOD_SUFFIX) - MADWIFI_AUTOLOAD+= ath_pci + MADWIFI_FILES+= $(PKG_BUILD_DIR)/ath/ath_pci.$(LINUX_KMOD_SUFFIX) + MADWIFI_AUTOLOAD+= ath_pci endif +MADWIFI_APPLETS:=80211stats,athchans,athctrl,athkey,athstats,wlanconfig +ifneq ($(MADWIFI_DEBUG),) + MADWIFI_APPLETS:=$(strip $(MADWIFI_APPLETS)),athdebug,80211debug +endif + + define KernelPackage/madwifi SUBMENU:=Wireless Drivers TITLE:=Driver for Atheros wireless chipsets @@ -103,17 +117,6 @@ define KernelPackage/madwifi/description 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)" \ @@ -124,12 +127,25 @@ MAKE_ARGS:= \ KERNELPATH="$(LINUX_DIR)" \ LDOPTS="--no-warn-mismatch " \ ATH_RATE="ath_rate/$(RATE_CONTROL)" \ - WARNINGS="" \ + WARNINGS="-Wno-unused" \ + $(if $(MADWIFI_DEBUG),,DEBUG="") \ DOMULTI=1 MAKE_VARS:= \ COPTS="-DCONFIG_ATHEROS_RATE_DEFAULT='\"$(RATE_CONTROL)\"'" \ +HALFILE:=$(lastword $(sort $(wildcard ./ath_hal-*.tgz))) +ifneq ($(HALFILE),) + define Build/Prepare + $(call Build/Prepare/Default) + rm -rf $(PKG_BUILD_DIR)/tmp + mkdir -p $(PKG_BUILD_DIR)/tmp + tar xvzf $(HALFILE) -C $(PKG_BUILD_DIR)/tmp + $(CP) $(PKG_BUILD_DIR)/tmp/ath_hal*/* $(PKG_BUILD_DIR)/hal/ + rm -rf $(PKG_BUILD_DIR)/tmp + endef +endif + ifeq ($(findstring AHB,$(BUS)),AHB) define Build/Compile/ahb $(MAKE_VARS) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_ARGS) BUS="AHB" modules @@ -146,9 +162,6 @@ endif 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 @@ -163,23 +176,11 @@ define Build/InstallDev $(CP) $(PKG_BUILD_DIR)/net80211/*.h $(1)/usr/include/madwifi/net80211/ endef -define Build/UninstallDev - rm -rf $(1)/usr/include/madwifi -endef - define KernelPackage/madwifi/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 - -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/ + $(CP) $(PKG_BUILD_DIR)/tools/{madwifi_multi,$(MADWIFI_APPLETS)} $(1)/usr/sbin/ endef $(eval $(call KernelPackage,madwifi)) -$(eval $(call KernelPackage,madwifi-karma))