Merge pull request #18 from magenbrot/master

verschiedene Änderungen
This commit is contained in:
RedDog99 2014-11-29 18:12:22 +01:00
commit b52bdf76b8
57 changed files with 92 additions and 163 deletions

1
.gitignore vendored
View File

@ -9,3 +9,4 @@ src/packages/libremap/
src/packages/openwrt/
src/packages/routing/
src/packages/tunneldigger/
.project

View File

@ -20,7 +20,7 @@ Je nach dem, für welche Hardware die Firmware gebaut werden soll muss das BSP g
* `./buildscript`
## Was ist ein BSP?
Ein BSP beschreibt, was zu tun ist, damit ein Firmware Image für eine spezielle Hardware gebaut werden kann.
Ein BSP (Board-Support-Package) beschreibt, was zu tun ist, damit ein Firmware Image für eine spezielle Hardware gebaut werden kann.
Typischerweise ist eine folgene Ordner-Struktur vorhanden:
* .config
* root_file_system/

View File

@ -23,10 +23,6 @@ board_postbuild() {
cp $target/bin/ar71xx/openwrt-ar71xx-generic-tl-wdr4310-v1-squashfs-sysupgrade.bin ./bin/
}
board_flash() {
echo "nothing implemented"
}
board_clean() {
/bin/rm -rf $target bin/*$machine*
}

View File

@ -14,10 +14,6 @@ board_postbuild() {
cp $target/bin/mpc85xx/openwrt-mpc85xx-generic-tl-wdr4900-v1-squashfs-sysupgrade.bin ./bin/
}
board_flash() {
echo "nothing implemented"
}
board_clean() {
/bin/rm -rf $target bin/*$machine*
}

View File

@ -16,10 +16,6 @@ board_postbuild() {
cp $target/bin/ar71xx/openwrt-ar71xx-generic-tl-wr1043nd-v2-squashfs-sysupgrade.bin ./bin/
}
board_flash() {
echo "nothing implemented"
}
board_clean() {
/bin/rm -rf $target bin/*$machine*
}

View File

@ -13,10 +13,6 @@ board_postbuild() {
cp $target/bin/ar71xx/openwrt-ar71xx-generic-tl-wr740n-v4-squashfs-*.bin ./bin/
}
board_flash() {
echo "nothing implemented"
}
board_clean() {
/bin/rm -rf $target bin/*$machine*
}

View File

@ -14,10 +14,6 @@ board_postbuild() {
cp $target/bin/ar71xx/openwrt-ar71xx-generic-tl-wr741nd-v4-squashfs-*.bin ./bin/
}
board_flash() {
echo "nothing implemented"
}
board_clean() {
/bin/rm -rf $target bin/*$machine*
}

View File

@ -15,10 +15,6 @@ board_postbuild() {
cp $target/bin/ar71xx/openwrt-ar71xx-generic-tl-wr841n-v9-squashfs-*.bin ./bin/
}
board_flash() {
echo "nothing implemented"
}
board_clean() {
/bin/rm -rf $target bin/*$machine*
}

View File

@ -48,7 +48,6 @@ config reclassify
option mark "!Bulk"
option tcpflags "ACK"
# Don't change the stuff below unless you
# really know what it means :)
@ -56,7 +55,6 @@ config classgroup "Default"
option classes "Priority Express Normal Bulk"
option default "Normal"
config class "Priority"
option packetsize 400
option maxsize 400

View File

@ -9,4 +9,3 @@ config contact 'contact'
option name ''
option email ''
option telephone ''

View File

@ -4,4 +4,3 @@
#Enable zapp script if you are running a gateway
#*/1 * * * * /etc/init.d/zapp

View File

@ -1,3 +1,4 @@
#!/bin/sh
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or

View File

@ -0,0 +1,25 @@
#!/bin/sh
[ -f /etc/banner ] && cat /etc/banner
export PATH=/usr/bin:/usr/sbin:/bin:/sbin
export HOME=$(grep -e "^${USER:-root}:" /etc/passwd | cut -d ":" -f 6)
export HOME=${HOME:-/root}
[ -x /bin/more ] || alias more=less
[ -x /usr/bin/vim ] && alias vi=vim || alias vim=vi
[ -z "$KSH_VERSION" -o \! -s /etc/mkshrc ] || . /etc/mkshrc
[ -x /usr/bin/arp ] || arp() { cat /proc/net/arp; }
[ -x /usr/bin/ldd ] || ldd() { LD_TRACE_LOADED_OBJECTS=1 $*; }
# I'm lazy, let's add some aliases
alias ..='cd ..'
alias ...='cd ../..'
alias l='ls -CF'
alias la='ls -A'
alias ll='ls -alF'
alias ls='ls --color=auto'
# and color my prompt
export PS1='\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '

View File

@ -1,3 +1,4 @@
#!/bin/sh
# Put your custom commands here that should be executed once
# the system init finished. By default this file does nothing.

View File

@ -13,7 +13,7 @@
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#

View File

@ -69,5 +69,3 @@ net.ipv6.conf.all.dad_transmits = 3
# How many global unicast IPv6 addresses can be assigned to each interface?
net.ipv6.conf.default.max_addresses = 0
net.ipv6.conf.all.max_addresses = 0

View File

@ -171,4 +171,3 @@ fsm_transition() {
fsm_load
fsm_transition
fsm_save

View File

@ -1,4 +1,3 @@
WANDEV=eth1
SWITCHDEV=eth0
CLIENT_PORTS="0t 1 2"

View File

@ -1,4 +1,3 @@
WANDEV=eth0
SWITCHDEV=eth0
CLIENT_PORTS="0t 4 5"

View File

@ -1,4 +1,3 @@
WANDEV=eth0
SWITCHDEV=eth0
CLIENT_PORTS="0t 4 5"

View File

@ -1,4 +1,3 @@
WANDEV=eth0
SWITCHDEV=eth0
CLIENT_PORTS="3 4 5t"

View File

@ -1,4 +1,3 @@
WANDEV=eth0
SWITCHDEV=eth0
CLIENT_PORTS="1 2 6t"

View File

@ -1,4 +1,3 @@
WANDEV=eth1
# WANDEV=eth0
SWITCHDEV=eth0

View File

@ -1,4 +1,3 @@
WANDEV=eth1
# WANDEV=eth0
SWITCHDEV=eth0

View File

@ -1,4 +1,3 @@
WANDEV=eth1
# WANDEV=eth0
SWITCHDEV=eth0

View File

@ -32,7 +32,7 @@ index 0000000..57d8491
+Using this option wrongly will break your mesh network, use this option
+wisely and at your own risk!
+
+Signed-off-by: Linus Lüssing <linus.luessing@web.de>
+Signed-off-by: Linus L<EFBFBD>ssing <linus.luessing@web.de>
+---
+ hard-interface.c | 2 ++
+ send.c | 4 +++
@ -79,7 +79,7 @@ index 0000000..57d8491
+
++What: /sys/class/net/<iface>/batman-adv/no_rebroadcast
++Date: Sep 2013
++Contact: Linus Lüssing <linus.luessing@web.de>
++Contact: Linus L<EFBFBD>ssing <linus.luessing@web.de>
++Description:
++ With this option set incoming multicast payload frames on
++ <iface> are not being rebroadcasted on <iface> again. This
@ -192,4 +192,3 @@ index 0000000..57d8491
+
--
1.7.10.4

View File

@ -121,8 +121,7 @@ prebuild() {
board_prebuild
for template in $(find $target/files -name *.tpl)
do
for template in $(find $target/files -name *.tpl); do
echo "Translating $template .."
$tpl_translate $template > $(dirname $template)/$(basename $template .tpl)
/bin/rm $template
@ -201,26 +200,19 @@ config() {
;;
esac
fi
}
postbuild() {
board_postbuild
}
flash() {
# some flash tools need an arguement..
board_flash $1
}
clean() {
board_clean
/bin/rm -rf bin $builddir
}
buildall() {
for bsp in $(/bin/ls bsp/*.bsp)
do
for bsp in $(/bin/ls bsp/*.bsp); do
./buildscript selectcommunity $1
./buildscript selectbsp $bsp
./buildscript prepare
@ -228,18 +220,6 @@ buildall() {
done
}
routers() {
echo "router-types: "
echo " dir300"
echo " dir300b_adhoc"
echo " dir300b_ap"
echo " fonera"
echo " wrt54g_ap"
echo " wrt54g_adhoc"
echo " wr741nd"
echo " wr1043nd"
}
if [ "$1" != "selectbsp" -a "$1" != "selectcommunity" -a "$1" != "buildall" ]; then
if [ ! -h selected_bsp ]; then
echo "Please select a Board-Support-Package using:"
@ -264,7 +244,7 @@ case "$1" in
echo "Select a Board-Support-Package:"
echo
echo "Usage: $0 $1 bsp"
echo "bsp: "
echo "available packages:"
/bin/ls bsp/*.bsp
else
if [ ! -f $2 ]; then
@ -324,39 +304,10 @@ case "$1" in
;;
esac
;;
"download")
if [ "$2" = "help" ] || [ "$2" = "" ]; then
echo "This option downloads the ready configured images from an external location if needet."
echo "Usage: $0 $1 http://downloadfolder router-type"
echo "Common downloadfolder for firmware version 0.3 is http://dev.freifunk-ol.de/firmware/0.3/"
routers
echo
echo
echo "This function is broken!"
else
exit
mkdir ./bin
cd ./bin
wget "$2/$3/openwrt-$3-root.squashfs"
wget "$2/$3/openwrt-$3-vmlinux.lzma"
cd ..
fi
;;
"flash")
if [ "$2" = "help" ] || [ "$2" = "x" ]; then
echo "This option flashes the router."
echo "$0 $1 net-dev"
routers
echo "net-dev:"
echo " ethX"
else
flash "$2"
fi
;;
"clean")
if [ "$2" = "help" ] || [ "$2" = "x" ]; then
echo "This option cleans all build files."
echo "$0 $1 all"
echo "$0 $1"
else
clean
fi
@ -372,17 +323,16 @@ case "$1" in
fi
;;
*)
echo "This is the Build Environment Script of the Freifunk Community Oldenburg."
echo "This is the Build Environment Script of the Freifunk Community Franken."
echo "Usage: $0 command"
echo "command:"
echo " selectcommunity [communityfile]"
echo " selectbsp [bsp file]"
echo " prepare"
echo " config"
echo " build"
echo " buildall"
echo " flash"
echo " download"
echo " config <openwrt|kernel>"
echo " build [<fast|debug>]"
echo " buildall <community> [<fast>]"
echo " clean"
echo ""
echo "If you need help to one of these options just type $0 command help"
;;

View File

@ -1,9 +0,0 @@
BATMAN_CHANNEL=6
BATMAN_CHANNEL_5GHZ=36
ESSID_AP=oldenburg.freifunk.net
ESSID_MESH=batman.oldenburg.freifunk.net
BSSID_MESH=02:CA:FF:EE:BA:BE
NETMON_IP=fe80::201:2ff:fe03:405
VPN_PROJECT=ffol
NTPD_IP=fe80::201:2ff:fe03:405%br-mesh
UPGRADE_PATH=http://firmware.freifunk-ol.de/latest/upgrade/