X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/ff6f694b1890c3535596b21aaff3cfb45cd19731..213b89f9dd985ab728f9f0f485bc6402d0e4c256:/package/acx-mac80211/Makefile?ds=inline diff --git a/package/acx-mac80211/Makefile b/package/acx-mac80211/Makefile index 51a6ce37f..ad498824e 100644 --- a/package/acx-mac80211/Makefile +++ b/package/acx-mac80211/Makefile @@ -1,5 +1,5 @@ -# -# Copyright (C) 2007 OpenWrt.org +# +# Copyright (C) 2007-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -10,72 +10,75 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=acx-mac80211 -PKG_VERSION:=20070718 +PKG_REV:=11edba2 +PKG_VERSION:=20080805 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=http://teknoraver.campuslife.it/software/acx-mac80211/ -PKG_MD5SUM:=c6f339384c8ad17181a9f867a227ddae +PKG_SOURCE_URL:=git://gitorious.org/acx-mac80211/mainline.git +PKG_SOURCE_PROTO:=git +PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_VERSION:=$(PKG_REV) + +PKG_FW_C16_NAME:=tiacx111c16 +PKG_FW_C16_URL:=http://teknoraver.net/software/acx-mac80211/ +#PKG_FW_C16_MD5SUM:=fcd07de4b25e1d2aaf3b78b27c5b7ee9 #version 1.2.1.34 +PKG_FW_C16_MD5SUM:=7026826460376f6b174f9225bd7781b9 #version 2.3.1.31 -PKG_FW_NAME:=tiacx111c16 -PKG_FW_URL:=http://teknoraver.campuslife.it/software/acx-mac80211/ -PKG_FW_MD5SUM:=7026826460376f6b174f9225bd7781b9 +PKG_FW_C19_NAME:=tiacx111c19 +PKG_FW_C19_URL:=http://ipkg.k1k2.de/files/ +PKG_FW_C19_MD5SUM:=a1fa9681e297b4e36e257090fc12265a include $(INCLUDE_DIR)/package.mk -ifeq ($(DUMP),) - include $(LINUX_DIR)/.config -endif -# XXX: remove @!TARGET_* later when we have PCI support properly detected on all targets define KernelPackage/acx-mac80211 SUBMENU:=Wireless Drivers TITLE:=ACX111 Mac80211 driver - DESCRIPTION:=Driver for acx111 cards (Mac80211 version) - DEPENDS:=@LINUX_2_6 +kmod-mac80211 @!TARGET_atheros - KCONFIG:=CONFIG_MAC80211 + DEPENDS:=@LINUX_2_6 @PCI_SUPPORT||TARGET_ar7 +kmod-mac80211 @BROKEN FILES:=$(PKG_BUILD_DIR)/acx-mac80211.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,50,acx-mac80211) endef -$(STAMP_BUILT): $(DL_DIR)/$(PKG_FW_NAME) +define KernelPackage/acx-mac80211/description + Driver for acx111 cards (Mac80211 version) +endef -$(DL_DIR)/$(PKG_FW_NAME): - $(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(PKG_FW_NAME)" "$(PKG_FW_MD5SUM)" $(PKG_FW_URL) +$(STAMP_BUILT): $(DL_DIR)/$(PKG_FW_C16_NAME) $(DL_DIR)/$(PKG_FW_C19_NAME) -ifneq ($(CONFIG_MAC80211),) +$(DL_DIR)/$(PKG_FW_C16_NAME): + $(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(PKG_FW_C16_NAME)" "$(PKG_FW_C16_MD5SUM)" $(PKG_FW_C16_URL) - PKG_EXTRA_KCONFIG:= \ +$(DL_DIR)/$(PKG_FW_C19_NAME): + $(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(PKG_FW_C19_NAME)" "$(PKG_FW_C19_MD5SUM)" $(PKG_FW_C19_URL) + +PKG_EXTRA_KCONFIG:= \ CONFIG_ACX_MAC80211=m \ CONFIG_ACX_MAC80211_PCI=m \ - PKG_EXTRA_CFLAGS:= \ - -I$(STAGING_DIR)/usr/include/mac80211 \ +PKG_EXTRA_CFLAGS:= \ $(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=m,%,$(filter %=m,$(PKG_EXTRA_KCONFIG)))) \ $(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=y,%,$(filter %=y,$(PKG_EXTRA_KCONFIG)))) \ - define Build/Compile/it +define Build/Compile $(MAKE) -C "$(LINUX_DIR)" \ ARCH="$(LINUX_KARCH)" \ CROSS_COMPILE="$(TARGET_CROSS)" \ SUBDIRS="$(PKG_BUILD_DIR)" \ $(PKG_EXTRA_KCONFIG) \ EXTRA_CFLAGS="$(PKG_EXTRA_CFLAGS)" \ + LINUXINCLUDE="-I$(STAGING_DIR)/usr/include/mac80211 -I$(LINUX_DIR)/include \ + -include linux/autoconf.h" \ V="$(V)" \ modules - endef - -endif - -define Build/Configure endef -define Build/Compile -$(call Build/Compile/it) +define Build/Configure endef define KernelPackage/acx-mac80211/install $(INSTALL_DIR) $(1)/lib/firmware - $(INSTALL_DATA) $(DL_DIR)/$(PKG_FW_NAME) $(1)/lib/firmware/ + $(INSTALL_DATA) $(DL_DIR)/$(PKG_FW_C16_NAME) $(1)/lib/firmware/ + $(INSTALL_DATA) $(DL_DIR)/$(PKG_FW_C19_NAME) $(1)/lib/firmware/ endef $(eval $(call KernelPackage,acx-mac80211))