jkimmel
/
firmware
forked from freifunk-franken/firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Patch Tims 0.3 Branch r566 back into Trunk, plz use svn copy next time you create a branch so they can be merged back easily

This commit is contained in:
floh1111 2012-01-10 17:23:21 +00:00
parent d27f058372
commit e38732d41a
16 changed files with 357 additions and 368 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

556
build_configuration/Atheros_AR231x_AR5312/.config
View File

File diff suppressed because it is too large Load Diff

3
build_patches/feeds.conf
View File

@ -1,4 +1,5 @@
src-svn packages svn://svn.openwrt.org/openwrt/packages@28601
src-svn packages svn://svn.openwrt.org/openwrt/packages@29597
#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

8
build_patches/feeds_wr1043nd.conf
View File

@ -1,8 +0,0 @@
src-svn packages svn://svn.openwrt.org/openwrt/packages@26669
#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
#src-svn efl svn://svn.openwrt.org/openwrt/feeds/efl
#src-svn desktop svn://svn.openwrt.org/openwrt/feeds/desktop
#src-svn xfce svn://svn.openwrt.org/openwrt/feeds/xfce
#src-link custom /usr/src/openwrt/custom-feed

8
build_patches/feeds_wr741nd.conf
View File

@ -1,8 +0,0 @@
src-svn packages svn://svn.openwrt.org/openwrt/packages@28263
#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
#src-svn efl svn://svn.openwrt.org/openwrt/feeds/efl
#src-svn desktop svn://svn.openwrt.org/openwrt/feeds/desktop
#src-svn xfce svn://svn.openwrt.org/openwrt/feeds/xfce
#src-link custom /usr/src/openwrt/custom-feed

21
build_patches/tinc/tinc-1.0.14.patch
View File

@ -1,21 +0,0 @@
Index: feeds/packages/net/tinc/Makefile
===================================================================
--- feeds/packages/net/tinc/Makefile (revision 26858)
+++ feeds/packages/net/tinc/Makefile (working copy)
@@ -8,14 +8,14 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=tinc
-PKG_VERSION:=1.0.13
+PKG_VERSION:=1.0.14
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.tinc-vpn.org/packages \
http://ftp.yi.se/pub/tinc/ \
http://www.mirrors.wiretapped.net/security/network-security/tinc/
-PKG_MD5SUM:=86263994d38c750431efd17e9a91a248
+PKG_MD5SUM:=967dfafc4aa41a614c1d2739df8a8372
PKG_INSTALL:=1

2
root_file_system/default/etc/config/batman-adv
View File

@ -1,5 +1,5 @@
config 'mesh' 'bat0'
option 'interfaces' 'ath1'
option 'interfaces' 'wlanmesh ethmesh1 ethmesh2'
option 'orig_interval'
option 'log_level'
option 'aggregated_ogms'

3
root_file_system/default/etc/config/network
View File

@ -9,12 +9,11 @@ config 'interface' 'loopback'
# option 'ifname' 'eth0.1'
config 'interface' 'wlanmesh'
option 'ifname' 'ath1'
option 'mtu' '1528'
config 'interface' 'mesh'
option 'type' 'bridge'
option 'ifname' 'eth0.1 ath0 bat0 tap0'
option 'ifname' 'eth0.1 bat0 tap0'
option 'auto' '1'
config 'switch' 'eth0'

2
root_file_system/default/etc/config/nodewatcher
View File

@ -15,4 +15,4 @@ config 'update'
config 'network'
option 'mesh_interface' 'br-mesh'
option 'client_interfaces' 'ath0 wlan0'
option 'client_interfaces' 'ath0 wlan0 eth0.1'

2
root_file_system/default/etc/config/wireless
View File

@ -7,6 +7,7 @@ config 'wifi-device' 'wifi0'
config 'wifi-iface'
option 'device' 'wifi0'
option 'network' 'wlanmesh'
option 'mode' 'adhoc'
option 'ssid' 'batman.oldenburg.freifunk.net'
option 'bssid' '02:CA:FF:EE:BA:BE'
@ -15,6 +16,7 @@ config 'wifi-iface'
config 'wifi-iface'
option 'device' 'wifi0'
option 'network' 'mesh'
option 'mode' 'ap'
option 'ssid' 'oldenburg.freifunk.net'
option 'encryption' 'none'

5
root_file_system/default/etc/crontabs/root
View File

@ -5,7 +5,7 @@
*/5 * * * * sh /etc/tincstart.sh
*/5 * * * * sh /etc/nodewatcher.sh
*/5 * * * * sh /etc/configurator.sh
0 * * * * sh /etc/configurator.sh sync_hostname
0 * * * * sh /etc/configurator.sh sync_hostname
15 01 * * * rdate -s time.fu-berlin.de > /dev/null
@ -16,4 +16,5 @@
#* * * * * /usr/sbin/ff_olsr_test_gw
#*/5 * * * * /usr/sbin/ff_olsr_watchdog
#0 */4 * * * /usr/sbin/ff_rdate
#17 * * * * /usr/sbin/ff_mapupdate
#17 * * * * /usr/sbin/ff_mapupdate

5
root_file_system/default/etc/firmware_release
View File

@ -1,2 +1,5 @@
FIRMWARE_VERSION="trunk"
FIRMWARE_VERSION="0.3beta3"
RELEASE_DATE=""
FIRMWARE_REVISION="541"
OPENWRT_CORE_REVISION="29672"
OPENWRT_FEEDS_PACKAGES_REVISION="29597"

45
root_file_system/default/etc/rc.local
View File

@ -1,18 +1,47 @@
# Put your custom commands here that should be executed once
# the system init finished. By default this file does nothing.
ifconfig br-mesh down
ifconfig br-mesh up
# 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
ifdown lan
ifup lan
ifconfig eth0 mtu 1528
ifconfig eth0.3 mtu 1528
ifconfig eth0.4 mtu 1528
echo none > /sys/devices/platform/ar231x-wmac.0/leds/ath5k-phy0\:\:rx/trigger
echo phy0tx > /sys/devices/platform/ar231x-wmac.0/leds/ath5k-phy0\:\:tx/trigger
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 }'`
WLMAC=`toLower $WLMAC`
ETMAC=`ip link | grep eth0 -A1 | grep link | awk '{ print $2 }'`
ETMAC=`toLower $ETMAC`
if [ "$WLMAC" != "" ] && [ "$BRMAC" != "" ] && [ "$BRMAC" = "$ETMAC" ]; then
if [[ "$BRMAC" != "$WLMAC" ]]; then
logger -s "Fixing wrong MAC on br-mesh"
uci set network.mesh.macaddr=$WLMAC
uci commit
ifconfig br-mesh hw ether $WLMAC
ifconfig br-mesh down
ifconfig br-mesh up
#wait before reboot to generate tinc certificates and to be able
#to login over ssh bevore reboot in case of errors
fi
fi
# todo: find time-server in Freifunk-Network
rdate -s time.fu-berlin.de
chown root.root /etc/crontabs/root
/etc/init.d/cron stop
/etc/init.d/cron start
sh /etc/firewall.user
/etc/init.d/qos disable

23
root_file_system/dir300/etc/config/network
View File

@ -9,12 +9,11 @@ config 'interface' 'loopback'
# option 'ifname' 'eth0.1'
config 'interface' 'wlanmesh'
option 'ifname' 'ath1'
option 'mtu' '1528'
config 'interface' 'mesh'
option 'type' 'bridge'
option 'ifname' 'eth0.1 ath0 bat0 tap0'
option 'ifname' 'eth0.1 bat0 tap0'
option 'auto' '1'
config 'switch' 'eth0'
@ -25,13 +24,31 @@ config 'switch' 'eth0'
config 'switch_vlan' 'eth0_1'
option 'device' 'eth0'
option 'vlan' '1'
option 'ports' '0 1 2 3 5t'
option 'ports' '0 1 5t'
config 'switch_vlan' 'eth0_2'
option 'device' 'eth0'
option 'vlan' '2'
option 'ports' '4 5t'
config 'switch_vlan' 'eth0_3'
option 'device' 'eth0'
option 'vlan' '3'
option 'ports' '2 5t'
config 'switch_vlan' 'eth0_4'
option 'device' 'eth0'
option 'vlan' '4'
option 'ports' '3 5t'
config 'interface' 'ethmesh1'
option 'ifname' 'eth0.3'
option 'mtu' '1528'
config 'interface' 'ethmesh2'
option 'ifname' 'eth0.4'
option 'mtu' '1528'
config 'interface' 'wan'
option 'ifname' 'eth0.2'
option 'proto' 'dhcp'

9
root_file_system/dir300/etc/config/wireless
View File

@ -1,14 +1,12 @@
config 'wifi-device' 'wifi0'
option 'type' 'atheros'
option 'type' 'mac80211'
option 'phy' 'phy0'
option 'disabled' '0'
option 'channel' '6'
option 'bgscan' '0'
option 'diversity' '1'
#enable correct wifi led on dir300 https://forum.openwrt.org/viewtopic.php?id=29714
option 'softled' '0'
config 'wifi-iface'
option 'device' 'wifi0'
option 'network' 'wlanmesh'
option 'mode' 'adhoc'
option 'ssid' 'batman.oldenburg.freifunk.net'
option 'bssid' '02:CA:FF:EE:BA:BE'
@ -17,6 +15,7 @@ config 'wifi-iface'
config 'wifi-iface'
option 'device' 'wifi0'
option 'network' 'mesh'
option 'mode' 'ap'
option 'ssid' 'oldenburg.freifunk.net'
option 'encryption' 'none'

17
root_file_system/dir300/etc/crontabs/root
View File

@ -1,22 +1,23 @@
*/5 * * * * killall klogd
*/5 * * * * killall syslogd
*/5 * * * * killall logger
*/5 * * * * sleep 5 && killall syslogd
*/5 * * * * sleep 15 && killall logger
*/5 * * * * sh /etc/tincstart.sh
*/5 * * * * sh /etc/nodewatcher.sh
*/5 * * * * sh /etc/configurator.sh
0 * * * * sh /etc/configurator.sh sync_hostname
*/5 * * * * sleep 20 && sh /etc/tincstart.sh
*/5 * * * * sleep 40 && sh /etc/nodewatcher.sh
*/5 * * * * sleep 60 && sh /etc/configurator.sh
0 * * * * sleep 80 && sh /etc/configurator.sh sync_hostname
15 01 * * * rdate -s time.fu-berlin.de > /dev/null
#Enable zapp script if you are running a gateway
#*/1 * * * * /etc/init.d/zapp
*/5 * * * * killall -HUP dnsmasq
*/5 * * * * sleep 10 && killall -HUP dnsmasq
#* * * * * /usr/sbin/ff_olsr_test_gw
#*/5 * * * * /usr/sbin/ff_olsr_watchdog
#0 */4 * * * /usr/sbin/ff_rdate
#17 * * * * /usr/sbin/ff_mapupdate
#Reboot dir300 every 3 days at 04:05
5 4 */3 * * reboot
5 4 */3 * * reboot

16
root_file_system/fonera/etc/config/network
View File

@ -4,19 +4,19 @@ config 'interface' 'loopback'
option 'ipaddr' '127.0.0.1'
option 'netmask' '255.0.0.0'
config 'interface' 'lan'
option 'proto' 'dhcp'
option 'ifname' 'eth0'
#config 'interface' 'lan'
# option 'proto' 'dhcp'
# option 'ifname' 'eth0.1'
config 'interface' 'wlanmesh'
option 'ifname' 'ath1'
option 'mtu' '1528'
config 'interface' 'mesh'
option 'type' 'bridge'
option 'ifname' 'ath0 bat0 tap0'
option 'ifname' 'bat0 tap0'
option 'auto' '1'
# To get Freifunk on the ethernet port (for a desktop pc for example), comment out
# the lan interface section and add eth0 to the ifnames of the mesh interface.
# Then restart the router and plug in your ethernet cable
config 'interface' 'wan'
option 'ifname' 'eth0'
option 'proto' 'dhcp'