[uClibc-cvs] svn commit: trunk/buildroot/package/bridge

[andersen at uclibc.org]

Author: andersen
Date: 2005-06-09 06:23:36 -0600 (Thu, 09 Jun 2005)
New Revision: 10493

Log:
http://bugs.uclibc.org/view.php?id=286
Can't build "bridge" package in buildroot (patch enclosed)


Modified:
   trunk/buildroot/package/bridge/Config.in
   trunk/buildroot/package/bridge/bridge.mk


Changeset:
Modified: trunk/buildroot/package/bridge/Config.in
===================================================================
--- trunk/buildroot/package/bridge/Config.in	2005-06-09 12:15:00 UTC (rev 10492)
+++ trunk/buildroot/package/bridge/Config.in	2005-06-09 12:23:36 UTC (rev 10493)
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_BRIDGE
 	bool "bridge"
 	default n
-	depends BR2_PACKAGE_LINUX
 	help
 	  Manage ethernet bridging; a way to connect networks together to
 	  form a larger network.

Modified: trunk/buildroot/package/bridge/bridge.mk
===================================================================
--- trunk/buildroot/package/bridge/bridge.mk	2005-06-09 12:15:00 UTC (rev 10492)
+++ trunk/buildroot/package/bridge/bridge.mk	2005-06-09 12:23:36 UTC (rev 10493)
@@ -1,12 +1,13 @@
 #############################################################
 #
-# bridgeutils - User Space Program For Controling Bridging
+# bridgeutils - User Space Program For Controlling Bridging
 #
 #############################################################
 #
+BRIDGE_VERSION=1.0.6
 BRIDGE_SOURCE_URL=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/bridge/
-BRIDGE_SOURCE=bridge-utils-1.0.4.tar.gz
-BRIDGE_BUILD_DIR=$(BUILD_DIR)/bridge-utils-1.0.4
+BRIDGE_SOURCE=bridge-utils-$(BRIDGE_VERSION).tar.gz
+BRIDGE_BUILD_DIR=$(BUILD_DIR)/bridge-utils-$(BRIDGE_VERSION)
 BRIDGE_TARGET_BINARY:=usr/sbin/brctl
 
 $(DL_DIR)/$(BRIDGE_SOURCE):
@@ -36,7 +37,7 @@
 		--mandir=/usr/man \
 		--infodir=/usr/info \
 		$(DISABLE_NLS) \
-		--with-linux-headers=$(LINUX_DIR) \
+		--with-linux-headers=$(LINUX_HEADERS_DIR) \
 	);
 	touch  $(BRIDGE_BUILD_DIR)/.configured
 
@@ -49,7 +50,7 @@
 	#cp -af $(BRIDGE_BUILD_DIR)/brctl/brctld $(TARGET_DIR)/usr/sbin/
 	#$(STRIP) $(TARGET_DIR)/usr/sbin/brctld
 
-bridge: linux $(TARGET_DIR)/$(BRIDGE_TARGET_BINARY)
+bridge: $(TARGET_DIR)/$(BRIDGE_TARGET_BINARY)
 
 bridge-source: $(DL_DIR)/$(BRIDGE_SOURCE)