X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/3c26d69f218187dfce2976dd30fcf56792d72ba1..a4bdef9ca9051d829ee12f9f8ae36016f0c2136e:/package/ebtables/Makefile?ds=inline

diff --git a/package/ebtables/Makefile b/package/ebtables/Makefile
index 7914e128e..73a165636 100644
--- a/package/ebtables/Makefile
+++ b/package/ebtables/Makefile
@@ -4,13 +4,12 @@
 # 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
 PKG_VERSION:=2.0.8-2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/ebtables
@@ -23,10 +22,16 @@ include $(INCLUDE_DIR)/package.mk
 define Package/ebtables
   SECTION:=net
   CATEGORY:=Network
+  DEPENDS:=+kmod-ebtables
   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
@@ -34,8 +39,15 @@ define Package/ebtables/description
 	addresses and implement a brouter.
 endef
 
+define Package/ebtables-utils/description
+	$(call Package/ebtables/description)
+endef
+
+MAKE_VARS += EXT_LIBSI="$(LIBGCC_S)"
+
 MAKE_FLAGS += \
-	CFLAGS="$(TARGET_CFLAGS)"
+	CFLAGS="$(TARGET_CFLAGS)" \
+	LIBDIR="/usr/lib/ebtables"
 
 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/
+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))
+$(eval $(call BuildPackage,ebtables-utils))