From: <abe...@us...> - 2017-05-28 14:42:21
|
Revision: 8351 http://sourceforge.net/p/astlinux/code/8351 Author: abelbeck Date: 2017-05-28 14:42:19 +0000 (Sun, 28 May 2017) Log Message: ----------- bridge-utils (brctl), version bump to 1.6 and fix bridge->bridge-utils naming consistency. Note this package is deprecated an our code has moved to 'ip' and 'bridge' commands, this is provided for only legacy rc.elocal support Modified Paths: -------------- branches/1.0/astlinux-ast11.config branches/1.0/astlinux-ast13.config branches/1.0/initrd.config branches/1.0/package/bridge-utils/Config.in branches/1.0/runnix-iso.config branches/1.0/runnix.config branches/1.0/x86_64-configs/astlinux-ast11.config branches/1.0/x86_64-configs/astlinux-ast13.config branches/1.0/x86_64-configs/initrd.config Added Paths: ----------- branches/1.0/package/bridge-utils/bridge-utils.mk branches/1.0/package/bridge-utils/bridge-utils.patch Removed Paths: ------------- branches/1.0/package/bridge-utils/bridge.mk branches/1.0/package/bridge-utils/bridge.patch Modified: branches/1.0/astlinux-ast11.config =================================================================== --- branches/1.0/astlinux-ast11.config 2017-05-28 12:57:12 UTC (rev 8350) +++ branches/1.0/astlinux-ast11.config 2017-05-28 14:42:19 UTC (rev 8351) @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Buildroot astlinux-1.x-svn8333-dirty Configuration -# Wed May 24 10:13:13 2017 +# Buildroot astlinux-1.x-svn8350-dirty Configuration +# Sun May 28 09:24:32 2017 # BR2_HAVE_DOT_CONFIG=y # BR2_arm is not set @@ -690,7 +690,7 @@ # BR2_PACKAGE_BLUEZ_UTILS is not set # BR2_PACKAGE_BIND is not set # BR2_PACKAGE_BMON is not set -BR2_PACKAGE_BRIDGE=y +BR2_PACKAGE_BRIDGE_UTILS=y # BR2_PACKAGE_BWM_NG is not set # BR2_PACKAGE_CAN_UTILS is not set BR2_PACKAGE_CHRONY=y Modified: branches/1.0/astlinux-ast13.config =================================================================== --- branches/1.0/astlinux-ast13.config 2017-05-28 12:57:12 UTC (rev 8350) +++ branches/1.0/astlinux-ast13.config 2017-05-28 14:42:19 UTC (rev 8351) @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Buildroot astlinux-1.x-svn8333-dirty Configuration -# Wed May 24 10:13:13 2017 +# Buildroot astlinux-1.x-svn8350-dirty Configuration +# Sun May 28 09:24:37 2017 # BR2_HAVE_DOT_CONFIG=y # BR2_arm is not set @@ -690,7 +690,7 @@ # BR2_PACKAGE_BLUEZ_UTILS is not set # BR2_PACKAGE_BIND is not set # BR2_PACKAGE_BMON is not set -BR2_PACKAGE_BRIDGE=y +BR2_PACKAGE_BRIDGE_UTILS=y # BR2_PACKAGE_BWM_NG is not set # BR2_PACKAGE_CAN_UTILS is not set BR2_PACKAGE_CHRONY=y Modified: branches/1.0/initrd.config =================================================================== --- branches/1.0/initrd.config 2017-05-28 12:57:12 UTC (rev 8350) +++ branches/1.0/initrd.config 2017-05-28 14:42:19 UTC (rev 8351) @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Buildroot astlinux-1.x-svn8232-dirty Configuration -# Sat Mar 25 20:00:35 2017 +# Buildroot astlinux-1.x-svn8350-dirty Configuration +# Sun May 28 09:24:45 2017 # BR2_HAVE_DOT_CONFIG=y # BR2_arm is not set @@ -568,7 +568,7 @@ # BR2_PACKAGE_BLUEZ_UTILS is not set # BR2_PACKAGE_BIND is not set # BR2_PACKAGE_BMON is not set -# BR2_PACKAGE_BRIDGE is not set +# BR2_PACKAGE_BRIDGE_UTILS is not set # BR2_PACKAGE_BWM_NG is not set # BR2_PACKAGE_CAN_UTILS is not set # BR2_PACKAGE_CHRONY is not set Modified: branches/1.0/package/bridge-utils/Config.in =================================================================== --- branches/1.0/package/bridge-utils/Config.in 2017-05-28 12:57:12 UTC (rev 8350) +++ branches/1.0/package/bridge-utils/Config.in 2017-05-28 14:42:19 UTC (rev 8351) @@ -1,7 +1,7 @@ -config BR2_PACKAGE_BRIDGE +config BR2_PACKAGE_BRIDGE_UTILS bool "bridge-utils" help Manage ethernet bridging; a way to connect networks together to form a larger network. - http://linux-net.osdl.org/index.php/Bridge + https://git.kernel.org/cgit/linux/kernel/git/shemminger/bridge-utils.git/ Copied: branches/1.0/package/bridge-utils/bridge-utils.mk (from rev 8350, branches/1.0/package/bridge-utils/bridge.mk) =================================================================== --- branches/1.0/package/bridge-utils/bridge-utils.mk (rev 0) +++ branches/1.0/package/bridge-utils/bridge-utils.mk 2017-05-28 14:42:19 UTC (rev 8351) @@ -0,0 +1,13 @@ +############################################################# +# +# bridge-utils +# +############################################################# + +BRIDGE_UTILS_VERSION = 1.6 +BRIDGE_UTILS_SOURCE = bridge-utils-$(BRIDGE_UTILS_VERSION).tar.xz +BRIDGE_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/net/bridge-utils +BRIDGE_UTILS_AUTORECONF = YES +BRIDGE_UTILS_CONF_OPT = --with-linux-headers=$(LINUX_HEADERS_DIR) + +$(eval $(call AUTOTARGETS,package,bridge-utils)) Copied: branches/1.0/package/bridge-utils/bridge-utils.patch (from rev 8350, branches/1.0/package/bridge-utils/bridge.patch) =================================================================== --- branches/1.0/package/bridge-utils/bridge-utils.patch (rev 0) +++ branches/1.0/package/bridge-utils/bridge-utils.patch 2017-05-28 14:42:19 UTC (rev 8351) @@ -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@ Deleted: branches/1.0/package/bridge-utils/bridge.mk =================================================================== --- branches/1.0/package/bridge-utils/bridge.mk 2017-05-28 12:57:12 UTC (rev 8350) +++ branches/1.0/package/bridge-utils/bridge.mk 2017-05-28 14:42:19 UTC (rev 8351) @@ -1,18 +0,0 @@ -############################################################# -# -# bridge-utils -# -############################################################# - -BRIDGE_VERSION = 1.5 -BRIDGE_SOURCE = bridge-utils-$(BRIDGE_VERSION).tar.gz -BRIDGE_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/bridge -BRIDGE_AUTORECONF = YES -BRIDGE_CONF_OPT = --with-linux-headers=$(LINUX_HEADERS_DIR) - -define BRIDGE_UNINSTALL_TARGET_CMDS - rm -f $(addprefix $(TARGET_DIR)/usr/,lib/libbridge.a \ - include/libbridge.h share/man/man8/brctl.8 sbin/brctl) -endef - -$(eval $(call AUTOTARGETS,package,bridge)) Deleted: branches/1.0/package/bridge-utils/bridge.patch =================================================================== --- branches/1.0/package/bridge-utils/bridge.patch 2017-05-28 12:57:12 UTC (rev 8350) +++ branches/1.0/package/bridge-utils/bridge.patch 2017-05-28 14:42:19 UTC (rev 8351) @@ -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@ Modified: branches/1.0/runnix-iso.config =================================================================== --- branches/1.0/runnix-iso.config 2017-05-28 12:57:12 UTC (rev 8350) +++ branches/1.0/runnix-iso.config 2017-05-28 14:42:19 UTC (rev 8351) @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Buildroot astlinux-1.x-svn8232-dirty Configuration -# Sat Mar 25 20:00:42 2017 +# Buildroot astlinux-1.x-svn8350-dirty Configuration +# Sun May 28 09:25:00 2017 # BR2_HAVE_DOT_CONFIG=y # BR2_arm is not set @@ -597,7 +597,7 @@ # BR2_PACKAGE_BOA is not set # BR2_PACKAGE_BIND is not set # BR2_PACKAGE_BMON is not set -# BR2_PACKAGE_BRIDGE is not set +# BR2_PACKAGE_BRIDGE_UTILS is not set # BR2_PACKAGE_BWM_NG is not set # BR2_PACKAGE_CAN_UTILS is not set # BR2_PACKAGE_CHRONY is not set Modified: branches/1.0/runnix.config =================================================================== --- branches/1.0/runnix.config 2017-05-28 12:57:12 UTC (rev 8350) +++ branches/1.0/runnix.config 2017-05-28 14:42:19 UTC (rev 8351) @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Buildroot astlinux-1.x-svn8232-dirty Configuration -# Sat Mar 25 20:00:38 2017 +# Buildroot astlinux-1.x-svn8350-dirty Configuration +# Sun May 28 09:24:49 2017 # BR2_HAVE_DOT_CONFIG=y # BR2_arm is not set @@ -598,7 +598,7 @@ # BR2_PACKAGE_BOA is not set # BR2_PACKAGE_BIND is not set # BR2_PACKAGE_BMON is not set -# BR2_PACKAGE_BRIDGE is not set +# BR2_PACKAGE_BRIDGE_UTILS is not set # BR2_PACKAGE_BWM_NG is not set # BR2_PACKAGE_CAN_UTILS is not set # BR2_PACKAGE_CHRONY is not set Modified: branches/1.0/x86_64-configs/astlinux-ast11.config =================================================================== --- branches/1.0/x86_64-configs/astlinux-ast11.config 2017-05-28 12:57:12 UTC (rev 8350) +++ branches/1.0/x86_64-configs/astlinux-ast11.config 2017-05-28 14:42:19 UTC (rev 8351) @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Buildroot astlinux-1.x-svn8333-dirty Configuration -# Wed May 24 10:13:14 2017 +# Buildroot astlinux-1.x-svn8350-dirty Configuration +# Sun May 28 09:25:15 2017 # BR2_HAVE_DOT_CONFIG=y BR2_ARCH_IS_64=y @@ -671,7 +671,7 @@ # BR2_PACKAGE_BLUEZ_UTILS is not set # BR2_PACKAGE_BIND is not set # BR2_PACKAGE_BMON is not set -BR2_PACKAGE_BRIDGE=y +BR2_PACKAGE_BRIDGE_UTILS=y # BR2_PACKAGE_BWM_NG is not set # BR2_PACKAGE_CAN_UTILS is not set BR2_PACKAGE_CHRONY=y Modified: branches/1.0/x86_64-configs/astlinux-ast13.config =================================================================== --- branches/1.0/x86_64-configs/astlinux-ast13.config 2017-05-28 12:57:12 UTC (rev 8350) +++ branches/1.0/x86_64-configs/astlinux-ast13.config 2017-05-28 14:42:19 UTC (rev 8351) @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Buildroot astlinux-1.x-svn8333-dirty Configuration -# Wed May 24 10:13:14 2017 +# Buildroot astlinux-1.x-svn8350-dirty Configuration +# Sun May 28 09:25:19 2017 # BR2_HAVE_DOT_CONFIG=y BR2_ARCH_IS_64=y @@ -671,7 +671,7 @@ # BR2_PACKAGE_BLUEZ_UTILS is not set # BR2_PACKAGE_BIND is not set # BR2_PACKAGE_BMON is not set -BR2_PACKAGE_BRIDGE=y +BR2_PACKAGE_BRIDGE_UTILS=y # BR2_PACKAGE_BWM_NG is not set # BR2_PACKAGE_CAN_UTILS is not set BR2_PACKAGE_CHRONY=y Modified: branches/1.0/x86_64-configs/initrd.config =================================================================== --- branches/1.0/x86_64-configs/initrd.config 2017-05-28 12:57:12 UTC (rev 8350) +++ branches/1.0/x86_64-configs/initrd.config 2017-05-28 14:42:19 UTC (rev 8351) @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Buildroot astlinux-1.x-svn8232-dirty Configuration -# Sat Mar 25 20:00:54 2017 +# Buildroot astlinux-1.x-svn8350-dirty Configuration +# Sun May 28 09:25:25 2017 # BR2_HAVE_DOT_CONFIG=y BR2_ARCH_IS_64=y @@ -549,7 +549,7 @@ # BR2_PACKAGE_BLUEZ_UTILS is not set # BR2_PACKAGE_BIND is not set # BR2_PACKAGE_BMON is not set -# BR2_PACKAGE_BRIDGE is not set +# BR2_PACKAGE_BRIDGE_UTILS is not set # BR2_PACKAGE_BWM_NG is not set # BR2_PACKAGE_CAN_UTILS is not set # BR2_PACKAGE_CHRONY is not set This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |