[backfire] backport r21293 (closes: #6918)

[openwrt-10.03/.git] / package / carl9170 / Makefile

diff --git a/package/carl9170/Makefile b/package/carl9170/Makefile
index 17f3376d2872db4adcd6a02e4a8aa2e9c4c5b08e..823838986740e076fe1377ab84640b8992118bae 100644 (file)
--- a/package/carl9170/Makefile
+++ b/package/carl9170/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,12 +9,13 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=carl9170
-PKG_VERSION:=0.9.2.1
+PKG_VERSION:=1.0.1.1
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://www.kernel.org/pub/linux/kernel/people/chr/carl9170/$(PKG_VERSION)
-PKG_MD5SUM:=5f0057ea651343460ea4f1fb093a4bdf
+PKG_SOURCE_URL:=@KERNEL/linux/kernel/people/chr/carl9170/$(PKG_VERSION) \
+       @KERNEL/linux/kernel/people/chr/carl9170/old/$(PKG_VERSION)
+PKG_MD5SUM:=8abbb4ae09a45a82af6f63cb65c7e2d8
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -23,7 +24,7 @@ DRV_PATH:=$(PKG_BUILD_DIR)/drivers/net/wireless/ath/carl9170
 define KernelPackage/carl9170
   SUBMENU:=Wireless Drivers
   TITLE:=Driver for Atheros AR9170 USB sticks
-  DEPENDS:=+kmod-mac80211 +kmod-ath
+  DEPENDS:=@USB_SUPPORT +kmod-mac80211 +kmod-ath +kmod-usb-core
   URL:=http://www.kernel.org/pub/linux/kernel/people/chr/carl9170
   FILES:=$(DRV_PATH)/carl9170usb.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,60,carl9170usb)
@@ -38,12 +39,15 @@ define Build/Prepare
        mkdir -p $(PKG_BUILD_DIR)
        $(HOST_TAR) -C $(PKG_BUILD_DIR) -xjf $(DL_DIR)/$(PKG_SOURCE)
        $(HOST_TAR) -C $(PKG_BUILD_DIR) -xf $(PKG_BUILD_DIR)/$(PKG_VERSION)/driver/carl9170-driver-$(PKG_VERSION).tar
-       ln -s Makefile.standalone $(DRV_PATH)/Makefile
+       ln -sf Makefile.standalone $(DRV_PATH)/Makefile
        ln -s $(STAGING_DIR)/usr/include/mac80211/ath/*.h $(PKG_BUILD_DIR)/drivers/net/wireless/ath/
        $(Build/Patch)
 endef
 
-BUILDFLAGS= \
+BUILDFLAGS = \
+       CONFIG_MAC80211_DEBUGFS=$(CONFIG_PACKAGE_MAC80211_DEBUGFS)
+
+EXTRA_CFLAGS = \
        $(if $(CONFIG_ATH_USER_REGD),-DATH_USER_REGD)
 
 define Build/Compile
@@ -51,7 +55,8 @@ define Build/Compile
                SUBDIRS="$(DRV_PATH)" \
                ARCH="$(LINUX_KARCH)" \
                CROSS_COMPILE="$(KERNEL_CROSS)" \
-               CC="$(TARGET_CC) -I$(STAGING_DIR)/usr/include/mac80211 $(BUILDFLAGS)"
+               CC="$(TARGET_CC) -I$(STAGING_DIR)/usr/include/mac80211 $(EXTRA_CFLAGS)" \
+               $(BUILDFLAGS)
 endef
 
 define KernelPackage/carl9170/install