move package description to a separate definition, remove it when DESCRIPTION=TITLE

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

diff --git a/package/broadcom-wl/Makefile b/package/broadcom-wl/Makefile
index 93fc378..1a7da2d 100644 (file)
--- a/package/broadcom-wl/Makefile
+++ b/package/broadcom-wl/Makefile
@@ -4,7 +4,7 @@
 # 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
@@ -17,66 +17,92 @@ WLC_VERSION:=0.1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://downloads.openwrt.org/sources
 PKG_MD5SUM:=a7d8dde3ce474c361143b83e1d9890b1
-PKG_CAT:=bzcat
-
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/broadcom-wl/Default
-  SECTION:=net
-  CATEGORY:=Kernel drivers
+  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
+  SUBMENUDEP:=@TARGET_BRCM_2_4
 endef
 
-define Package/kmod-brcm-wl/Default
+define KernelPackage/brcm-wl/Default
   $(call Package/broadcom-wl/Default)
   SECTION:=kernel
-  DEPENDS:=@LINUX_2_4_BRCM
+  DEPENDS:=@TARGET_BRCM_2_4
   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/Default/description
+ This package contains the proprietary wireless driver for the Broadcom 
+ BCM43xx chipset.
 endef
 
-define Package/kmod-brcm-wl
-  $(call Package/kmod-brcm-wl/Default)
+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)
+define KernelPackage/brcm-wl/description
+$(call KernelPackage/brcm-wl/Default/description)
+endef
+
+define KernelPackage/brcm-wl-mimo
+$(call KernelPackage/brcm-wl/Default,_mimo)
   TITLE+= (MIMO version)
-  DESCRIPTION+= (MIMO version).
+endef
+
+define KernelPackage/brcm-wl-mimo/description
+$(call KernelPackage/brcm-wl/Default/description)
 endef
 
 define Package/wlc
-  $(call Package/broadcom-wl/Default)
+$(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/wlc/description
+ This package contains an utility for initializing the proprietary Broadcom 
+ wl driver.
 endef
 
 define Package/wl
-  $(call Package/broadcom-wl/Default)
+$(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/wl/description
+ This package contains the proprietary utility (wl) for configuring the 
+ proprietary Broadcom wl driver.
 endef
 
 define Package/nas
-  $(call Package/broadcom-wl/Default)
-  DEPENDS+=+nvram
+$(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 Package/nas/description
+ This package contains the proprietary WPA/WPA2 authenticator (nas) for the 
+ proprietary Broadcom wl driver.
+endef
+
+
+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
+
+define KernelPackage/brcm-wl_mimo/install
+       $(call install_template,$(1),_mimo)
 endef
 
 MAKEFLAGS_KMOD:= -C "$(LINUX_DIR)" \
@@ -104,21 +130,6 @@ define Build/Compile
                all
 endef
 
-define wl_template
-       $(INSTALL_DIR) $(1)/etc/modules.d
-       echo "wl$(2)" > $(1)/etc/modules.d/20-wl$(2)
-       $(INSTALL_DIR) $(1)/lib/modules/$(LINUX_VERSION)
-       $(INSTALL_DATA) $(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
-       $(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_DIR) $(1)/sbin
@@ -139,8 +150,8 @@ define Package/nas/install
        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))