bridge (brctl) changes:

 - enable brctl in busybox
 - disable bridge-utils
 - bumb busybox release number

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13180 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/include/target.mk b/include/target.mk
index f3826b1..9ac5c8e 100644 (file)
--- 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 2f97794..3ac2898 100644 (file)
--- 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 3da608d..e81a2ef 100644 (file)
--- 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: