From: John Voltz Date: Thu, 6 Mar 2008 17:55:51 +0000 (-0000) Subject: renamed bridge to bridge-utils X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=842a07b727f37cb1998bb59e9812447df453b43e;p=buildroot.git renamed bridge to bridge-utils --- diff --git a/package/bridge-utils/Config.in b/package/bridge-utils/Config.in new file mode 100644 index 0000000000..3386587829 --- /dev/null +++ b/package/bridge-utils/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_BRIDGE + bool "bridge-utils" + default n + help + Manage ethernet bridging; a way to connect networks together to + form a larger network. + + http://bridge.sourceforge.net/ diff --git a/package/bridge-utils/bridge.mk b/package/bridge-utils/bridge.mk new file mode 100644 index 0000000000..2c8d8403fb --- /dev/null +++ b/package/bridge-utils/bridge.mk @@ -0,0 +1,71 @@ +############################################################# +# +# 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-$(BRIDGE_VERSION).tar.gz +BRIDGE_BUILD_DIR=$(BUILD_DIR)/bridge-utils-$(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) + $(ZCAT) $(DL_DIR)/$(BRIDGE_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - + patch -p1 -d $(BRIDGE_BUILD_DIR) < package/bridge/bridge.patch + touch $(BRIDGE_BUILD_DIR)/.unpacked + +$(BRIDGE_BUILD_DIR)/.configured: $(BRIDGE_BUILD_DIR)/.unpacked + (cd $(BRIDGE_BUILD_DIR); rm -rf config.cache; \ + $(TARGET_CONFIGURE_OPTS) \ + $(TARGET_CONFIGURE_ARGS) \ + ./configure \ + --target=$(GNU_TARGET_NAME) \ + --host=$(GNU_TARGET_NAME) \ + --build=$(GNU_HOST_NAME) \ + --prefix=/usr \ + --exec-prefix=/usr \ + --bindir=/usr/bin \ + --sbindir=/usr/sbin \ + --libdir=/lib \ + --libexecdir=/usr/lib \ + --sysconfdir=/etc \ + --datadir=/usr/share \ + --localstatedir=/var \ + --mandir=/usr/man \ + --infodir=/usr/info \ + $(DISABLE_NLS) \ + --with-linux-headers=$(LINUX_HEADERS_DIR) \ + ) + touch $(BRIDGE_BUILD_DIR)/.configured + +$(BRIDGE_BUILD_DIR)/brctl/brctl: $(BRIDGE_BUILD_DIR)/.configured + $(MAKE) -C $(BRIDGE_BUILD_DIR) + +$(TARGET_DIR)/$(BRIDGE_TARGET_BINARY): $(BRIDGE_BUILD_DIR)/brctl/brctl + cp -af $(BRIDGE_BUILD_DIR)/brctl/brctl $(TARGET_DIR)/$(BRIDGE_TARGET_BINARY) + $(STRIPCMD) $(TARGET_DIR)/$(BRIDGE_TARGET_BINARY) + #cp -af $(BRIDGE_BUILD_DIR)/brctl/brctld $(TARGET_DIR)/usr/sbin/ + #$(STRIPCMD) $(TARGET_DIR)/usr/sbin/brctld + +bridge: $(TARGET_DIR)/$(BRIDGE_TARGET_BINARY) + +bridge-source: $(DL_DIR)/$(BRIDGE_SOURCE) + +bridge-clean: + #$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(BRIDGE_BUILD_DIR) uninstall + -$(MAKE) -C $(BRIDGE_BUILD_DIR) clean + +bridge-dirclean: + rm -rf $(BRIDGE_BUILD_DIR) +############################################################# +# +# Toplevel Makefile options +# +############################################################# +ifeq ($(strip $(BR2_PACKAGE_BRIDGE)),y) +TARGETS+=bridge-utils +endif diff --git a/package/bridge-utils/bridge.patch b/package/bridge-utils/bridge.patch new file mode 100644 index 0000000000..f44737750b --- /dev/null +++ b/package/bridge-utils/bridge.patch @@ -0,0 +1,11 @@ +--- bridge-utils-0.9.6/libbridge/Makefile.in.dist 2004-03-01 20:55:52.000000000 -0600 ++++ bridge-utils-0.9.6/libbridge/Makefile.in 2004-03-01 20:56:23.000000000 -0600 +@@ -5,7 +5,7 @@ + RANLIB=@RANLIB@ + + CC=@CC@ +-CFLAGS = -Wall -g $(KERNEL_HEADERS) ++CFLAGS = -Wall -g @CFLAGS@ $(KERNEL_HEADERS) + + prefix=@prefix@ + exec_prefix=@exec_prefix@ diff --git a/package/bridge/Config.in b/package/bridge/Config.in deleted file mode 100644 index 59025f9722..0000000000 --- a/package/bridge/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_BRIDGE - bool "bridge" - default n - help - Manage ethernet bridging; a way to connect networks together to - form a larger network. - - http://bridge.sourceforge.net/ diff --git a/package/bridge/bridge.mk b/package/bridge/bridge.mk deleted file mode 100644 index 0869f1bfc6..0000000000 --- a/package/bridge/bridge.mk +++ /dev/null @@ -1,71 +0,0 @@ -############################################################# -# -# 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-$(BRIDGE_VERSION).tar.gz -BRIDGE_BUILD_DIR=$(BUILD_DIR)/bridge-utils-$(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) - $(ZCAT) $(DL_DIR)/$(BRIDGE_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - patch -p1 -d $(BRIDGE_BUILD_DIR) < package/bridge/bridge.patch - touch $(BRIDGE_BUILD_DIR)/.unpacked - -$(BRIDGE_BUILD_DIR)/.configured: $(BRIDGE_BUILD_DIR)/.unpacked - (cd $(BRIDGE_BUILD_DIR); rm -rf config.cache; \ - $(TARGET_CONFIGURE_OPTS) \ - $(TARGET_CONFIGURE_ARGS) \ - ./configure \ - --target=$(GNU_TARGET_NAME) \ - --host=$(GNU_TARGET_NAME) \ - --build=$(GNU_HOST_NAME) \ - --prefix=/usr \ - --exec-prefix=/usr \ - --bindir=/usr/bin \ - --sbindir=/usr/sbin \ - --libdir=/lib \ - --libexecdir=/usr/lib \ - --sysconfdir=/etc \ - --datadir=/usr/share \ - --localstatedir=/var \ - --mandir=/usr/man \ - --infodir=/usr/info \ - $(DISABLE_NLS) \ - --with-linux-headers=$(LINUX_HEADERS_DIR) \ - ) - touch $(BRIDGE_BUILD_DIR)/.configured - -$(BRIDGE_BUILD_DIR)/brctl/brctl: $(BRIDGE_BUILD_DIR)/.configured - $(MAKE) -C $(BRIDGE_BUILD_DIR) - -$(TARGET_DIR)/$(BRIDGE_TARGET_BINARY): $(BRIDGE_BUILD_DIR)/brctl/brctl - cp -af $(BRIDGE_BUILD_DIR)/brctl/brctl $(TARGET_DIR)/$(BRIDGE_TARGET_BINARY) - $(STRIPCMD) $(TARGET_DIR)/$(BRIDGE_TARGET_BINARY) - #cp -af $(BRIDGE_BUILD_DIR)/brctl/brctld $(TARGET_DIR)/usr/sbin/ - #$(STRIPCMD) $(TARGET_DIR)/usr/sbin/brctld - -bridge: $(TARGET_DIR)/$(BRIDGE_TARGET_BINARY) - -bridge-source: $(DL_DIR)/$(BRIDGE_SOURCE) - -bridge-clean: - #$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(BRIDGE_BUILD_DIR) uninstall - -$(MAKE) -C $(BRIDGE_BUILD_DIR) clean - -bridge-dirclean: - rm -rf $(BRIDGE_BUILD_DIR) -############################################################# -# -# Toplevel Makefile options -# -############################################################# -ifeq ($(strip $(BR2_PACKAGE_BRIDGE)),y) -TARGETS+=bridge -endif diff --git a/package/bridge/bridge.patch b/package/bridge/bridge.patch deleted file mode 100644 index f44737750b..0000000000 --- a/package/bridge/bridge.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- bridge-utils-0.9.6/libbridge/Makefile.in.dist 2004-03-01 20:55:52.000000000 -0600 -+++ bridge-utils-0.9.6/libbridge/Makefile.in 2004-03-01 20:56:23.000000000 -0600 -@@ -5,7 +5,7 @@ - RANLIB=@RANLIB@ - - CC=@CC@ --CFLAGS = -Wall -g $(KERNEL_HEADERS) -+CFLAGS = -Wall -g @CFLAGS@ $(KERNEL_HEADERS) - - prefix=@prefix@ - exec_prefix=@exec_prefix@