make nas depend on nvram

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

diff --git a/package/broadcom-wl/Makefile b/package/broadcom-wl/Makefile
index 5c9d8ce..23ea674 100644 (file)
--- a/package/broadcom-wl/Makefile
+++ b/package/broadcom-wl/Makefile
@@ -1,7 +1,7 @@
 # $Id: Makefile 2480 2005-11-14 02:07:33Z nbd $
 
 include $(TOPDIR)/rules.mk
 # $Id: Makefile 2480 2005-11-14 02:07:33Z nbd $
 
 include $(TOPDIR)/rules.mk

-include $(TOPDIR)/package/kernel.mk
+include $(INCLUDE_DIR)/kernel.mk

 
 PKG_NAME:=broadcom-wl
 PKG_VERSION:=4.80.9.2
 
 PKG_NAME:=broadcom-wl
 PKG_VERSION:=4.80.9.2


@@ -11,18 +11,18 @@ 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_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:=8ff7481425e0b04fc66f2bf950474cbc
+PKG_MD5SUM:=7d9fab2c611369bbe075c3924ea77450

 PKG_CAT:=bzcat
 
 PKG_CAT:=bzcat
 

-include $(TOPDIR)/package/rules.mk
+include $(INCLUDE_DIR)/package.mk

 
 define Package/kmod-brcm-wl
   SECTION:=drivers
   CATEGORY:=Drivers
   DEPENDS:=@LINUX_2_4_BRCM
   DEFAULT:=y
 
 define Package/kmod-brcm-wl
   SECTION:=drivers
   CATEGORY:=Drivers
   DEPENDS:=@LINUX_2_4_BRCM
   DEFAULT:=y

-  MENU:=1
-  TITLE:=Proprietary BCM43xx WiFi driver
+  SUBMENU:=Proprietary BCM43xx WiFi driver
+  TITLE:=Kernel driver (normal version)

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


@@ -30,13 +30,13 @@ endef
 define Package/kmod-brcm-wl-mimo
   $(call Package/kmod-brcm-wl)
   DEFAULT:=m if ALL
 define Package/kmod-brcm-wl-mimo
   $(call Package/kmod-brcm-wl)
   DEFAULT:=m if ALL

-  MENU:=
-  TITLE:=Proprietary BCM43xx WiFi driver (MIMO version)
+  TITLE:=Kernel driver (MIMO version)

   DESCRIPTION:=Proprietary Wireless driver for the Broadcom BCM43xx chipset (MIMO version)
 endef
 
 define Package/wlc
   $(call Package/kmod-brcm-wl-mimo)
   DESCRIPTION:=Proprietary Wireless driver for the Broadcom BCM43xx chipset (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
   DEPENDS:=kmod-brcm-wl
   TITLE:=Setup utility
   DESCRIPTION:=Utility for initializing the Broadcom wl driver


@@ -52,6 +52,7 @@ endef
 
 define Package/nas
   $(call Package/wl)
 
 define Package/nas
   $(call Package/wl)

+  DEPENDS:=nvram

   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


@@ -99,6 +100,7 @@ define Package/kmod-brcm-wl-mimo/install
 endef
 
 define Package/wlc/install
 endef
 
 define Package/wlc/install

+       $(CP) ./files/* $(1)/

        install -d -m0755 $(1)/sbin
        install -m0755 $(PKG_BUILD_DIR)/wlc/wlc $(1)/sbin/
 endef
        install -d -m0755 $(1)/sbin
        install -m0755 $(PKG_BUILD_DIR)/wlc/wlc $(1)/sbin/
 endef


@@ -109,8 +111,12 @@ define Package/wl/install
 endef
 
 define Package/nas/install
 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 -d -m0755 $(1)/usr/sbin
        install -m0755 $(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))
 endef
 
 $(eval $(call BuildPackage,kmod-brcm-wl))