update ebtables to new packaging style

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@853 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/ebtables/Makefile b/package/ebtables/Makefile
index 809caf3..44a175e 100644 (file)
--- a/package/ebtables/Makefile
+++ b/package/ebtables/Makefile
@@ -11,37 +11,19 @@ PKG_SOURCE_URL:=@SF/ebtables
 PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz
 PKG_BUILD_DIR:=$(BUILD_DIR)/ebtables-v$(PKG_VERSION)
 PKG_CAT:=zcat
-PKG_IPK:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
-PKG_IPK_DIR:=$(PKG_BUILD_DIR)/ipkg
 
-$(DL_DIR)/$(PKG_SOURCE):
-        $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL)
+include $(TOPDIR)/package/rules.mk
 
-$(PKG_BUILD_DIR)/.unpacked: $(DL_DIR)/$(PKG_SOURCE)
-       $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-       $(PATCH) $(PKG_BUILD_DIR) ./patches
-       touch $(PKG_BUILD_DIR)/.unpacked
+$(eval $(call PKG_template,EBTABLES,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
-$(PKG_BUILD_DIR)/ebtables: $(PKG_BUILD_DIR)/.unpacked
+$(PKG_BUILD_DIR)/.built:
        $(MAKE) -C $(PKG_BUILD_DIR) \
                CC=$(TARGET_CC) LD=$(TARGET_CROSS)ld \
                CFLAGS="$(TARGET_CFLAGS) -Wall"
+       touch $@
 
-$(PKG_IPK): $(PKG_BUILD_DIR)/ebtables
-       $(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_IPK_DIR) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
-       mkdir -p $(PKG_IPK_DIR)/usr/sbin
-       cp $(PKG_BUILD_DIR)/ebtables $(PKG_IPK_DIR)/usr/sbin/
-       mkdir -p $(PACKAGE_DIR)
-       $(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR)
+$(IPKG_EBTABLES):
+       mkdir -p $(IDIR_EBTABLES)/usr/sbin
+       cp $(PKG_BUILD_DIR)/ebtables $(IDIR_EBTABLES)/usr/sbin/
+       $(IPKG_BUILD) $(IDIR_EBTABLES) $(PACKAGE_DIR)
 
-$(IPKG_STATE_DIR)/info/ebtables.list: $(PKG_IPK)
-       $(IPKG) install $(PKG_IPK)
-
-source: $(DL_DIR)/$(PKG_SOURCE)
-prepare: $(PKG_BUILD_DIR)/.unpacked
-compile: $(PKG_IPK)
-install: $(IPKG_STATE_DIR)/info/ebtables.list
-
-clean:
-       rm -rf $(PKG_BUILD_DIR)
-       rm -f $(PKG_IPK)

diff --git a/package/ebtables/ebtables.control b/package/ebtables/ebtables.control
deleted file mode 100644 (file)
index 2e33aa9..0000000
--- a/package/ebtables/ebtables.control
+++ /dev/null
@@ -1,7 +0,0 @@
-Package: ebtables
-Priority: optional
-Section: net
-Maintainer: Felix Fietkau <nbd@vd-s.ath.cx>
-Source: buildroot internal
-Description: Ethernet bridge firewalling software
-Depends: kmod-ebtables

diff --git a/package/ebtables/ipkg/ebtables.control b/package/ebtables/ipkg/ebtables.control
new file mode 100644 (file)
index 0000000..2e33aa9
--- /dev/null
+++ b/package/ebtables/ipkg/ebtables.control
@@ -0,0 +1,7 @@
+Package: ebtables
+Priority: optional
+Section: net
+Maintainer: Felix Fietkau <nbd@vd-s.ath.cx>
+Source: buildroot internal
+Description: Ethernet bridge firewalling software
+Depends: kmod-ebtables