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/openwrt/
src/packages/routing/ src/packages/routing/
src/packages/tunneldigger/ 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` * `./buildscript`
## Was ist ein BSP? ## 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: Typischerweise ist eine folgene Ordner-Struktur vorhanden:
* .config * .config
* root_file_system/ * 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/ cp $target/bin/ar71xx/openwrt-ar71xx-generic-tl-wdr4310-v1-squashfs-sysupgrade.bin ./bin/
} }
board_flash() {
echo "nothing implemented"
}
board_clean() { board_clean() {
/bin/rm -rf $target bin/*$machine* /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/ cp $target/bin/mpc85xx/openwrt-mpc85xx-generic-tl-wdr4900-v1-squashfs-sysupgrade.bin ./bin/
} }
board_flash() {
echo "nothing implemented"
}
board_clean() { board_clean() {
/bin/rm -rf $target bin/*$machine* /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/ cp $target/bin/ar71xx/openwrt-ar71xx-generic-tl-wr1043nd-v2-squashfs-sysupgrade.bin ./bin/
} }
board_flash() {
echo "nothing implemented"
}
board_clean() { board_clean() {
/bin/rm -rf $target bin/*$machine* /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/ cp $target/bin/ar71xx/openwrt-ar71xx-generic-tl-wr740n-v4-squashfs-*.bin ./bin/
} }
board_flash() {
echo "nothing implemented"
}
board_clean() { board_clean() {
/bin/rm -rf $target bin/*$machine* /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/ cp $target/bin/ar71xx/openwrt-ar71xx-generic-tl-wr741nd-v4-squashfs-*.bin ./bin/
} }
board_flash() {
echo "nothing implemented"
}
board_clean() { board_clean() {
/bin/rm -rf $target bin/*$machine* /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/ cp $target/bin/ar71xx/openwrt-ar71xx-generic-tl-wr841n-v9-squashfs-*.bin ./bin/
} }
board_flash() {
echo "nothing implemented"
}
board_clean() { board_clean() {
/bin/rm -rf $target bin/*$machine* /bin/rm -rf $target bin/*$machine*
} }

View File

@ -9,4 +9,4 @@ config 'mesh' 'bat0'
option 'log_level' option 'log_level'
option 'orig_interval' option 'orig_interval'
option 'vis_mode' option 'vis_mode'
option 'bridge_loop_avoidance' '0' option 'bridge_loop_avoidance' '0'

View File

@ -1 +1 @@
config model 'model' config model 'model'

View File

@ -21,4 +21,4 @@ config 'crawl'
option 'update_hash' '1' option 'update_hash' '1'
config 'netmon' config 'netmon'
option 'autoadd_ipv6_address' '1' option 'autoadd_ipv6_address' '1'

View File

@ -30,4 +30,4 @@ config dhcp lan
config dhcp wan config dhcp wan
option interface wan option interface wan
option ignore 1 option ignore 1

View File

@ -1,4 +1,4 @@
config dropbear config dropbear
option PasswordAuth 'on' option PasswordAuth 'on'
option Port '22' option Port '22'
# option BannerFile '/etc/banner' # option BannerFile '/etc/banner'

View File

@ -100,4 +100,4 @@ config include
# option src_dport 80 # option src_dport 80
# option dest_ip 194.25.2.129 # option dest_ip 194.25.2.129
# option dest_port 120 # option dest_port 120
# option proto tcp # option proto tcp

View File

@ -1,4 +1,4 @@
config upgrade 'upgrade' config upgrade 'upgrade'
option path '${UPGRADE_PATH}' option path '${UPGRADE_PATH}'
option auto 0 option auto 0
option remote 1 option remote 1

View File

@ -24,4 +24,4 @@ config interface 'ethmesh'
config interface 'bat' config interface 'bat'
option ifname 'bat0' option ifname 'bat0'
option mtu '1500' option mtu '1500'

View File

@ -5,4 +5,4 @@ config 'script'
option 'data_file' '/tmp/crawldata/node.data' option 'data_file' '/tmp/crawldata/node.data'
config 'network' config 'network'
option 'mesh_interface' 'br-mesh' option 'mesh_interface' 'br-mesh'

View File

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

View File

@ -8,5 +8,4 @@ config location 'location'
config contact 'contact' config contact 'contact'
option name '' option name ''
option email '' option email ''
option telephone '' option telephone ''

View File

@ -26,4 +26,4 @@ config 'led' 'led_vpn_blue'
option 'dev' '${VPN_PROJECT}VPN' option 'dev' '${VPN_PROJECT}VPN'
option 'mode' 'link' option 'mode' 'link'
# vim: noexpandtab # vim: noexpandtab

View File

@ -1,2 +1,2 @@
config timeserver config timeserver
option hostname time.fu-berlin.de option hostname time.fu-berlin.de

View File

@ -22,4 +22,4 @@ config wifi-iface
option ifname w2ap option ifname w2ap
option mode ap option mode ap
option ssid '${ESSID_AP}' option ssid '${ESSID_AP}'
option 'encryption' 'none' option 'encryption' 'none'

View File

@ -171,4 +171,4 @@ fi
if [ "$SCRIPT_SYNC_HOSTNAME" = "1" ]; then if [ "$SCRIPT_SYNC_HOSTNAME" = "1" ]; then
sync_hostname sync_hostname
fi fi

View File

@ -3,5 +3,4 @@
#15 01 * * * rdate -s time.fu-berlin.de > /dev/null #15 01 * * * rdate -s time.fu-berlin.de > /dev/null
#Enable zapp script if you are running a gateway #Enable zapp script if you are running a gateway
#*/1 * * * * /etc/init.d/zapp #*/1 * * * * /etc/init.d/zapp

View File

@ -51,4 +51,4 @@ print_definitions() {
} }
# program # program
print_definitions print_definitions

View File

@ -91,4 +91,4 @@ else
fi fi
exit 0 exit 0
# vim: noexpandtab # vim: noexpandtab

View File

@ -11,4 +11,4 @@ iptables -A INPUT -i $WAN -j REJECT
# Limit ssh to 3 new connections per 60 seconds # Limit ssh to 3 new connections per 60 seconds
/usr/sbin/ip6tables -A INPUT -p tcp --dport 22 -m state --state NEW -m recent --set --name dropbear /usr/sbin/ip6tables -A INPUT -p tcp --dport 22 -m state --state NEW -m recent --set --name dropbear
/usr/sbin/ip6tables -A INPUT -p tcp --dport 22 -m state --state NEW -m recent --update --seconds 60 --hitcount 3 --rttl --name dropbear -j DROP /usr/sbin/ip6tables -A INPUT -p tcp --dport 22 -m state --state NEW -m recent --update --seconds 60 --hitcount 3 --rttl --name dropbear -j DROP

View File

@ -1,3 +1,3 @@
#!/bin/sh #!/bin/sh
wget -T15 http://[`uci get configurator.@api[0].ipv6_address`%`uci get configurator.@api[0].ipv6_interface`]/api_nodewatcher.php?section=get_hostnames_and_mac -O - | grep -v -e "^..-..-" | sort -u > /tmp/bat-hosts wget -T15 http://[`uci get configurator.@api[0].ipv6_address`%`uci get configurator.@api[0].ipv6_interface`]/api_nodewatcher.php?section=get_hostnames_and_mac -O - | grep -v -e "^..-..-" | sort -u > /tmp/bat-hosts

View File

@ -1,3 +1,4 @@
#!/bin/sh
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or # the Free Software Foundation; either version 3 of the License, or
@ -99,4 +100,4 @@ if [[ -n "$ROUTERMAC" ]]; then
ifconfig br-mesh up ifconfig br-mesh up
/etc/init.d/network restart /etc/init.d/network restart
fi fi
fi fi

View File

@ -215,4 +215,4 @@ delete_log
err "`date`: Generate actual status data" err "`date`: Generate actual status data"
crawl crawl
exit 0 exit 0

View File

@ -1,3 +1,3 @@
root:$1$OmvoKpjK$e.lPVnBxsrAbNV4EoH3xb1:0:0:root:/root:/bin/ash root:$1$OmvoKpjK$e.lPVnBxsrAbNV4EoH3xb1:0:0:root:/root:/bin/ash
nobody:*:65534:65534:nobody:/var:/bin/false nobody:*:65534:65534:nobody:/var:/bin/false
daemon:*:65534:65534:daemon:/var:/bin/false daemon:*:65534:65534:daemon:/var:/bin/false

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 # Put your custom commands here that should be executed once
# the system init finished. By default this file does nothing. # the system init finished. By default this file does nothing.
@ -38,4 +39,4 @@ httpd -h /tmp/crawldata
touch /tmp/started touch /tmp/started
exit 0 exit 0

View File

@ -13,7 +13,7 @@
# This program is distributed in the hope that it will be useful, # This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # 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. # GNU General Public License for more details.
# #
@ -22,4 +22,4 @@ DEV=$1
SEDDEV=`brctl showstp $DEV | egrep '\([0-9]\)' | sed -e "s/(//;s/)//" | awk '{ print "s/^ "$2"/"$1"/;" }'` SEDDEV=`brctl showstp $DEV | egrep '\([0-9]\)' | sed -e "s/(//;s/)//" | awk '{ print "s/^ "$2"/"$1"/;" }'`
SEDMAC=`cat /etc/bat-hosts | sed -e "s/^/s\//;s/$/\/;/;s/ /\//"` SEDMAC=`cat /etc/bat-hosts | sed -e "s/^/s\//;s/$/\/;/;s/ /\//"`
brctl showmacs $DEV | sed -e "$SEDMAC" | sed -e "$SEDDEV" brctl showmacs $DEV | sed -e "$SEDMAC" | sed -e "$SEDDEV"

View File

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

View File

@ -1 +1 @@
/etc/shadow /etc/shadow

View File

@ -24,4 +24,4 @@ else
[Nn]|* ) echo -ne "\nAborting firmware upgrade.\n\n"; rm -f ${FILE}*; exit 0;; [Nn]|* ) echo -ne "\nAborting firmware upgrade.\n\n"; rm -f ${FILE}*; exit 0;;
esac esac
done done
fi fi

View File

@ -170,5 +170,4 @@ fsm_transition() {
# program # program
fsm_load fsm_load
fsm_transition fsm_transition
fsm_save fsm_save

View File

@ -27,4 +27,4 @@ config 'interface' 'ethmesh'
option proto 'batadv' option proto 'batadv'
option mesh 'bat0' option mesh 'bat0'
# vim: noexpandtab # vim: noexpandtab

View File

@ -52,4 +52,4 @@ config wifi-iface 'w5ap'
option ssid '${ESSID_AP}' option ssid '${ESSID_AP}'
option 'encryption' 'none' option 'encryption' 'none'
# vim: noexpandtab # vim: noexpandtab

View File

@ -1,4 +1,3 @@
WANDEV=eth1 WANDEV=eth1
SWITCHDEV=eth0 SWITCHDEV=eth0
CLIENT_PORTS="0t 1 2" CLIENT_PORTS="0t 1 2"
@ -7,4 +6,4 @@ BATMAN_PORTS="0t 3 4"
CLIENTIF="eth0.1 w2ap w5ap" CLIENTIF="eth0.1 w2ap w5ap"
ETHMESHMAC= ETHMESHMAC=
ROUTERMAC=w2mesh ROUTERMAC=w2mesh

View File

@ -1,4 +1,3 @@
WANDEV=eth0 WANDEV=eth0
SWITCHDEV=eth0 SWITCHDEV=eth0
CLIENT_PORTS="0t 4 5" CLIENT_PORTS="0t 4 5"
@ -7,4 +6,4 @@ BATMAN_PORTS="0t 2 3"
CLIENTIF="eth0.1 w2ap w5ap" CLIENTIF="eth0.1 w2ap w5ap"
ETHMESHMAC= ETHMESHMAC=
ROUTERMAC=w5mesh ROUTERMAC=w5mesh

View File

@ -27,4 +27,4 @@ config 'interface' 'ethmesh'
option proto 'batadv' option proto 'batadv'
option mesh 'bat0' option mesh 'bat0'
# vim: noexpandtab # vim: noexpandtab

View File

@ -52,4 +52,4 @@ config wifi-iface 'w2ap'
option ssid '${ESSID_AP}' option ssid '${ESSID_AP}'
option 'encryption' 'none' option 'encryption' 'none'
# vim: noexpandtab # vim: noexpandtab

View File

@ -1,4 +1,3 @@
WANDEV=eth0 WANDEV=eth0
SWITCHDEV=eth0 SWITCHDEV=eth0
CLIENT_PORTS="0t 4 5" CLIENT_PORTS="0t 4 5"
@ -7,4 +6,4 @@ BATMAN_PORTS="0t 2 3"
CLIENTIF="eth0.1 w2ap w5ap" CLIENTIF="eth0.1 w2ap w5ap"
ETHMESHMAC= ETHMESHMAC=
ROUTERMAC=w5mesh ROUTERMAC=w5mesh

View File

@ -1,4 +1,3 @@
WANDEV=eth0 WANDEV=eth0
SWITCHDEV=eth0 SWITCHDEV=eth0
CLIENT_PORTS="3 4 5t" CLIENT_PORTS="3 4 5t"
@ -7,4 +6,4 @@ BATMAN_PORTS="1 2 5t"
CLIENTIF="eth0.1 w2ap" CLIENTIF="eth0.1 w2ap"
ETHMESHMAC=w2ap ETHMESHMAC=w2ap
ROUTERMAC=eth0 ROUTERMAC=eth0

View File

@ -1,4 +1,3 @@
WANDEV=eth0 WANDEV=eth0
SWITCHDEV=eth0 SWITCHDEV=eth0
CLIENT_PORTS="1 2 6t" CLIENT_PORTS="1 2 6t"
@ -7,4 +6,4 @@ BATMAN_PORTS="3 4 6t"
CLIENTIF="eth0.1 w2ap" CLIENTIF="eth0.1 w2ap"
ETHMESHMAC= ETHMESHMAC=
ROUTERMAC=eth1 ROUTERMAC=eth1

View File

@ -1,4 +1,3 @@
WANDEV=eth1 WANDEV=eth1
# WANDEV=eth0 # WANDEV=eth0
SWITCHDEV=eth0 SWITCHDEV=eth0
@ -8,4 +7,4 @@ BATMAN_PORTS="2 3 0t"
CLIENTIF="eth0.1 w2ap" CLIENTIF="eth0.1 w2ap"
ETHMESHMAC=eth1 ETHMESHMAC=eth1
ROUTERMAC=w2mesh ROUTERMAC=w2mesh

View File

@ -1,4 +1,3 @@
WANDEV=eth1 WANDEV=eth1
# WANDEV=eth0 # WANDEV=eth0
SWITCHDEV=eth0 SWITCHDEV=eth0
@ -8,4 +7,4 @@ BATMAN_PORTS="3 4 0t"
CLIENTIF="eth0.1 w2ap" CLIENTIF="eth0.1 w2ap"
ETHMESHMAC=eth1 ETHMESHMAC=eth1
ROUTERMAC=w2mesh ROUTERMAC=w2mesh

View File

@ -1,4 +1,3 @@
WANDEV=eth1 WANDEV=eth1
# WANDEV=eth0 # WANDEV=eth0
SWITCHDEV=eth0 SWITCHDEV=eth0
@ -8,4 +7,4 @@ BATMAN_PORTS="2 3 0t"
CLIENTIF="eth0.1 w2ap" CLIENTIF="eth0.1 w2ap"
ETHMESHMAC=eth1 ETHMESHMAC=eth1
ROUTERMAC=w2mesh ROUTERMAC=w2mesh

View File

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

View File

@ -3,4 +3,4 @@ src-link routing PATH/routing
src-link tunneldigger PATH/tunneldigger src-link tunneldigger PATH/tunneldigger
src-link fastd PATH/fastd src-link fastd PATH/fastd
src-link libremap PATH/libremap src-link libremap PATH/libremap
src-link packagesol PATH/ffol src-link packagesol PATH/ffol

View File

@ -10,4 +10,4 @@ Index: package/base-files/files/sbin/sysupgrade
+ /etc/sysupgrade.conf 2>/dev/null) \ + /etc/sysupgrade.conf 2>/dev/null) \
-type f 2>/dev/null; -type f 2>/dev/null;
opkg list-changed-conffiles ) | sort -u > "$file" opkg list-changed-conffiles ) | sort -u > "$file"
return 0 return 0

View File

@ -121,8 +121,7 @@ prebuild() {
board_prebuild board_prebuild
for template in $(find $target/files -name *.tpl) for template in $(find $target/files -name *.tpl); do
do
echo "Translating $template .." echo "Translating $template .."
$tpl_translate $template > $(dirname $template)/$(basename $template .tpl) $tpl_translate $template > $(dirname $template)/$(basename $template .tpl)
/bin/rm $template /bin/rm $template
@ -201,26 +200,19 @@ config() {
;; ;;
esac esac
fi fi
} }
postbuild() { postbuild() {
board_postbuild board_postbuild
} }
flash() {
# some flash tools need an arguement..
board_flash $1
}
clean() { clean() {
board_clean board_clean
/bin/rm -rf bin $builddir /bin/rm -rf bin $builddir
} }
buildall() { buildall() {
for bsp in $(/bin/ls bsp/*.bsp) for bsp in $(/bin/ls bsp/*.bsp); do
do
./buildscript selectcommunity $1 ./buildscript selectcommunity $1
./buildscript selectbsp $bsp ./buildscript selectbsp $bsp
./buildscript prepare ./buildscript prepare
@ -228,18 +220,6 @@ buildall() {
done 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 [ "$1" != "selectbsp" -a "$1" != "selectcommunity" -a "$1" != "buildall" ]; then
if [ ! -h selected_bsp ]; then if [ ! -h selected_bsp ]; then
echo "Please select a Board-Support-Package using:" echo "Please select a Board-Support-Package using:"
@ -264,7 +244,7 @@ case "$1" in
echo "Select a Board-Support-Package:" echo "Select a Board-Support-Package:"
echo echo
echo "Usage: $0 $1 bsp" echo "Usage: $0 $1 bsp"
echo "bsp: " echo "available packages:"
/bin/ls bsp/*.bsp /bin/ls bsp/*.bsp
else else
if [ ! -f $2 ]; then if [ ! -f $2 ]; then
@ -324,39 +304,10 @@ case "$1" in
;; ;;
esac 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") "clean")
if [ "$2" = "help" ] || [ "$2" = "x" ]; then if [ "$2" = "help" ] || [ "$2" = "x" ]; then
echo "This option cleans all build files." echo "This option cleans all build files."
echo "$0 $1 all" echo "$0 $1"
else else
clean clean
fi fi
@ -372,17 +323,16 @@ case "$1" in
fi 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 "Usage: $0 command"
echo "command:" echo "command:"
echo " selectcommunity [communityfile]" echo " selectcommunity [communityfile]"
echo " selectbsp [bsp file]" echo " selectbsp [bsp file]"
echo " prepare" echo " prepare"
echo " config" echo " config <openwrt|kernel>"
echo " build" echo " build [<fast|debug>]"
echo " buildall" echo " buildall <community> [<fast>]"
echo " flash" echo " clean"
echo " download"
echo "" echo ""
echo "If you need help to one of these options just type $0 command help" echo "If you need help to one of these options just type $0 command help"
;; ;;

View File

@ -6,4 +6,4 @@ BSSID_MESH=02:CA:FF:EE:BA:BE
NETMON_IP=fe80::ff:feee:1 NETMON_IP=fe80::ff:feee:1
VPN_PROJECT=fff VPN_PROJECT=fff
NTPD_IP=fe80::ff:feee:1%br-mesh NTPD_IP=fe80::ff:feee:1%br-mesh
UPGRADE_PATH=http://[fe80::ff:feee:1%br-mesh]/dev/firmware/current/ UPGRADE_PATH=http://[fe80::ff:feee:1%br-mesh]/dev/firmware/current/

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/

View File

@ -48,4 +48,4 @@ define Package/libwlocate/install
$(CP) $(PKG_BUILD_DIR)/libwlocate.so $(1)/usr/lib/ $(CP) $(PKG_BUILD_DIR)/libwlocate.so $(1)/usr/lib/
endef endef
$(eval $(call BuildPackage,libwlocate)) $(eval $(call BuildPackage,libwlocate))