[package] broadcom-wl: align RADIUS options with r26482, patch by Etienne Champetier...

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

diff --git a/package/broadcom-wl/Makefile b/package/broadcom-wl/Makefile
index 2d4aacf..0439f1f 100644 (file)
--- a/package/broadcom-wl/Makefile
+++ b/package/broadcom-wl/Makefile
@@ -1,5 +1,5 @@
 #
 #

-# Copyright (C) 2006-2010 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org

 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.


@@ -9,12 +9,15 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=broadcom-wl
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=broadcom-wl

-PKG_VERSION:=5.10.56.27.0
-PKG_RELEASE:=1
+PKG_VERSION:=5.10.56.27.3
+PKG_RELEASE:=3

 
 

-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(ARCH).tar.bz2

 PKG_SOURCE_URL:=http://downloads.openwrt.org/sources
 PKG_SOURCE_URL:=http://downloads.openwrt.org/sources

-PKG_MD5SUM:=dfaee8bdafaa4bb5ccbcdfe541c29e7d
+
+PKG_MD5SUM.mipsel:=3363e3a6b3d9d73c49dea870c7834eac
+PKG_MD5SUM.mips:=f8de63debc75333d6b4e28193eb051ff
+PKG_MD5SUM:=$(PKG_MD5SUM.$(ARCH))

 
 include $(INCLUDE_DIR)/package.mk
 
 
 include $(INCLUDE_DIR)/package.mk
 


@@ -23,16 +26,16 @@ define Package/broadcom-wl/Default
   CATEGORY:=Kernel modules
   DEPENDS:=@PACKAGE_kmod-brcm-wl||PACKAGE_kmod-brcm-wl-mini
   SUBMENU:=Proprietary BCM43xx WiFi driver
   CATEGORY:=Kernel modules
   DEPENDS:=@PACKAGE_kmod-brcm-wl||PACKAGE_kmod-brcm-wl-mini
   SUBMENU:=Proprietary BCM43xx WiFi driver

-  SUBMENUDEP:=@TARGET_brcm47xx
+  SUBMENUDEP:=@TARGET_brcm47xx||TARGET_brcm63xx

 endef
 
 define KernelPackage/brcm-wl/Default
   $(call Package/broadcom-wl/Default)
   SECTION:=kernel
 endef
 
 define KernelPackage/brcm-wl/Default
   $(call Package/broadcom-wl/Default)
   SECTION:=kernel

-  DEPENDS:=@TARGET_brcm47xx +wireless-tools
+  DEPENDS:=@TARGET_brcm47xx||TARGET_brcm63xx +wireless-tools

   TITLE:=Kernel driver for BCM43xx chipsets
   TITLE:=Kernel driver for BCM43xx chipsets

-  FILES:=$(PKG_BUILD_DIR)/driver$(1)/wl.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,30,wl)
+  FILES:=$(PKG_BUILD_DIR)/driver$(1)/wl.ko $(PKG_BUILD_DIR)/glue/wl_glue.ko
+  AUTOLOAD:=$(call AutoLoad,30,wl_glue wl)

 endef
 
 define KernelPackage/brcm-wl/Default/description
 endef
 
 define KernelPackage/brcm-wl/Default/description


@@ -97,6 +100,7 @@ MAKE_KMOD := $(MAKE) -C "$(LINUX_DIR)" \
 define Build/Prepare
        $(call Build/Prepare/Default)
        $(CP) $(PKG_BUILD_DIR)/driver $(PKG_BUILD_DIR)/driver-mini
 define Build/Prepare
        $(call Build/Prepare/Default)
        $(CP) $(PKG_BUILD_DIR)/driver $(PKG_BUILD_DIR)/driver-mini

+       $(CP) ./src/glue $(PKG_BUILD_DIR)/glue

 endef
 
 define Build/Compile
 endef
 
 define Build/Compile


@@ -112,6 +116,11 @@ define Build/Compile
                BUILD_TYPE="wl_apsta_mini" \
                modules
 
                BUILD_TYPE="wl_apsta_mini" \
                modules
 

+       # Compile glue driver
+       $(MAKE_KMOD) -C "$(LINUX_DIR)" \
+               SUBDIRS="$(PKG_BUILD_DIR)/glue" \
+               modules                                        
+

        # Compile libshared
        $(MAKE) -C $(PKG_BUILD_DIR)/shared \
                $(TARGET_CONFIGURE_OPTS) \
        # Compile libshared
        $(MAKE) -C $(PKG_BUILD_DIR)/shared \
                $(TARGET_CONFIGURE_OPTS) \


@@ -126,7 +135,9 @@ define Build/Compile
                $(PKG_BUILD_DIR)/nas_exe.o \
                $(PKG_BUILD_DIR)/shared/libshared.a
 
                $(PKG_BUILD_DIR)/nas_exe.o \
                $(PKG_BUILD_DIR)/shared/libshared.a
 

-       $(TARGET_CC) -o $(PKG_BUILD_DIR)/wl $(PKG_BUILD_DIR)/wl_exe.o
+       $(TARGET_CC) -o $(PKG_BUILD_DIR)/wl \
+               $(PKG_BUILD_DIR)/wl_exe.o \
+               $(PKG_BUILD_DIR)/shared/libshared.a

 endef
 
 define Build/InstallDev
 endef
 
 define Build/InstallDev


@@ -140,6 +151,11 @@ define Package/wlc/install
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/wlc $(1)/sbin/
 endef
 
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/wlc $(1)/sbin/
 endef
 

+define Package/wlc/postinst
+#!/bin/sh
+[ -n "$${IPKG_INSTROOT}" ] || /etc/init.d/wlunbind enable || true
+endef
+

 define Package/wl/install
        $(INSTALL_DIR) $(1)/usr/sbin
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/wl $(1)/usr/sbin/
 define Package/wl/install
        $(INSTALL_DIR) $(1)/usr/sbin
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/wl $(1)/usr/sbin/