summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-05-12 19:50:04 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-05-12 19:50:04 +0000
commit82bc21f5e0a87756c805b6c261ab05d6fc79892c (patch)
tree486f8de2dcf863bd74a2f54dc310d24357d6608d
parentbe69de3e1854306ac54c644246186f02a6d99d3c (diff)
update ebtables to new packaging style
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@853 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/ebtables/Makefile34
-rw-r--r--package/ebtables/ipkg/ebtables.control (renamed from package/ebtables/ebtables.control)0
2 files changed, 8 insertions, 26 deletions
diff --git a/package/ebtables/Makefile b/package/ebtables/Makefile
index 809caf3c0..44a175e66 100644
--- 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/ipkg/ebtables.control
index 2e33aa906..2e33aa906 100644
--- a/package/ebtables/ebtables.control
+++ b/package/ebtables/ipkg/ebtables.control