add more debugging output, fix null pointer dereferencing in debugging output, add...

[openwrt.git] / package / arptables / Makefile

diff --git a/package/arptables/Makefile b/package/arptables/Makefile
index d6af30f..baa2dc3 100644 (file)
--- a/package/arptables/Makefile
+++ b/package/arptables/Makefile
@@ -8,7 +8,8 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=arptables
 PKG_VERSION:=0.0.3
 PKG_RELEASE:=1
 PKG_NAME:=arptables
 PKG_VERSION:=0.0.3
 PKG_RELEASE:=1

-PKG_SOURCE_URL:=http://umn.dl.sourceforge.net/sourceforge/ebtables/
+PKG_MD5SUM:=1672244603c8979577aa4738be35a759
+PKG_SOURCE_URL:=@SF/ebtables

 PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-v$(PKG_VERSION)
 PKG_CAT:=zcat
 PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-v$(PKG_VERSION)
 PKG_CAT:=zcat


@@ -16,7 +17,7 @@ PKG_IPK:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
 PKG_IPK_DIR:=$(PKG_BUILD_DIR)/ipkg
 
 $(DL_DIR)/$(PKG_SOURCE):
 PKG_IPK_DIR:=$(PKG_BUILD_DIR)/ipkg
 
 $(DL_DIR)/$(PKG_SOURCE):

-        $(WGET) -P $(DL_DIR) $(PKG_SOURCE_URL)/$(PKG_SOURCE)
+        $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL)

 
 $(PKG_BUILD_DIR)/.unpacked: $(DL_DIR)/$(PKG_SOURCE)
        $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
 
 $(PKG_BUILD_DIR)/.unpacked: $(DL_DIR)/$(PKG_SOURCE)
        $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -


@@ -34,10 +35,14 @@ $(PKG_IPK): $(PKG_BUILD_DIR)/arptables
        mkdir -p $(PACKAGE_DIR)
        $(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR)
 
        mkdir -p $(PACKAGE_DIR)
        $(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR)
 

+$(IPKG_STATE_DIR)/info/arptables.list: $(PKG_IPK)
+       $(IPKG) install $(PKG_IPK)
+

 source: $(DL_DIR)/$(PKG_SOURCE)
 prepare: $(PKG_BUILD_DIR)/.unpacked
 compile: $(PKG_IPK)
 source: $(DL_DIR)/$(PKG_SOURCE)
 prepare: $(PKG_BUILD_DIR)/.unpacked
 compile: $(PKG_IPK)

-install:
-       $(IPKG) install $(PKG_IPK)
+install: $(IPKG_STATE_DIR)/info/arptables.list
+

 clean:
        rm -rf $(PKG_BUILD_DIR)
 clean:
        rm -rf $(PKG_BUILD_DIR)

+       rm -f $(PKG_IPK)