[package] fix bluetooth and ide breakage after r18955 (#6422)

[openwrt.git] / package / ebtables / Makefile

diff --git a/package/ebtables/Makefile b/package/ebtables/Makefile
index a928a2d..e485f0d 100644 (file)
--- a/package/ebtables/Makefile
+++ b/package/ebtables/Makefile
@@ -1,32 +1,69 @@
-# $Id$
+#
+# Copyright (C) 2006-2009 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ebtables
-PKG_VERSION:=2.0.6
+PKG_VERSION:=2.0.9-1
 PKG_RELEASE:=1
-PKG_MD5SUM:=c4559af2366c764c6c42a3fdd40d60d3
 
-PKG_SOURCE_URL:=@SF/ebtables
 PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=@SF/ebtables
+PKG_MD5SUM:=0e0c20adf2bba6d91dbd0b74a1a38c33
+
 PKG_BUILD_DIR:=$(BUILD_DIR)/ebtables-v$(PKG_VERSION)
-PKG_CAT:=zcat
 
-include $(TOPDIR)/package/rules.mk
+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
+       from filtering, it also gives the ability to alter the Ethernet MAC
+       addresses and implement a brouter.
+endef
+
+define Package/ebtables-utils/description
+       $(call Package/ebtables/description)
+endef
 
-$(eval $(call PKG_template,EBTABLES,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+MAKE_VARS += EXT_LIBSI="$(LIBGCC_S)"
 
-$(PKG_BUILD_DIR)/.configured:
-       touch $@
+MAKE_FLAGS += \
+       CFLAGS="$(TARGET_CFLAGS)" \
+       LIBDIR="/usr/lib/ebtables"
 
-$(PKG_BUILD_DIR)/.built:
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               CC=$(TARGET_CC) LD=$(TARGET_CROSS)ld \
-               CFLAGS="$(TARGET_CFLAGS) -Wall"
-       touch $@
+define Package/ebtables/install
+       $(INSTALL_DIR) $(1)/etc
+       $(INSTALL_DATA) $(PKG_BUILD_DIR)/ethertypes $(1)/etc/
+       $(INSTALL_DIR) $(1)/usr/lib/ebtables
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib*.so $(1)/usr/lib/
+       $(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
 
-$(IPKG_EBTABLES):
-       mkdir -p $(IDIR_EBTABLES)/usr/sbin
-       cp $(PKG_BUILD_DIR)/ebtables $(IDIR_EBTABLES)/usr/sbin/
-       $(IPKG_BUILD) $(IDIR_EBTABLES) $(PACKAGE_DIR)
+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))