From 6b261a394914d188fb962a07b265500084351818 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Tue, 29 Jan 2013 13:39:08 +0100 Subject: [PATCH] meta-digi-del: enable busybox' brctl applet Also enable CONFIG_BRIDGE in kernel configs (which is required to use brctl) https://jira.digi.com/browse/DEL-156 #resolve Signed-off-by: Javier Viguera --- .../linux/linux-imx_2.6.35.3/ccardxmx28js/defconfig | 5 ++++- .../linux/linux-imx_2.6.35.3/ccxmx51js/defconfig | 5 ++++- .../linux/linux-imx_2.6.35.3/ccxmx53js/defconfig | 5 ++++- .../packagegroups/packagegroup-del-network.bb | 1 - .../recipes-core/busybox/busybox-1.20.2/defconfig | 8 ++++---- 5 files changed, 16 insertions(+), 8 deletions(-) diff --git a/meta-digi-arm/recipes-kernel/linux/linux-imx_2.6.35.3/ccardxmx28js/defconfig b/meta-digi-arm/recipes-kernel/linux/linux-imx_2.6.35.3/ccardxmx28js/defconfig index 37c311cc2..37c26a5f5 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-imx_2.6.35.3/ccardxmx28js/defconfig +++ b/meta-digi-arm/recipes-kernel/linux/linux-imx_2.6.35.3/ccardxmx28js/defconfig @@ -484,10 +484,13 @@ CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_TIPC is not set # CONFIG_ATM is not set # CONFIG_L2TP is not set -# CONFIG_BRIDGE is not set +CONFIG_STP=y +CONFIG_BRIDGE=y +CONFIG_BRIDGE_IGMP_SNOOPING=y # CONFIG_NET_DSA is not set # CONFIG_VLAN_8021Q is not set # CONFIG_DECNET is not set +CONFIG_LLC=y # CONFIG_LLC2 is not set # CONFIG_IPX is not set # CONFIG_ATALK is not set diff --git a/meta-digi-arm/recipes-kernel/linux/linux-imx_2.6.35.3/ccxmx51js/defconfig b/meta-digi-arm/recipes-kernel/linux/linux-imx_2.6.35.3/ccxmx51js/defconfig index 91e016189..4459afedc 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-imx_2.6.35.3/ccxmx51js/defconfig +++ b/meta-digi-arm/recipes-kernel/linux/linux-imx_2.6.35.3/ccxmx51js/defconfig @@ -559,10 +559,13 @@ CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_TIPC is not set # CONFIG_ATM is not set # CONFIG_L2TP is not set -# CONFIG_BRIDGE is not set +CONFIG_STP=y +CONFIG_BRIDGE=y +CONFIG_BRIDGE_IGMP_SNOOPING=y # CONFIG_NET_DSA is not set # CONFIG_VLAN_8021Q is not set # CONFIG_DECNET is not set +CONFIG_LLC=y # CONFIG_LLC2 is not set # CONFIG_IPX is not set # CONFIG_ATALK is not set diff --git a/meta-digi-arm/recipes-kernel/linux/linux-imx_2.6.35.3/ccxmx53js/defconfig b/meta-digi-arm/recipes-kernel/linux/linux-imx_2.6.35.3/ccxmx53js/defconfig index b7bbecc9b..1a159778d 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-imx_2.6.35.3/ccxmx53js/defconfig +++ b/meta-digi-arm/recipes-kernel/linux/linux-imx_2.6.35.3/ccxmx53js/defconfig @@ -561,10 +561,13 @@ CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_TIPC is not set # CONFIG_ATM is not set # CONFIG_L2TP is not set -# CONFIG_BRIDGE is not set +CONFIG_STP=y +CONFIG_BRIDGE=y +CONFIG_BRIDGE_IGMP_SNOOPING=y # CONFIG_NET_DSA is not set # CONFIG_VLAN_8021Q is not set # CONFIG_DECNET is not set +CONFIG_LLC=y # CONFIG_LLC2 is not set # CONFIG_IPX is not set # CONFIG_ATALK is not set diff --git a/meta-digi-del/recipes-connectivity/packagegroups/packagegroup-del-network.bb b/meta-digi-del/recipes-connectivity/packagegroups/packagegroup-del-network.bb index 4b64304f1..6016c2558 100644 --- a/meta-digi-del/recipes-connectivity/packagegroups/packagegroup-del-network.bb +++ b/meta-digi-del/recipes-connectivity/packagegroups/packagegroup-del-network.bb @@ -30,7 +30,6 @@ VIRTUAL-RUNTIME_snmp-manager ?= "" #VIRTUAL-RUNTIME_snmp-manager ?= "net-snmp-server" RDEPENDS_${PN} = "\ - bridge-utils \ ppp \ iproute2 \ ${VIRTUAL-RUNTIME_ftp-server} \ diff --git a/meta-digi-del/recipes-core/busybox/busybox-1.20.2/defconfig b/meta-digi-del/recipes-core/busybox/busybox-1.20.2/defconfig index 4f78a9edf..19db29260 100644 --- a/meta-digi-del/recipes-core/busybox/busybox-1.20.2/defconfig +++ b/meta-digi-del/recipes-core/busybox/busybox-1.20.2/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Busybox version: 1.20.2 -# Tue Jan 22 14:01:59 2013 +# Tue Jan 29 13:10:18 2013 # CONFIG_HAVE_DOT_CONFIG=y @@ -735,9 +735,9 @@ CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y CONFIG_VERBOSE_RESOLUTION_ERRORS=y CONFIG_ARP=y CONFIG_ARPING=y -# CONFIG_BRCTL is not set -# CONFIG_FEATURE_BRCTL_FANCY is not set -# CONFIG_FEATURE_BRCTL_SHOW is not set +CONFIG_BRCTL=y +CONFIG_FEATURE_BRCTL_FANCY=y +CONFIG_FEATURE_BRCTL_SHOW=y # CONFIG_DNSD is not set # CONFIG_ETHER_WAKE is not set # CONFIG_FAKEIDENTD is not set