disable kmod-ip6tables if netfilter ipv6 support is disabled

[openwrt.git] / package / broadcom-wl / Makefile

diff --git a/package/broadcom-wl/Makefile b/package/broadcom-wl/Makefile
index fc3f035..f742818 100644 (file)
--- a/package/broadcom-wl/Makefile
+++ b/package/broadcom-wl/Makefile
@@ -10,14 +10,14 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=broadcom-wl
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=broadcom-wl

-PKG_VERSION:=4.80.9.2
+PKG_VERSION:=4.80.17.0

 PKG_RELEASE:=1
 WLC_VERSION:=0.1
 
 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://downloads.openwrt.org/sources
 PKG_RELEASE:=1
 WLC_VERSION:=0.1
 
 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://downloads.openwrt.org/sources

-PKG_MD5SUM:=7d9fab2c611369bbe075c3924ea77450
+PKG_MD5SUM:=3183ddb60e3e882b41df1776c89b614c

 PKG_CAT:=bzcat
 
 include $(INCLUDE_DIR)/package.mk
 PKG_CAT:=bzcat
 
 include $(INCLUDE_DIR)/package.mk


@@ -28,6 +28,7 @@ define Package/kmod-brcm-wl
   DEPENDS:=@LINUX_2_4_BRCM
   DEFAULT:=y
   SUBMENU:=Proprietary BCM43xx WiFi driver
   DEPENDS:=@LINUX_2_4_BRCM
   DEFAULT:=y
   SUBMENU:=Proprietary BCM43xx WiFi driver

+  SUBMENUDEP:=@LINUX_2_4_BRCM

   TITLE:=Kernel driver (normal version)
   DESCRIPTION:=Proprietary Wireless driver for the Broadcom BCM43xx chipset
   VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(PKG_RELEASE)
   TITLE:=Kernel driver (normal version)
   DESCRIPTION:=Proprietary Wireless driver for the Broadcom BCM43xx chipset
   VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(PKG_RELEASE)


@@ -58,7 +59,8 @@ endef
 
 define Package/nas
   $(call Package/wl)
 
 define Package/nas
   $(call Package/wl)

-  DEPENDS:=nvram
+  DEPENDS:=@PACKAGE_kmod-brcm-wl||PACKAGE_kmod-brcm-wl-mimo +nvram
+  DEFAULT:=m

   TITLE:=Proprietary WPA/WPA2 authenticator
   DESCRIPTION:=Proprietary WPA/WPA2 authenticator for the Broadcom wl driver
 endef
   TITLE:=Proprietary WPA/WPA2 authenticator
   DESCRIPTION:=Proprietary WPA/WPA2 authenticator for the Broadcom wl driver
 endef


@@ -94,7 +96,7 @@ define wl_template
        install -d -m0755 $(1)/etc/modules.d
        echo "wl$(2)" > $(1)/etc/modules.d/20-wl$(2)
        install -d -m0755 $(1)/lib/modules/$(LINUX_VERSION)
        install -d -m0755 $(1)/etc/modules.d
        echo "wl$(2)" > $(1)/etc/modules.d/20-wl$(2)
        install -d -m0755 $(1)/lib/modules/$(LINUX_VERSION)

-       install -m0644 $(PKG_BUILD_DIR)/kmod/wl$(2).o $(1)/lib/modules/$(LINUX_VERSION)/
+       install -m0644 $(PKG_BUILD_DIR)/kmod/wl$(2).o $(PKG_BUILD_DIR)/kmod/wl$(2).o.patch $(1)/lib/modules/$(LINUX_VERSION)/

 endef
 
 define Package/kmod-brcm-wl/install
 endef
 
 define Package/kmod-brcm-wl/install