From b6cf3714d5b1bf9fd701637ecb20c152b709a81e Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Thu, 12 May 2005 19:50:04 +0000
Subject: [PATCH] update ebtables to new packaging style

SVN-Revision: 853
---
 openwrt/package/ebtables/Makefile             | 34 +++++--------------
 .../ebtables/{ => ipkg}/ebtables.control      |  0
 2 files changed, 8 insertions(+), 26 deletions(-)
 rename openwrt/package/ebtables/{ => ipkg}/ebtables.control (100%)

diff --git a/openwrt/package/ebtables/Makefile b/openwrt/package/ebtables/Makefile
index 809caf3c0e..44a175e66a 100644
--- a/openwrt/package/ebtables/Makefile
+++ b/openwrt/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/openwrt/package/ebtables/ebtables.control b/openwrt/package/ebtables/ipkg/ebtables.control
similarity index 100%
rename from openwrt/package/ebtables/ebtables.control
rename to openwrt/package/ebtables/ipkg/ebtables.control
-- 
2.30.2