X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/cfa0411c2c6840f87aff35627dea05adbbe762e9..10544fc5942c488f759ae0756ef80b5909711000:/openwrt/package/ebtables/Makefile

diff --git a/openwrt/package/ebtables/Makefile b/openwrt/package/ebtables/Makefile
index 6df16dd77..dae932ea8 100644
--- a/openwrt/package/ebtables/Makefile
+++ b/openwrt/package/ebtables/Makefile
@@ -1,48 +1,41 @@
-#############################################################
-#
-# ebtables
-#
-#############################################################
+# $Id$
+
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ebtables
-PKG_VERSION:=2.0.6
+PKG_VERSION:=2.0.8-rc2
 PKG_RELEASE:=1
-PKG_MD5SUM:=c4559af2366c764c6c42a3fdd40d60d3
+PKG_MD5SUM:=f07111fcc1966be669278433c35dcc28
+
 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)
+PKG_BUILD_DIR:=$(BUILD_DIR)/ebtables-v$(PKG_VERSION)
+
+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) -
-	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)/.configured:
+	touch $@
+
+$(PKG_BUILD_DIR)/.built:
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		CC=$(TARGET_CC) LD=$(TARGET_CROSS)ld \
 		CFLAGS="$(TARGET_CFLAGS) -Wall"
-
-$(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_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)
+	touch $@
+
+$(IPKG_EBTABLES):
+	install -d -m0755 $(IDIR_EBTABLES)/etc
+	install -m0644 $(PKG_BUILD_DIR)/ethertypes $(IDIR_EBTABLES)/etc/
+	install -d -m0755 $(IDIR_EBTABLES)/usr/lib
+	install -m0755 $(PKG_BUILD_DIR)/lib*.so $(IDIR_EBTABLES)/usr/lib/
+	install -d -m0755 $(IDIR_EBTABLES)/usr/lib/ebtables
+	install -m0755 $(PKG_BUILD_DIR)/extensions/*.so $(IDIR_EBTABLES)/usr/lib/ebtables/
+	install -d -m0755 $(IDIR_EBTABLES)/usr/sbin
+	install -m0755 $(PKG_BUILD_DIR)/ebtables $(IDIR_EBTABLES)/usr/sbin/
+	install -m0755 $(PKG_BUILD_DIR)/ebtables-save $(IDIR_EBTABLES)/usr/sbin/
+	install -m0755 $(PKG_BUILD_DIR)/ebtables-restore $(IDIR_EBTABLES)/usr/sbin/
+	$(RSTRIP) $(IDIR_EBTABLES)
+	$(IPKG_BUILD) $(IDIR_EBTABLES) $(PACKAGE_DIR)