p54spi: Compile in the default eeprom image

[openwrt.git] / package / acx-mac80211 / Makefile

diff --git a/package/acx-mac80211/Makefile b/package/acx-mac80211/Makefile
index fb2216f..59119b1 100644 (file)
--- a/package/acx-mac80211/Makefile
+++ b/package/acx-mac80211/Makefile
@@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=acx-mac80211
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=acx-mac80211

-PKG_REV:=02c4f99b
-PKG_VERSION:=20100514
+PKG_REV:=a5f1bfc9
+PKG_VERSION:=20100815

 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2

-PKG_SOURCE_URL:=git://gitorious.org/~oli1417/acx-mac80211/oli1417-clone.git
+PKG_SOURCE_URL:=git://acx100.git.sourceforge.net/gitroot/acx100/acx-mac80211

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_VERSION:=$(PKG_REV)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_VERSION:=$(PKG_REV)


@@ -25,7 +25,7 @@ define KernelPackage/acx-mac80211
   SUBMENU:=Wireless Drivers
   TITLE:=ACX111 Mac80211 driver
   DEPENDS:=@PCI_SUPPORT||TARGET_ar7 +kmod-mac80211
   SUBMENU:=Wireless Drivers
   TITLE:=ACX111 Mac80211 driver
   DEPENDS:=@PCI_SUPPORT||TARGET_ar7 +kmod-mac80211

-  FILES:=$(PKG_BUILD_DIR)/acx-mac80211.$(LINUX_KMOD_SUFFIX)
+  FILES:=$(PKG_BUILD_DIR)/acx-mac80211.ko

   AUTOLOAD:=$(call AutoLoad,50,acx-mac80211)
 endef
 
   AUTOLOAD:=$(call AutoLoad,50,acx-mac80211)
 endef
 


@@ -60,6 +60,12 @@ 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)))) \
 
        $(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=m,%,$(filter %=m,$(PKG_EXTRA_KCONFIG)))) \
        $(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=y,%,$(filter %=y,$(PKG_EXTRA_KCONFIG)))) \
 

+ifneq ($(CONFIG_LINUX_2_6_25)$(CONFIG_LINUX_2_6_30)$(CONFIG_LINUX_2_6_31)$(CONFIG_LINUX_2_6_32),)
+  LINUX_AUTOCONF_FILE:= linux/autoconf.h
+else
+  LINUX_AUTOCONF_FILE:= generated/autoconf.h
+endif
+

 define Build/Compile
        $(MAKE) -C "$(LINUX_DIR)" \
                ARCH="$(LINUX_KARCH)" \
 define Build/Compile
        $(MAKE) -C "$(LINUX_DIR)" \
                ARCH="$(LINUX_KARCH)" \


@@ -69,7 +75,7 @@ define Build/Compile
                EXTRA_CFLAGS="$(PKG_EXTRA_CFLAGS) -DCONFIG_ACX_MAC80211_VERSION=\"KERNEL_VERSION(2,6,34)\"" \
                LINUXINCLUDE="-I$(STAGING_DIR)/usr/include/mac80211 -I$(LINUX_DIR)/include \
                        -Iarch/$(LINUX_KARCH)/include \
                EXTRA_CFLAGS="$(PKG_EXTRA_CFLAGS) -DCONFIG_ACX_MAC80211_VERSION=\"KERNEL_VERSION(2,6,34)\"" \
                LINUXINCLUDE="-I$(STAGING_DIR)/usr/include/mac80211 -I$(LINUX_DIR)/include \
                        -Iarch/$(LINUX_KARCH)/include \

-                       -include linux/autoconf.h" \
+                       -include $(LINUX_AUTOCONF_FILE)" \

                V="$(V)" \
                modules
 endef
                V="$(V)" \
                modules
 endef