mac80211: fix a WARN_ON in client mode

[openwrt.git] / package / ebtables / Makefile

diff --git a/package/ebtables/Makefile b/package/ebtables/Makefile
index 7914e12..e485f0d 100644 (file)
--- a/package/ebtables/Makefile
+++ b/package/ebtables/Makefile
@@ -1,20 +1,19 @@
 #
 #

-# Copyright (C) 2006-2008 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org

 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #

-# $Id$

 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ebtables
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ebtables

-PKG_VERSION:=2.0.8-2
+PKG_VERSION:=2.0.9-1

 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/ebtables
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/ebtables

-PKG_MD5SUM:=66bcbcb2dcf3b981ad4e86e1720e796e
+PKG_MD5SUM:=0e0c20adf2bba6d91dbd0b74a1a38c33

 
 PKG_BUILD_DIR:=$(BUILD_DIR)/ebtables-v$(PKG_VERSION)
 
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/ebtables-v$(PKG_VERSION)
 


@@ -23,10 +22,16 @@ include $(INCLUDE_DIR)/package.mk
 define Package/ebtables
   SECTION:=net
   CATEGORY:=Network
 define Package/ebtables
   SECTION:=net
   CATEGORY:=Network

+  DEPENDS:=+kmod-ebtables

   TITLE:=Ethernet bridge firewall administration utility
   URL:=http://ebtables.sourceforge.net/
 endef
 
   TITLE:=Ethernet bridge firewall administration utility
   URL:=http://ebtables.sourceforge.net/
 endef
 

+define Package/ebtables-utils
+  $(call Package/ebtables)
+  TITLE:=ebtables save/restore utilities
+endef
+

 define Package/ebtables/description
        The ebtables program is a filtering tool for a bridging firewall. The
        filtering is focussed on the Link Layer Ethernet frame fields. Apart
 define Package/ebtables/description
        The ebtables program is a filtering tool for a bridging firewall. The
        filtering is focussed on the Link Layer Ethernet frame fields. Apart


@@ -34,8 +39,15 @@ define Package/ebtables/description
        addresses and implement a brouter.
 endef
 
        addresses and implement a brouter.
 endef
 

+define Package/ebtables-utils/description
+       $(call Package/ebtables/description)
+endef
+
+MAKE_VARS += EXT_LIBSI="$(LIBGCC_S)"
+

 MAKE_FLAGS += \
 MAKE_FLAGS += \

-       CFLAGS="$(TARGET_CFLAGS)"
+       CFLAGS="$(TARGET_CFLAGS)" \
+       LIBDIR="/usr/lib/ebtables"

 
 define Package/ebtables/install
        $(INSTALL_DIR) $(1)/etc
 
 define Package/ebtables/install
        $(INSTALL_DIR) $(1)/etc


@@ -45,8 +57,13 @@ define Package/ebtables/install
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/extensions/*.so $(1)/usr/lib/ebtables/
        $(INSTALL_DIR) $(1)/usr/sbin
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/ebtables $(1)/usr/sbin/
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/extensions/*.so $(1)/usr/lib/ebtables/
        $(INSTALL_DIR) $(1)/usr/sbin
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/ebtables $(1)/usr/sbin/

+endef
+
+define Package/ebtables-utils/install
+       $(INSTALL_DIR) $(1)/usr/sbin

        $(INSTALL_BIN) $(PKG_BUILD_DIR)/ebtables-save $(1)/usr/sbin/
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/ebtables-restore $(1)/usr/sbin/
 endef
 
 $(eval $(call BuildPackage,ebtables))
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/ebtables-save $(1)/usr/sbin/
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/ebtables-restore $(1)/usr/sbin/
 endef
 
 $(eval $(call BuildPackage,ebtables))

+$(eval $(call BuildPackage,ebtables-utils))