Convert to new template

SVN-Revision: 3745

diff --git a/openwrt/package/ebtables/Config.in b/openwrt/package/ebtables/Config.in
deleted file mode 100644 (file)
index e8fb884..0000000
--- a/openwrt/package/ebtables/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-config BR2_PACKAGE_EBTABLES
-       prompt "ebtables.......................... Ethernet bridge firewall administration utility"
-       tristate
-       default m if CONFIG_DEVEL
-       help
-         Ethernet Bridge Firewalling (ebtables)
-         
-         http://ebtables.sourceforge.net/
-

diff --git a/openwrt/package/ebtables/Makefile b/openwrt/package/ebtables/Makefile
index 9abd93a93a27191764ba69269eafb63148fd104d..04adbf6e82555c0aee7cd5d162a159fbdd7c7790 100644 (file)
--- a/openwrt/package/ebtables/Makefile
+++ b/openwrt/package/ebtables/Makefile
@@ -5,28 +5,29 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=ebtables
 PKG_VERSION:=2.0.6
 PKG_RELEASE:=1
-PKG_MD5SUM:=c4559af2366c764c6c42a3fdd40d60d3
 
-PKG_SOURCE_URL:=@SF/ebtables
-PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz
 PKG_BUILD_DIR:=$(BUILD_DIR)/ebtables-v$(PKG_VERSION)
+PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=@SF/ebtables
+PKG_MD5SUM:=c4559af2366c764c6c42a3fdd40d60d3
 PKG_CAT:=zcat
 
 include $(TOPDIR)/package/rules.mk
 
-$(eval $(call PKG_template,EBTABLES,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-
-$(PKG_BUILD_DIR)/.configured:
-       touch $@
-
-$(PKG_BUILD_DIR)/.built:
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               CC=$(TARGET_CC) LD=$(TARGET_CROSS)ld \
-               CFLAGS="$(TARGET_CFLAGS) -Wall"
-       touch $@
-
-$(IPKG_EBTABLES):
-       mkdir -p $(IDIR_EBTABLES)/usr/sbin
-       $(CP) $(PKG_BUILD_DIR)/ebtables $(IDIR_EBTABLES)/usr/sbin/
+define Package/ebtables
+SECTION:=base
+CATEGORY:=Network
+DEFAULT:=y
+TITLE:=Ethernet bridge firewall administration utility
+DESCRIPTION:=Ethernet Bridge Firewalling (ebtables)
+URL:=http://ebtables.sourceforge.net/
+endef
+
+define Package/ebtables/install
+       install -d -m0755 $(IDIR_DNSMASQ)/usr/sbin
+       install -m0755 $(PKG_BUILD_DIR)/ebtables $(IDIR_EBTABLES)/usr/sbin/ebtables
+       $(RSTRIP) $(IDIR_EBTABLES)
        $(IPKG_BUILD) $(IDIR_EBTABLES) $(PACKAGE_DIR)
+ended
 
+$(eval $(call BuildPackage,ebtables))

diff --git a/openwrt/package/ebtables/ipkg/ebtables.control b/openwrt/package/ebtables/ipkg/ebtables.control
deleted file mode 100644 (file)
index 5dc6a14..0000000
--- a/openwrt/package/ebtables/ipkg/ebtables.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: ebtables
-Priority: optional
-Section: net
-Description: Ethernet bridge firewalling software
-Depends: kmod-ebtables