fix ppp reconnect (add persist option)

[openwrt.git] / openwrt / package / bridge / Makefile

diff --git a/openwrt/package/bridge/Makefile b/openwrt/package/bridge/Makefile
index 5340a9b..c8a860e 100644 (file)
--- a/openwrt/package/bridge/Makefile
+++ b/openwrt/package/bridge/Makefile
@@ -1,14 +1,13 @@
-#############################################################
-#
-# ebtables
-#
-#############################################################
+# $Id$
+

 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bridge
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bridge

-PKG_VERSION:=1.0.4
+PKG_VERSION:=1.0.6

 PKG_RELEASE:=1
 PKG_RELEASE:=1

-PKG_SOURCE_URL:=http://umn.dl.sourceforge.net/sourceforge/bridge
+PKG_MD5SUM:=9b7dc52656f5cbec846a7ba3299f73bd
+
+PKG_SOURCE_URL:=@SF/bridge

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


@@ -16,7 +15,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) -


@@ -60,10 +59,14 @@ $(PKG_IPK): $(PKG_BUILD_DIR)/brctl/brctl
        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/bridge.list: $(PKG_IPK)
+       $(IPKG) install $(PKG_IPK)
+

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

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

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

+       rm -f $(PKG_IPK)