remove BATMAN Devel as it doesn't work with every connection

This commit is contained in:
reddog 2012-01-10 10:42:55 +00:00
parent 6f27f8c417
commit d24d16191a
10 changed files with 23 additions and 64 deletions

View File

@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# OpenWrt version: Backfire (r29638)
# Sun Jan 8 15:53:47 2012
# Tue Jan 10 00:46:06 2012
#
CONFIG_HAVE_DOT_CONFIG=y
# CONFIG_TARGET_ppc40x is not set
@ -2254,15 +2254,9 @@ CONFIG_PACKAGE_kmod-ipt-nathelper=y
# CONFIG_PACKAGE_kmod-atm is not set
# CONFIG_PACKAGE_kmod-ax25 is not set
# CONFIG_PACKAGE_kmod-batgat is not set
# CONFIG_PACKAGE_kmod-batman-adv is not set
CONFIG_PACKAGE_kmod-batman-adv-devel=y
# CONFIG_KMOD_BATMAN_ADV_DEVEL_DEBUG_LOG is not set
CONFIG_KMOD_BATMAN_ADV_DEVEL_BATCTL=y
# CONFIG_KMOD_BATMAN_ADV_DEVEL_BRANCH_MASTER is not set
CONFIG_KMOD_BATMAN_ADV_DEVEL_BRANCH_BLA2=y
# CONFIG_KMOD_BATMAN_ADV_DEVEL_BRANCH_CATWOMAN is not set
# CONFIG_KMOD_BATMAN_ADV_DEVEL_BRANCH_DAT is not set
CONFIG_KMOD_BATMAN_ADV_DEVEL_BRANCH_NAME="bla2"
CONFIG_PACKAGE_kmod-batman-adv=y
# CONFIG_KMOD_BATMAN_ADV_DEBUG_LOG is not set
CONFIG_KMOD_BATMAN_ADV_BATCTL=y
# CONFIG_PACKAGE_kmod-bonding is not set
# CONFIG_PACKAGE_kmod-bridge is not set
# CONFIG_PACKAGE_kmod-capi is not set

View File

@ -2269,17 +2269,9 @@ CONFIG_PACKAGE_kmod-ipt-nathelper=y
# CONFIG_PACKAGE_kmod-atm is not set
# CONFIG_PACKAGE_kmod-ax25 is not set
# CONFIG_PACKAGE_kmod-batgat is not set
#CONFIG_PACKAGE_kmod-batman-adv=y
CONFIG_PACKAGE_kmod-batman-adv=y
# CONFIG_KMOD_BATMAN_ADV_DEBUG_LOG is not set
#CONFIG_KMOD_BATMAN_ADV_BATCTL=y
CONFIG_PACKAGE_kmod-batman-adv-devel=y
# CONFIG_KMOD_BATMAN_ADV_DEVEL_DEBUG_LOG is not set
CONFIG_KMOD_BATMAN_ADV_DEVEL_BATCTL=y
# CONFIG_KMOD_BATMAN_ADV_DEVEL_BRANCH_MASTER is not set
CONFIG_KMOD_BATMAN_ADV_DEVEL_BRANCH_BLA2=y
# CONFIG_KMOD_BATMAN_ADV_DEVEL_BRANCH_CATWOMAN is not set
# CONFIG_KMOD_BATMAN_ADV_DEVEL_BRANCH_DAT is not set
CONFIG_KMOD_BATMAN_ADV_DEVEL_BRANCH_NAME="bla2"
CONFIG_KMOD_BATMAN_ADV_BATCTL=y
# CONFIG_PACKAGE_kmod-bonding is not set
# CONFIG_PACKAGE_kmod-capi is not set
# CONFIG_PACKAGE_kmod-gre is not set

View File

@ -2263,17 +2263,9 @@ CONFIG_PACKAGE_kmod-ipt-nathelper=y
# CONFIG_PACKAGE_kmod-atm is not set
# CONFIG_PACKAGE_kmod-ax25 is not set
# CONFIG_PACKAGE_kmod-batgat is not set
#CONFIG_PACKAGE_kmod-batman-adv=y
CONFIG_PACKAGE_kmod-batman-adv=y
# CONFIG_KMOD_BATMAN_ADV_DEBUG_LOG is not set
#CONFIG_KMOD_BATMAN_ADV_BATCTL=y
CONFIG_PACKAGE_kmod-batman-adv-devel=y
# CONFIG_KMOD_BATMAN_ADV_DEVEL_DEBUG_LOG is not set
CONFIG_KMOD_BATMAN_ADV_DEVEL_BATCTL=y
# CONFIG_KMOD_BATMAN_ADV_DEVEL_BRANCH_MASTER is not set
CONFIG_KMOD_BATMAN_ADV_DEVEL_BRANCH_BLA2=y
# CONFIG_KMOD_BATMAN_ADV_DEVEL_BRANCH_CATWOMAN is not set
# CONFIG_KMOD_BATMAN_ADV_DEVEL_BRANCH_DAT is not set
CONFIG_KMOD_BATMAN_ADV_DEVEL_BRANCH_NAME="bla2"
CONFIG_KMOD_BATMAN_ADV_BATCTL=y
# CONFIG_PACKAGE_kmod-bonding is not set
# CONFIG_PACKAGE_kmod-capi is not set
# CONFIG_PACKAGE_kmod-gre is not set

View File

@ -2246,17 +2246,9 @@ CONFIG_PACKAGE_kmod-ipt-nathelper=y
# CONFIG_PACKAGE_kmod-atm is not set
# CONFIG_PACKAGE_kmod-ax25 is not set
# CONFIG_PACKAGE_kmod-batgat is not set
#CONFIG_PACKAGE_kmod-batman-adv=y
CONFIG_PACKAGE_kmod-batman-adv=y
# CONFIG_KMOD_BATMAN_ADV_DEBUG_LOG is not set
#CONFIG_KMOD_BATMAN_ADV_BATCTL=y
CONFIG_PACKAGE_kmod-batman-adv-devel=y
# CONFIG_KMOD_BATMAN_ADV_DEVEL_DEBUG_LOG is not set
CONFIG_KMOD_BATMAN_ADV_DEVEL_BATCTL=y
# CONFIG_KMOD_BATMAN_ADV_DEVEL_BRANCH_MASTER is not set
CONFIG_KMOD_BATMAN_ADV_DEVEL_BRANCH_BLA2=y
# CONFIG_KMOD_BATMAN_ADV_DEVEL_BRANCH_CATWOMAN is not set
# CONFIG_KMOD_BATMAN_ADV_DEVEL_BRANCH_DAT is not set
CONFIG_KMOD_BATMAN_ADV_DEVEL_BRANCH_NAME="bla2"
CONFIG_KMOD_BATMAN_ADV_BATCTL=y
# CONFIG_PACKAGE_kmod-bonding is not set
# CONFIG_PACKAGE_kmod-capi is not set
# CONFIG_PACKAGE_kmod-gre is not set

View File

@ -1365,17 +1365,9 @@ CONFIG_PACKAGE_kmod-ipt-nathelper=y
# CONFIG_PACKAGE_kmod-atm is not set
# CONFIG_PACKAGE_kmod-ax25 is not set
# CONFIG_PACKAGE_kmod-batgat is not set
#CONFIG_PACKAGE_kmod-batman-adv=y
CONFIG_PACKAGE_kmod-batman-adv=y
# CONFIG_KMOD_BATMAN_ADV_DEBUG_LOG is not set
#CONFIG_KMOD_BATMAN_ADV_BATCTL=y
CONFIG_PACKAGE_kmod-batman-adv-devel=y
# CONFIG_KMOD_BATMAN_ADV_DEVEL_DEBUG_LOG is not set
CONFIG_KMOD_BATMAN_ADV_DEVEL_BATCTL=y
# CONFIG_KMOD_BATMAN_ADV_DEVEL_BRANCH_MASTER is not set
CONFIG_KMOD_BATMAN_ADV_DEVEL_BRANCH_BLA2=y
# CONFIG_KMOD_BATMAN_ADV_DEVEL_BRANCH_CATWOMAN is not set
# CONFIG_KMOD_BATMAN_ADV_DEVEL_BRANCH_DAT is not set
CONFIG_KMOD_BATMAN_ADV_DEVEL_BRANCH_NAME="bla2"
CONFIG_KMOD_BATMAN_ADV_BATCTL=y
# CONFIG_PACKAGE_kmod-bonding is not set
# CONFIG_PACKAGE_kmod-capi is not set
# CONFIG_PACKAGE_kmod-gre is not set

View File

@ -1526,17 +1526,9 @@ CONFIG_PACKAGE_kmod-swconfig=y
# CONFIG_PACKAGE_kmod-atm is not set
# CONFIG_PACKAGE_kmod-ax25 is not set
# CONFIG_PACKAGE_kmod-batgat is not set
#CONFIG_PACKAGE_kmod-batman-adv=y
CONFIG_PACKAGE_kmod-batman-adv=y
# CONFIG_KMOD_BATMAN_ADV_DEBUG_LOG is not set
#CONFIG_KMOD_BATMAN_ADV_BATCTL=y
CONFIG_PACKAGE_kmod-batman-adv-devel=y
# CONFIG_KMOD_BATMAN_ADV_DEVEL_DEBUG_LOG is not set
CONFIG_KMOD_BATMAN_ADV_DEVEL_BATCTL=y
# CONFIG_KMOD_BATMAN_ADV_DEVEL_BRANCH_MASTER is not set
CONFIG_KMOD_BATMAN_ADV_DEVEL_BRANCH_BLA2=y
# CONFIG_KMOD_BATMAN_ADV_DEVEL_BRANCH_CATWOMAN is not set
# CONFIG_KMOD_BATMAN_ADV_DEVEL_BRANCH_DAT is not set
CONFIG_KMOD_BATMAN_ADV_DEVEL_BRANCH_NAME="bla2"
CONFIG_KMOD_BATMAN_ADV_BATCTL=y
# CONFIG_PACKAGE_kmod-bonding is not set
# CONFIG_PACKAGE_kmod-capi is not set
# CONFIG_PACKAGE_kmod-gre is not set

View File

@ -1,5 +1,5 @@
src-svn packages svn://svn.openwrt.org/openwrt/packages@29597
src-svn batman http://downloads.open-mesh.org/svn/openwrt-feed@22
#src-svn batman http://downloads.open-mesh.org/svn/openwrt-feed@22
#src-svn xwrt http://x-wrt.googlecode.com/svn/branches/backfire_10.03/package
#src-svn luci http://svn.luci.subsignal.org/luci/branches/luci-0.10/contrib/package
#src-svn phone svn://svn.openwrt.org/openwrt/feeds/phone

View File

@ -14,7 +14,7 @@ prepare() {
#set git-rev to actual blaII-rebase
patch -p0 < ./build_patches/blaII/Makefile.patch ./build_dir/feeds/batman/batman-adv-devel/Makefile
#patch -p0 < ./build_patches/blaII/Makefile.patch ./build_dir/feeds/batman/batman-adv-devel/Makefile
# fix some tinc mem leaks
mkdir ./build_dir/feeds/packages/net/tinc/patches

View File

@ -1,4 +1,4 @@
FIRMWARE_VERSION="0.3beta2.1"
FIRMWARE_VERSION="0.3beta3"
RELEASE_DATE=""
FIRMWARE_REVISION="541"
OPENWRT_CORE_REVISION="29672"

View File

@ -1,9 +1,12 @@
# Put your custom commands here that should be executed once
# the system init finished. By default this file does nothing.
echo enable > /sys/devices/virtual/net/bat0/mesh/bridge_loop_avoidance
# batman seems to be to stupid to regocnice the devices
# todo: uci.get ..
batctl if add eth0.3
batctl if add eth0.4
batctl if add wlan0-1
ifconfig eth0 mtu 1528
ifconfig eth0.3 mtu 1528
ifconfig eth0.4 mtu 1528
@ -15,6 +18,7 @@ toLower() {
echo $1 | sed -e "s/A/a/g" -e "s/B/b/g" -e "s/C/c/g" -e "s/D/d/g" -e "s/E/e/g" -e "s/F/f/g"
}
# todo: all devices or only dir300 ?
BRMAC=`ip link | grep br-mesh -A1 | grep link | awk '{ print $2 }'`
BRMAC=`toLower $BRMAC`
WLMAC=`ip link | grep wlan0 -A1 | grep link | awk '{ print $2 }'`
@ -35,6 +39,7 @@ if [[ "$BRMAC" != "$WLMAC" ]]; then
fi
fi
# todo: find time-server in Freifunk-Network
rdate -s time.fu-berlin.de
sh /etc/firewall.user