From 3691a072ccab9fb2eeb5a0d722d9fe0c4eecaf36 Mon Sep 17 00:00:00 2001
From: Nicolas Thill <nico@openwrt.org>
Date: Tue, 11 Nov 2008 03:02:26 +0000
Subject: [PATCH] bridge (brctl) changes: - enable brctl in busybox - disable
 bridge-utils - bumb busybox release number

SVN-Revision: 13180
---
 include/target.mk                           | 2 +-
 package/busybox/Makefile                    | 4 ++--
 package/busybox/config/networking/Config.in | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/target.mk b/include/target.mk
index f3826b18654..9ac5c8e96b9 100644
--- a/include/target.mk
+++ b/include/target.mk
@@ -14,7 +14,7 @@ DEVICE_TYPE?=router
 # Default packages - the really basic set
 DEFAULT_PACKAGES:=base-files libgcc uclibc busybox dropbear mtd uci opkg
 # For router targets
-DEFAULT_PACKAGES.router:=dnsmasq iptables ppp ppp-mod-pppoe kmod-ipt-nathelper bridge firewall
+DEFAULT_PACKAGES.router:=dnsmasq iptables ppp ppp-mod-pppoe kmod-ipt-nathelper firewall
 # LuCI
 DEFAULT_PACKAGES.router+=luci-admin-full luci-admin-mini luci-i18n-english luci-app-firewall luci-sgi-cgi
 
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 2f977942618..3ac28987308 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -1,5 +1,5 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=busybox
 PKG_VERSION:=1.11.3
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.busybox.net/downloads \
diff --git a/package/busybox/config/networking/Config.in b/package/busybox/config/networking/Config.in
index 3da608d9b4a..e81a2efcef4 100644
--- a/package/busybox/config/networking/Config.in
+++ b/package/busybox/config/networking/Config.in
@@ -49,14 +49,14 @@ config BUSYBOX_CONFIG_ARPING
 
 config BUSYBOX_CONFIG_BRCTL
 	bool "brctl"
-	default n
+	default y
 	help
 	  Manage ethernet bridges.
 	  Supports addbr/delbr and addif/delif.
 
 config BUSYBOX_CONFIG_FEATURE_BRCTL_FANCY
 	bool "Fancy options"
-	default n
+	default y
 	depends on BUSYBOX_CONFIG_BRCTL
 	help
 	  Add support for extended option like:
@@ -67,7 +67,7 @@ config BUSYBOX_CONFIG_FEATURE_BRCTL_FANCY
 
 config BUSYBOX_CONFIG_FEATURE_BRCTL_SHOW
 	bool "Support show, showmac and showstp"
-	default n
+	default y
 	depends on BUSYBOX_CONFIG_BRCTL && BUSYBOX_CONFIG_FEATURE_BRCTL_FANCY
 	help
 	  Add support for option which prints the current config:
-- 
2.30.2