remove python prereq check - no longer necessary

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

diff --git a/package/broadcom-wl/Makefile b/package/broadcom-wl/Makefile
index fc3f035..b1a3573 100644 (file)
--- a/package/broadcom-wl/Makefile
+++ b/package/broadcom-wl/Makefile
@@ -10,70 +10,87 @@ 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.53.0

 PKG_RELEASE:=1
 WLC_VERSION:=0.1
 
 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_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://downloads.openwrt.org/sources

-PKG_MD5SUM:=7d9fab2c611369bbe075c3924ea77450
+PKG_MD5SUM:=a7d8dde3ce474c361143b83e1d9890b1

 PKG_CAT:=bzcat
 
 PKG_CAT:=bzcat
 

+PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+

 include $(INCLUDE_DIR)/package.mk
 
 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:=net
+  CATEGORY:=Kernel drivers
+  DEPENDS:=@PACKAGE_kmod-brcm-wl||PACKAGE_kmod-brcm-wl-mimo

   SUBMENU:=Proprietary BCM43xx WiFi driver
   SUBMENU:=Proprietary BCM43xx WiFi driver

-  TITLE:=Kernel driver (normal version)
-  DESCRIPTION:=Proprietary Wireless driver for the Broadcom BCM43xx chipset
+  SUBMENUDEP:=@LINUX_2_4_BRCM
+endef
+
+define Package/kmod-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)
 endef
 
   VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(PKG_RELEASE)
 endef
 

+define Package/kmod-brcm-wl
+  $(call Package/kmod-brcm-wl/Default)
+  TITLE+= (normal version)
+  DESCRIPTION+= (normal version).
+endef
+

 define Package/kmod-brcm-wl-mimo
 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)
+  $(call Package/kmod-brcm-wl/Default)
+  TITLE+= (MIMO version)
+  DESCRIPTION+= (MIMO version).

 endef
 
 define Package/wlc
 endef
 
 define Package/wlc

-  $(call Package/kmod-brcm-wl-mimo)
+  $(call Package/broadcom-wl/Default)
+  TITLE:=wl driver setup utility

   DEFAULT:=y
   DEFAULT:=y

-  DEPENDS:=kmod-brcm-wl
-  TITLE:=Setup utility
-  DESCRIPTION:=Utility for initializing the Broadcom wl driver
-  VERSION:=$(WLC_VERSION)-$(PKG_RELEASE)
+  DESCRIPTION:=\
+       This package contains an utility for initializing the proprietary Broadcom \\\
+       wl driver.

 endef
 
 define Package/wl
 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
 endef
 
 define Package/nas

-  $(call Package/wl)
-  DEPENDS:=nvram
-  TITLE:=Proprietary WPA/WPA2 authenticator
-  DESCRIPTION:=Proprietary WPA/WPA2 authenticator for the Broadcom wl driver
-endef
-
-define Build/Prepare
-  $(call Build/Prepare/Default)
-       $(CP) src/* $(PKG_BUILD_DIR)/
+  $(call Package/broadcom-wl/Default)
+  DEPENDS+=+nvram
+  DEFAULT:=y
+  TITLE:=Proprietary Broadcom WPA/WPA2 authenticator
+  DESCRIPTION:=\
+       This package contains the proprietary WPA/WPA2 authenticator (nas) for the \\\
+       proprietary Broadcom wl driver.

 endef
 
 endef
 

-MAKEFLAGS_KMOD = -C "$(LINUX_DIR)" \
+MAKEFLAGS_KMOD:= -C "$(LINUX_DIR)" \

                CROSS_COMPILE="$(TARGET_CROSS)" \
                ARCH="$(LINUX_KARCH)" \
                PATH="$(TARGET_PATH)" \
                SUBDIRS="$(PKG_BUILD_DIR)/kmod"
 
                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
 
 define Build/Compile
        # Compile the kernel part


@@ -85,7 +102,6 @@ define Build/Compile
        # Compile wlc
        $(MAKE) -C $(PKG_BUILD_DIR)/wlc \
                $(TARGET_CONFIGURE_OPTS) \
        # 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
                CFLAGS="-I$(PKG_BUILD_DIR)/wlc/include $(TARGET_CFLAGS)" \
                all
 endef


@@ -94,7 +110,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