add USE_* variables to the makefiles

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/obsolete-buildroot/make/bridge.mk b/obsolete-buildroot/make/bridge.mk
index 7deb719..ad0bcfb 100644 (file)
--- a/obsolete-buildroot/make/bridge.mk
+++ b/obsolete-buildroot/make/bridge.mk
@@ -3,18 +3,21 @@
 # bridgeutils - User Space Program For Controling Bridging
 #
 #############################################################
 # bridgeutils - User Space Program For Controling Bridging
 #
 #############################################################

-#
-BRIDGE_SOURCE_URL=http://bridge.sourceforge.net/bridge-utils
-BRIDGE_SOURCE=bridge-utils-0.9.6.tar.gz
-BRIDGE_BUILD_DIR=$(BUILD_DIR)/bridge-utils-0.9.6
+
+ifeq ($(strip $(USE_BRIDGE_VERSION)),)
+USE_BRIDGE_VERSION=0.9.7
+endif
+BRIDGE_SOURCE_URL=http://dl.sourceforge.net/sourceforge/bridge/
+BRIDGE_SOURCE=bridge-utils-$(USE_BRIDGE_VERSION).tgz
+BRIDGE_BUILD_DIR=$(BUILD_DIR)/bridge-utils-$(USE_BRIDGE_VERSION)

 BRIDGE_TARGET_BINARY:=usr/sbin/brctl
 
 $(DL_DIR)/$(BRIDGE_SOURCE):
         $(WGET) -P $(DL_DIR) $(BRIDGE_SOURCE_URL)/$(BRIDGE_SOURCE) 
 
 $(BRIDGE_BUILD_DIR)/.unpacked: $(DL_DIR)/$(BRIDGE_SOURCE)
 BRIDGE_TARGET_BINARY:=usr/sbin/brctl
 
 $(DL_DIR)/$(BRIDGE_SOURCE):
         $(WGET) -P $(DL_DIR) $(BRIDGE_SOURCE_URL)/$(BRIDGE_SOURCE) 
 
 $(BRIDGE_BUILD_DIR)/.unpacked: $(DL_DIR)/$(BRIDGE_SOURCE)

-       zcat $(DL_DIR)/$(BRIDGE_SOURCE) | tar -C $(BUILD_DIR) -xvf -
-       mv -f $(BUILD_DIR)/bridge-utils $(BRIDGE_BUILD_DIR)
+       # ack! it's a .tgz which is really a bzip 
+       bzcat $(DL_DIR)/$(BRIDGE_SOURCE) | tar -C $(BUILD_DIR) -xvf -

        patch -p1 -d $(BRIDGE_BUILD_DIR) < $(SOURCE_DIR)/bridge.patch 
        touch $(BRIDGE_BUILD_DIR)/.unpacked
 
        patch -p1 -d $(BRIDGE_BUILD_DIR) < $(SOURCE_DIR)/bridge.patch 
        touch $(BRIDGE_BUILD_DIR)/.unpacked
 

diff --git a/obsolete-buildroot/make/netfilter.mk b/obsolete-buildroot/make/netfilter.mk
index 114a319..435b546 100644 (file)
--- a/obsolete-buildroot/make/netfilter.mk
+++ b/obsolete-buildroot/make/netfilter.mk
@@ -4,10 +4,12 @@
 #
 #############################################################
 
 #
 #############################################################
 

-NETFILTER_SNAPSHOT:=20040508
-NETFILTER_SOURCE:=patch-o-matic-$(NETFILTER_SNAPSHOT).tar.bz2
-NETFILTER_SITE:=ftp://ftp.netfilter.org/pub/patch-o-matic/snapshot/
-NETFILTER_DIR:=$(BUILD_DIR)/patch-o-matic-$(NETFILTER_SNAPSHOT)
+ifeq ($(strip $(USE_NETFILTER_SNAPSHOT)),)
+USE_NETFILTER_SNAPSHOT=20040508
+endif
+NETFILTER_SOURCE:=patch-o-matic-$(USE_NETFILTER_SNAPSHOT).tar.bz2
+NETFILTER_DIR:=$(BUILD_DIR)/patch-o-matic-$(USE_NETFILTER_SNAPSHOT)
+NETFILTER_SITE:=ftp://ftp.netfilter.org/pub/patch-o-matic/snapshot

 NETFILTER_CAT:=bzcat
 
 # ipv6_mld breaks net/ipv6/mcast.c
 NETFILTER_CAT:=bzcat
 
 # ipv6_mld breaks net/ipv6/mcast.c


@@ -27,7 +29,7 @@ NETFILTER_PATCHES:= \
 LINUX_DIR:=$(BUILD_DIR)/WRT54GS/release/src/linux/linux
 
 $(DL_DIR)/$(NETFILTER_SOURCE):
 LINUX_DIR:=$(BUILD_DIR)/WRT54GS/release/src/linux/linux
 
 $(DL_DIR)/$(NETFILTER_SOURCE):

-        $(WGET) -P $(DL_DIR) $(NETFILTER_SITE)/$(NETFILTER_SOURCE)
+        echo $(WGET) -P $(DL_DIR) $(NETFILTER_SITE)/$(NETFILTER_SOURCE)

 
 netfilter-source: $(DL_DIR)/$(NETFILTER_SOURCE)
 
 
 netfilter-source: $(DL_DIR)/$(NETFILTER_SOURCE)