unlock linux partition in mount_root

[openwrt.git] / obsolete-buildroot / make / bridge.mk

diff --git a/obsolete-buildroot/make/bridge.mk b/obsolete-buildroot/make/bridge.mk
index 7deb719..8e5f699 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).tar.gz
+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)

+       # ack! it's a .tgz which is really a bzip 

        zcat $(DL_DIR)/$(BRIDGE_SOURCE) | tar -C $(BUILD_DIR) -xvf -
        zcat $(DL_DIR)/$(BRIDGE_SOURCE) | tar -C $(BUILD_DIR) -xvf -

-       mv -f $(BUILD_DIR)/bridge-utils $(BRIDGE_BUILD_DIR)

        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
 


@@ -37,7 +40,7 @@ $(BRIDGE_BUILD_DIR)/.configured: $(BRIDGE_BUILD_DIR)/.unpacked
                --mandir=/usr/man \
                --infodir=/usr/info \
                $(DISABLE_NLS) \
                --mandir=/usr/man \
                --infodir=/usr/info \
                $(DISABLE_NLS) \

-               --with-linux=$(LINUX_DIR) \
+               --with-linux-headers=$(LINUX_DIR) \

        );
        touch  $(BRIDGE_BUILD_DIR)/.configured
 
        );
        touch  $(BRIDGE_BUILD_DIR)/.configured