X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/8b0bcee75e4e1300cdcb7dbf0f60989f84e31cd2..92855cd186470c045637045ff88ebbb223f07fb3:/package/broadcom-wl/Makefile

diff --git a/package/broadcom-wl/Makefile b/package/broadcom-wl/Makefile
index e6f322f4c..579033a77 100644
--- a/package/broadcom-wl/Makefile
+++ b/package/broadcom-wl/Makefile
@@ -4,78 +4,104 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: Makefile 2480 2005-11-14 02:07:33Z nbd $
+# $Id$
 
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=broadcom-wl
-PKG_VERSION:=4.80.9.2
+PKG_VERSION:=4.80.53.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_MD5SUM:=7d9fab2c611369bbe075c3924ea77450
-PKG_CAT:=bzcat
+PKG_MD5SUM:=a7d8dde3ce474c361143b83e1d9890b1
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/kmod-brcm-wl
-  SECTION:=drivers
-  CATEGORY:=Drivers
-  DEPENDS:=@LINUX_2_4_BRCM
-  DEFAULT:=y
+define Package/broadcom-wl/Default
+  SECTION:=kernel
+  CATEGORY:=Kernel modules
+  DEPENDS:=@PACKAGE_kmod-brcm-wl||PACKAGE_kmod-brcm-wl-mimo
   SUBMENU:=Proprietary BCM43xx WiFi driver
   SUBMENUDEP:=@LINUX_2_4_BRCM
-  TITLE:=Kernel driver (normal version)
-  DESCRIPTION:=Proprietary Wireless driver for the Broadcom BCM43xx chipset
+endef
+
+define KernelPackage/brcm-wl/Default
+  $(call Package/broadcom-wl/Default)
+  SECTION:=kernel
+  DEPENDS:=@LINUX_2_4_BRCM
+  TITLE:=Kernel driver for BCM43xx chipsets
+  DESCRIPTION:=\
+	This package contains the proprietary wireless driver for the Broadcom \\\
+	BCM43xx chipset
   VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(PKG_RELEASE)
+  FILES:=$(PKG_BUILD_DIR)/kmod/wl$(1).o
+  AUTOLOAD:=$(call AutoLoad,30,wl$(1))
+endef
+
+define KernelPackage/brcm-wl
+  $(call KernelPackage/brcm-wl/Default,)
+  TITLE+= (normal version)
+  DESCRIPTION+= (normal version).
 endef
 
-define Package/kmod-brcm-wl-mimo
-  $(call Package/kmod-brcm-wl)
-  DEFAULT:=m if ALL
-  TITLE:=Kernel driver (MIMO version)
-  DESCRIPTION:=Proprietary Wireless driver for the Broadcom BCM43xx chipset (MIMO version)
+define KernelPackage/brcm-wl-mimo
+  $(call KernelPackage/brcm-wl/Default,_mimo)
+  TITLE+= (MIMO version)
+  DESCRIPTION+= (MIMO version).
 endef
 
 define Package/wlc
-  $(call Package/kmod-brcm-wl-mimo)
-  DEFAULT:=y
-  DEPENDS:=kmod-brcm-wl
-  TITLE:=Setup utility
-  DESCRIPTION:=Utility for initializing the Broadcom wl driver
-  VERSION:=$(WLC_VERSION)-$(PKG_RELEASE)
+  $(call Package/broadcom-wl/Default)
+  TITLE:=wl driver setup utility
+  DESCRIPTION:=\
+	This package contains an utility for initializing the proprietary Broadcom \\\
+	wl driver.
 endef
 
 define Package/wl
-  $(call Package/wlc)
-  TITLE:=Utility for changing the driver's parameters
-  DESCRIPTION:=Utility for changing the Broadcom wl driver's parameters
-  VERSION:=$(PKG_VERSION)-$(PKG_RELEASE)
+  $(call Package/broadcom-wl/Default)
+  TITLE:=Proprietary Broadcom wl driver config utility
+  DESCRIPTION:=\
+	This package contains the proprietary utility (wl) for configuring the \\\
+	proprietary Broadcom wl driver.
 endef
 
 define Package/nas
-  $(call Package/wl)
-  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
+  $(call Package/broadcom-wl/Default)
+  DEPENDS+=+nvram
+  TITLE:=Proprietary Broadcom WPA/WPA2 authenticator
+  DESCRIPTION:=\
+	This package contains the proprietary WPA/WPA2 authenticator (nas) for the \\\
+	proprietary Broadcom wl driver.
 endef
 
-define Build/Prepare
-  $(call Build/Prepare/Default)
-	$(CP) src/* $(PKG_BUILD_DIR)/
+
+define install_template
+	$(INSTALL_DIR) $(1)/lib/modules/$(LINUX_VERSION)
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/kmod/wl$(2).o.patch $(1)/lib/modules/$(LINUX_VERSION)/
+endef
+
+define KernelPackage/brcm-wl/install
+	$(call install_template,$(1),)
 endef
 
-MAKEFLAGS_KMOD = -C "$(LINUX_DIR)" \
+define KernelPackage/brcm-wl_mimo/install
+	$(call install_template,$(1),_mimo)
+endef
+
+MAKEFLAGS_KMOD:= -C "$(LINUX_DIR)" \
 		CROSS_COMPILE="$(TARGET_CROSS)" \
 		ARCH="$(LINUX_KARCH)" \
 		PATH="$(TARGET_PATH)" \
 		SUBDIRS="$(PKG_BUILD_DIR)/kmod"
 
+define Build/Prepare
+	$(call Build/Prepare/Default)
+	$(CP) src/* $(PKG_BUILD_DIR)/
+endef
 
 define Build/Compile
 	# Compile the kernel part
@@ -87,48 +113,32 @@ define Build/Compile
 	# Compile wlc
 	$(MAKE) -C $(PKG_BUILD_DIR)/wlc \
 		$(TARGET_CONFIGURE_OPTS) \
-		CC="$(TARGET_CC)" \
 		CFLAGS="-I$(PKG_BUILD_DIR)/wlc/include $(TARGET_CFLAGS)" \
 		all
 endef
 
-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 -m0644 $(PKG_BUILD_DIR)/kmod/wl$(2).o $(1)/lib/modules/$(LINUX_VERSION)/
-endef
-
-define Package/kmod-brcm-wl/install
-	$(call wl_template,$(1))
-endef
-
-define Package/kmod-brcm-wl-mimo/install
-	$(call wl_template,$(1),_mimo)
-endef
-
 define Package/wlc/install
 	$(CP) ./files/* $(1)/
-	install -d -m0755 $(1)/sbin
-	install -m0755 $(PKG_BUILD_DIR)/wlc/wlc $(1)/sbin/
+	$(INSTALL_DIR) $(1)/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/wlc/wlc $(1)/sbin/
 endef
 
 define Package/wl/install
-	install -d -m0755 $(1)/usr/sbin
-	install -m0755 $(PKG_BUILD_DIR)/wl $(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/wl $(1)/usr/sbin/
 endef
 
 define Package/nas/install
-	install -d -m0755 $(1)/usr/lib
-	install -m0755 $(PKG_BUILD_DIR)/libbcmcrypto.so $(1)/usr/lib/
-	install -d -m0755 $(1)/usr/sbin
-	install -m0755 $(PKG_BUILD_DIR)/nas $(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/libbcmcrypto.so $(1)/usr/lib/
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/nas $(1)/usr/sbin/
 	ln -sf nas $(1)/usr/sbin/nas4not
 	ln -sf nas $(1)/usr/sbin/nas4wds
 endef
 
-$(eval $(call BuildPackage,kmod-brcm-wl))
-$(eval $(call BuildPackage,kmod-brcm-wl-mimo))
+$(eval $(call KernelPackage,brcm-wl))
+$(eval $(call KernelPackage,brcm-wl-mimo))
 $(eval $(call BuildPackage,wlc))
 $(eval $(call BuildPackage,wl))
 $(eval $(call BuildPackage,nas))