fix hostapd race condition which breaks wpa with madwifi

[openwrt.git] / package / switch / Makefile

diff --git a/package/switch/Makefile b/package/switch/Makefile
index a0644ab..43a4ee2 100644 (file)
--- a/package/switch/Makefile
+++ b/package/switch/Makefile
@@ -4,7 +4,7 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id:$
+# $Id$
 
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
@@ -12,18 +12,21 @@ include $(INCLUDE_DIR)/kernel.mk
 PKG_NAME:=kmod-switch
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)
-
 include $(INCLUDE_DIR)/package.mk
 
-define Package/kmod-switch
-  SECTION:=kernel
-  CATEGORY:=Kernel drivers
-  DEPENDS:=@LINUX_2_6_BRCM||LINUX_2_4_BRCM
+define KernelPackage/switch
+  SUBMENU:=Other modules
+  DEPENDS:=@TARGET_brcm_2_4||TARGET_brcm47xx
   TITLE:=Switch drivers
-  DESCRIPTION:=\
-       This package contains switch drivers for ADM6996L and BCM53XX RoboSwitch.
-  VERSION:=$(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE)
+  FILES:= \
+       $(PKG_BUILD_DIR)/switch-core.$(LINUX_KMOD_SUFFIX) \
+       $(PKG_BUILD_DIR)/switch-adm.$(LINUX_KMOD_SUFFIX) \
+       $(PKG_BUILD_DIR)/switch-robo.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,20,switch-core switch-robo switch-adm)
+endef
+
+define KernelPackage/switch/description
+ This package contains switch drivers for ADM6996L and BCM53XX RoboSwitch.
 endef
 
 define Build/Prepare
@@ -31,23 +34,36 @@ define Build/Prepare
        $(CP) ./src/* $(PKG_BUILD_DIR)/
 endef
 
+ifeq ($(BOARD),brcm-2.4)
+  BUILDFLAGS := -DBROADCOM -DBCMDRIVER -I$(LINUX_DIR)/arch/mips/bcm947xx/include
+else
+  ifeq ($(BOARD),brcm47xx)
+    BUILDFLAGS := -DBROADCOM
+  endif
+endif
+
+
 define Build/Compile
        $(MAKE) -C "$(LINUX_DIR)" \
                CROSS_COMPILE="$(TARGET_CROSS)" \
                ARCH="$(LINUX_KARCH)" \
                SUBDIRS="$(PKG_BUILD_DIR)" \
-               EXTRA_CFLAGS="-DBCMGPIO2" \
+               EXTRA_CFLAGS="$(BUILDFLAGS)" \
                modules
 endef
-       
-define Package/kmod-switch/install
-       $(INSTALL_DIR) $(1)/lib/modules/$(LINUX_VERSION)
-       $(CP) $(PKG_BUILD_DIR)/*.$(LINUX_KMOD_SUFFIX) \
-               $(1)/lib/modules/$(LINUX_VERSION)
+
+define Build/InstallDev
+       mkdir -p $(1)/usr/include
+       $(CP) ./src/switch-core.h $(1)/usr/include/
+endef
+
+define Build/UninstallDev
+       rm -f $(1)/usr/include/switch-core.h
+endef
+
+define KernelPackage/switch/install
        $(INSTALL_DIR) $(1)/lib/network/
        $(INSTALL_BIN) ./files/switch.sh $(1)/lib/network/
-       $(INSTALL_DIR) $(1)/etc/modules.d/
-       printf 'switch-core\nswitch-robo\nswitch-adm\n' > $(1)/etc/modules.d/20-switch
 endef
 
-$(eval $(call BuildPackage,kmod-switch))
+$(eval $(call KernelPackage,switch))