From 0e1812ef5ba808f789c24b3cad89619f3d902749 Mon Sep 17 00:00:00 2001 From: Oliver Voelker Date: Tue, 11 Nov 2014 21:29:00 +0100 Subject: [PATCH 1/9] added .project to .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index ccf47b46..1e76952c 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ src/packages/libremap/ src/packages/openwrt/ src/packages/routing/ src/packages/tunneldigger/ +.project \ No newline at end of file From 578810df2f96b055c630b9da54d579fe59ccb120 Mon Sep 17 00:00:00 2001 From: Oliver Voelker Date: Tue, 11 Nov 2014 21:29:41 +0100 Subject: [PATCH 2/9] removed unused/broken functions --- buildscript | 50 +++----------------------------------------------- 1 file changed, 3 insertions(+), 47 deletions(-) diff --git a/buildscript b/buildscript index 0582007a..2fa8d4df 100755 --- a/buildscript +++ b/buildscript @@ -209,7 +209,7 @@ postbuild() { } flash() { - # some flash tools need an arguement.. + # some flash tools need an argument.. board_flash $1 } @@ -219,8 +219,7 @@ clean() { } 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 +227,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:" @@ -324,35 +311,6 @@ 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." @@ -372,7 +330,7 @@ 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]" @@ -381,8 +339,6 @@ case "$1" in echo " config" echo " build" echo " buildall" - echo " flash" - echo " download" echo "" echo "If you need help to one of these options just type $0 command help" ;; From ef097b8e3cb54cf9deaa3d627d501d7d27503d60 Mon Sep 17 00:00:00 2001 From: Oliver Voelker Date: Tue, 11 Nov 2014 21:30:06 +0100 Subject: [PATCH 3/9] was ist ein BSP Board-Support-Package --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c3f3411c..c56d6659 100644 --- a/README.md +++ b/README.md @@ -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/ From 1b075acd6ec16dc0743b85089500705ac327f44d Mon Sep 17 00:00:00 2001 From: Oliver Voelker Date: Tue, 11 Nov 2014 23:52:36 +0100 Subject: [PATCH 4/9] add own shell profile this is for a nicer prompt and conveniant aliases --- bsp/default/root_file_system/etc/profile | 25 ++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 bsp/default/root_file_system/etc/profile diff --git a/bsp/default/root_file_system/etc/profile b/bsp/default/root_file_system/etc/profile new file mode 100644 index 00000000..4bfa5c50 --- /dev/null +++ b/bsp/default/root_file_system/etc/profile @@ -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\]\$ ' \ No newline at end of file From 29e733a2c8bd51c38019c6445cc3857ee08fce3d Mon Sep 17 00:00:00 2001 From: Oliver Voelker Date: Tue, 11 Nov 2014 23:53:35 +0100 Subject: [PATCH 5/9] cosmetic changes --- bsp/default/root_file_system/etc/config/firmware.tpl | 2 +- buildscript | 11 ++--------- community/franken.cfg | 2 +- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/bsp/default/root_file_system/etc/config/firmware.tpl b/bsp/default/root_file_system/etc/config/firmware.tpl index 49c61bdc..1c2e7d6f 100644 --- a/bsp/default/root_file_system/etc/config/firmware.tpl +++ b/bsp/default/root_file_system/etc/config/firmware.tpl @@ -1,4 +1,4 @@ config upgrade 'upgrade' option path '${UPGRADE_PATH}' option auto 0 - option remote 1 + option remote 1 \ No newline at end of file diff --git a/buildscript b/buildscript index 2fa8d4df..94d1884c 100755 --- a/buildscript +++ b/buildscript @@ -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,18 +200,12 @@ config() { ;; esac fi - } postbuild() { board_postbuild } -flash() { - # some flash tools need an argument.. - board_flash $1 -} - clean() { board_clean /bin/rm -rf bin $builddir @@ -343,4 +336,4 @@ case "$1" in echo "If you need help to one of these options just type $0 command help" ;; esac -# vim: noexpandtab +# vim: noexpandtab \ No newline at end of file diff --git a/community/franken.cfg b/community/franken.cfg index 55cd2dab..8f653078 100644 --- a/community/franken.cfg +++ b/community/franken.cfg @@ -6,4 +6,4 @@ BSSID_MESH=02:CA:FF:EE:BA:BE NETMON_IP=fe80::ff:feee:1 VPN_PROJECT=fff 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/ \ No newline at end of file From 329b24af321da9fd8cd6f07410f99de795bf5dc2 Mon Sep 17 00:00:00 2001 From: Oliver Voelker Date: Wed, 12 Nov 2014 00:25:41 +0100 Subject: [PATCH 6/9] board_flash removed unused --- bsp/board_wdr4300.bsp | 4 ---- bsp/board_wdr4900.bsp | 4 ---- bsp/board_wr1043nd.bsp | 4 ---- bsp/board_wr740n.bsp | 4 ---- bsp/board_wr741.bsp | 4 ---- bsp/board_wr841.bsp | 4 ---- 6 files changed, 24 deletions(-) diff --git a/bsp/board_wdr4300.bsp b/bsp/board_wdr4300.bsp index 60b86481..065232f2 100644 --- a/bsp/board_wdr4300.bsp +++ b/bsp/board_wdr4300.bsp @@ -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* } diff --git a/bsp/board_wdr4900.bsp b/bsp/board_wdr4900.bsp index 8cbdb0b6..598538cb 100644 --- a/bsp/board_wdr4900.bsp +++ b/bsp/board_wdr4900.bsp @@ -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* } diff --git a/bsp/board_wr1043nd.bsp b/bsp/board_wr1043nd.bsp index 2051df43..98d54cc1 100644 --- a/bsp/board_wr1043nd.bsp +++ b/bsp/board_wr1043nd.bsp @@ -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* } diff --git a/bsp/board_wr740n.bsp b/bsp/board_wr740n.bsp index c6efb74d..123040b4 100644 --- a/bsp/board_wr740n.bsp +++ b/bsp/board_wr740n.bsp @@ -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* } diff --git a/bsp/board_wr741.bsp b/bsp/board_wr741.bsp index 00ccb3f8..6b5150c2 100644 --- a/bsp/board_wr741.bsp +++ b/bsp/board_wr741.bsp @@ -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* } diff --git a/bsp/board_wr841.bsp b/bsp/board_wr841.bsp index 1505390b..8de29e3e 100644 --- a/bsp/board_wr841.bsp +++ b/bsp/board_wr841.bsp @@ -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* } From 5d907840f702a3169c8e6e6058d9844ae14e05aa Mon Sep 17 00:00:00 2001 From: Oliver Voelker Date: Wed, 12 Nov 2014 21:22:55 +0100 Subject: [PATCH 7/9] =?UTF-8?q?leerzeilen=20entfernt,=20fehlende=20shebang?= =?UTF-8?q?s=20hinzugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bsp/board_wdr4300.bsp | 2 +- bsp/board_wdr4900.bsp | 2 +- bsp/board_wr1043nd.bsp | 2 +- bsp/board_wr740n.bsp | 2 +- bsp/board_wr741.bsp | 2 +- bsp/board_wr841.bsp | 2 +- bsp/default/root_file_system/etc/config/batman-adv | 2 +- bsp/default/root_file_system/etc/config/board | 2 +- bsp/default/root_file_system/etc/config/configurator.tpl | 2 +- bsp/default/root_file_system/etc/config/dhcp | 2 +- bsp/default/root_file_system/etc/config/dropbear | 2 +- bsp/default/root_file_system/etc/config/firewall | 2 +- bsp/default/root_file_system/etc/config/network | 2 +- bsp/default/root_file_system/etc/config/nodewatcher | 2 +- bsp/default/root_file_system/etc/config/qos | 4 +--- bsp/default/root_file_system/etc/config/site | 3 +-- bsp/default/root_file_system/etc/config/system.tpl | 2 +- bsp/default/root_file_system/etc/config/timeserver | 2 +- bsp/default/root_file_system/etc/config/wireless.tpl | 2 +- bsp/default/root_file_system/etc/configurator.sh | 2 +- bsp/default/root_file_system/etc/crontabs/root | 3 +-- bsp/default/root_file_system/etc/environment.sh | 2 +- bsp/default/root_file_system/etc/fastdstart.sh.tpl | 2 +- bsp/default/root_file_system/etc/firewall.user | 2 +- bsp/default/root_file_system/etc/hostsupdate.sh | 2 +- bsp/default/root_file_system/etc/network.sh | 3 ++- bsp/default/root_file_system/etc/nodewatcher.sh | 2 +- bsp/default/root_file_system/etc/passwd | 2 +- bsp/default/root_file_system/etc/rc.local.tpl | 3 ++- bsp/default/root_file_system/etc/showmacs.sh | 4 ++-- bsp/default/root_file_system/etc/sysctl.conf | 4 +--- bsp/default/root_file_system/etc/sysupgrade.conf | 2 +- bsp/default/root_file_system/etc/sysupgrade.sh | 2 +- bsp/default/root_file_system/etc/wlanwatchdog.sh | 3 +-- bsp/wdr4300/root_file_system/etc/config/network | 2 +- bsp/wdr4300/root_file_system/etc/config/wireless.tpl | 2 +- bsp/wdr4300/root_file_system/etc/network.tl-wdr3500 | 3 +-- bsp/wdr4300/root_file_system/etc/network.tl-wdr4300 | 3 +-- bsp/wdr4900/root_file_system/etc/config/network | 2 +- bsp/wdr4900/root_file_system/etc/config/wireless.tpl | 2 +- bsp/wdr4900/root_file_system/etc/network.tl-wdr4900-v1 | 3 +-- bsp/wr1043nd/root_file_system/etc/network.tl-wr1043nd-v1 | 3 +-- bsp/wr1043nd/root_file_system/etc/network.tl-wr1043nd-v2 | 3 +-- bsp/wr740n/root_file_system/etc/network.tl-wr740n-v4 | 3 +-- bsp/wr741/root_file_system/etc/network.tl-wr741nd-v2 | 3 +-- bsp/wr741/root_file_system/etc/network.tl-wr741nd-v4 | 3 +-- .../0001-batman-adv-no-rebroadcast-option.patch | 5 ++--- build_patches/feeds.conf | 2 +- build_patches/sysupgrade_no_config_save.patch | 2 +- community/oldenburg.cfg | 9 --------- src/packages/ffol/libwlocate/Makefile | 2 +- 51 files changed, 54 insertions(+), 77 deletions(-) delete mode 100644 community/oldenburg.cfg diff --git a/bsp/board_wdr4300.bsp b/bsp/board_wdr4300.bsp index 065232f2..7e6c66e2 100644 --- a/bsp/board_wdr4300.bsp +++ b/bsp/board_wdr4300.bsp @@ -25,4 +25,4 @@ board_postbuild() { board_clean() { /bin/rm -rf $target bin/*$machine* -} +} \ No newline at end of file diff --git a/bsp/board_wdr4900.bsp b/bsp/board_wdr4900.bsp index 598538cb..777b3b58 100644 --- a/bsp/board_wdr4900.bsp +++ b/bsp/board_wdr4900.bsp @@ -16,4 +16,4 @@ board_postbuild() { board_clean() { /bin/rm -rf $target bin/*$machine* -} +} \ No newline at end of file diff --git a/bsp/board_wr1043nd.bsp b/bsp/board_wr1043nd.bsp index 98d54cc1..67532fd6 100644 --- a/bsp/board_wr1043nd.bsp +++ b/bsp/board_wr1043nd.bsp @@ -18,4 +18,4 @@ board_postbuild() { board_clean() { /bin/rm -rf $target bin/*$machine* -} +} \ No newline at end of file diff --git a/bsp/board_wr740n.bsp b/bsp/board_wr740n.bsp index 123040b4..e7b0c7a4 100644 --- a/bsp/board_wr740n.bsp +++ b/bsp/board_wr740n.bsp @@ -15,4 +15,4 @@ board_postbuild() { board_clean() { /bin/rm -rf $target bin/*$machine* -} +} \ No newline at end of file diff --git a/bsp/board_wr741.bsp b/bsp/board_wr741.bsp index 6b5150c2..3ce72be3 100644 --- a/bsp/board_wr741.bsp +++ b/bsp/board_wr741.bsp @@ -16,4 +16,4 @@ board_postbuild() { board_clean() { /bin/rm -rf $target bin/*$machine* -} +} \ No newline at end of file diff --git a/bsp/board_wr841.bsp b/bsp/board_wr841.bsp index 8de29e3e..fd71e154 100644 --- a/bsp/board_wr841.bsp +++ b/bsp/board_wr841.bsp @@ -17,4 +17,4 @@ board_postbuild() { board_clean() { /bin/rm -rf $target bin/*$machine* -} +} \ No newline at end of file diff --git a/bsp/default/root_file_system/etc/config/batman-adv b/bsp/default/root_file_system/etc/config/batman-adv index d6b64541..6af23c4e 100644 --- a/bsp/default/root_file_system/etc/config/batman-adv +++ b/bsp/default/root_file_system/etc/config/batman-adv @@ -9,4 +9,4 @@ config 'mesh' 'bat0' option 'log_level' option 'orig_interval' option 'vis_mode' - option 'bridge_loop_avoidance' '0' + option 'bridge_loop_avoidance' '0' \ No newline at end of file diff --git a/bsp/default/root_file_system/etc/config/board b/bsp/default/root_file_system/etc/config/board index 26bd3213..23decabc 100644 --- a/bsp/default/root_file_system/etc/config/board +++ b/bsp/default/root_file_system/etc/config/board @@ -1 +1 @@ -config model 'model' +config model 'model' \ No newline at end of file diff --git a/bsp/default/root_file_system/etc/config/configurator.tpl b/bsp/default/root_file_system/etc/config/configurator.tpl index 28acbf23..af3d49ad 100644 --- a/bsp/default/root_file_system/etc/config/configurator.tpl +++ b/bsp/default/root_file_system/etc/config/configurator.tpl @@ -21,4 +21,4 @@ config 'crawl' option 'update_hash' '1' config 'netmon' - option 'autoadd_ipv6_address' '1' + option 'autoadd_ipv6_address' '1' \ No newline at end of file diff --git a/bsp/default/root_file_system/etc/config/dhcp b/bsp/default/root_file_system/etc/config/dhcp index 0905e2dd..0ca9a624 100644 --- a/bsp/default/root_file_system/etc/config/dhcp +++ b/bsp/default/root_file_system/etc/config/dhcp @@ -30,4 +30,4 @@ config dhcp lan config dhcp wan option interface wan - option ignore 1 + option ignore 1 \ No newline at end of file diff --git a/bsp/default/root_file_system/etc/config/dropbear b/bsp/default/root_file_system/etc/config/dropbear index 279a45a9..4d7c0297 100644 --- a/bsp/default/root_file_system/etc/config/dropbear +++ b/bsp/default/root_file_system/etc/config/dropbear @@ -1,4 +1,4 @@ config dropbear option PasswordAuth 'on' option Port '22' -# option BannerFile '/etc/banner' +# option BannerFile '/etc/banner' \ No newline at end of file diff --git a/bsp/default/root_file_system/etc/config/firewall b/bsp/default/root_file_system/etc/config/firewall index 7ad43866..ed57672d 100644 --- a/bsp/default/root_file_system/etc/config/firewall +++ b/bsp/default/root_file_system/etc/config/firewall @@ -100,4 +100,4 @@ config include # option src_dport 80 # option dest_ip 194.25.2.129 # option dest_port 120 -# option proto tcp +# option proto tcp \ No newline at end of file diff --git a/bsp/default/root_file_system/etc/config/network b/bsp/default/root_file_system/etc/config/network index 874ae059..b6583857 100644 --- a/bsp/default/root_file_system/etc/config/network +++ b/bsp/default/root_file_system/etc/config/network @@ -24,4 +24,4 @@ config interface 'ethmesh' config interface 'bat' option ifname 'bat0' - option mtu '1500' + option mtu '1500' \ No newline at end of file diff --git a/bsp/default/root_file_system/etc/config/nodewatcher b/bsp/default/root_file_system/etc/config/nodewatcher index dfee7dcb..9cc8f9d1 100644 --- a/bsp/default/root_file_system/etc/config/nodewatcher +++ b/bsp/default/root_file_system/etc/config/nodewatcher @@ -5,4 +5,4 @@ config 'script' option 'data_file' '/tmp/crawldata/node.data' config 'network' - option 'mesh_interface' 'br-mesh' + option 'mesh_interface' 'br-mesh' \ No newline at end of file diff --git a/bsp/default/root_file_system/etc/config/qos b/bsp/default/root_file_system/etc/config/qos index 875e7e20..f9b4128b 100644 --- a/bsp/default/root_file_system/etc/config/qos +++ b/bsp/default/root_file_system/etc/config/qos @@ -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 @@ -83,4 +81,4 @@ config class "Normal_down" config class "Bulk" option avgrate 1 - option packetdelay 200 + option packetdelay 200 \ No newline at end of file diff --git a/bsp/default/root_file_system/etc/config/site b/bsp/default/root_file_system/etc/config/site index 89bb835d..3aaeda8f 100644 --- a/bsp/default/root_file_system/etc/config/site +++ b/bsp/default/root_file_system/etc/config/site @@ -8,5 +8,4 @@ config location 'location' config contact 'contact' option name '' option email '' - option telephone '' - + option telephone '' \ No newline at end of file diff --git a/bsp/default/root_file_system/etc/config/system.tpl b/bsp/default/root_file_system/etc/config/system.tpl index 425d488f..47e1a749 100644 --- a/bsp/default/root_file_system/etc/config/system.tpl +++ b/bsp/default/root_file_system/etc/config/system.tpl @@ -26,4 +26,4 @@ config 'led' 'led_vpn_blue' option 'dev' '${VPN_PROJECT}VPN' option 'mode' 'link' -# vim: noexpandtab +# vim: noexpandtab \ No newline at end of file diff --git a/bsp/default/root_file_system/etc/config/timeserver b/bsp/default/root_file_system/etc/config/timeserver index 8a5d476e..e95331f0 100644 --- a/bsp/default/root_file_system/etc/config/timeserver +++ b/bsp/default/root_file_system/etc/config/timeserver @@ -1,2 +1,2 @@ config timeserver - option hostname time.fu-berlin.de + option hostname time.fu-berlin.de \ No newline at end of file diff --git a/bsp/default/root_file_system/etc/config/wireless.tpl b/bsp/default/root_file_system/etc/config/wireless.tpl index 25596a57..a68763e1 100644 --- a/bsp/default/root_file_system/etc/config/wireless.tpl +++ b/bsp/default/root_file_system/etc/config/wireless.tpl @@ -22,4 +22,4 @@ config wifi-iface option ifname w2ap option mode ap option ssid '${ESSID_AP}' - option 'encryption' 'none' + option 'encryption' 'none' \ No newline at end of file diff --git a/bsp/default/root_file_system/etc/configurator.sh b/bsp/default/root_file_system/etc/configurator.sh index 9f51b3d1..eb434c89 100644 --- a/bsp/default/root_file_system/etc/configurator.sh +++ b/bsp/default/root_file_system/etc/configurator.sh @@ -171,4 +171,4 @@ fi if [ "$SCRIPT_SYNC_HOSTNAME" = "1" ]; then sync_hostname -fi +fi \ No newline at end of file diff --git a/bsp/default/root_file_system/etc/crontabs/root b/bsp/default/root_file_system/etc/crontabs/root index b7cbc697..8684299e 100644 --- a/bsp/default/root_file_system/etc/crontabs/root +++ b/bsp/default/root_file_system/etc/crontabs/root @@ -3,5 +3,4 @@ #15 01 * * * rdate -s time.fu-berlin.de > /dev/null #Enable zapp script if you are running a gateway -#*/1 * * * * /etc/init.d/zapp - +#*/1 * * * * /etc/init.d/zapp \ No newline at end of file diff --git a/bsp/default/root_file_system/etc/environment.sh b/bsp/default/root_file_system/etc/environment.sh index 5566dcd0..716c8275 100755 --- a/bsp/default/root_file_system/etc/environment.sh +++ b/bsp/default/root_file_system/etc/environment.sh @@ -51,4 +51,4 @@ print_definitions() { } # program -print_definitions +print_definitions \ No newline at end of file diff --git a/bsp/default/root_file_system/etc/fastdstart.sh.tpl b/bsp/default/root_file_system/etc/fastdstart.sh.tpl index b9c7d365..7b8ec795 100755 --- a/bsp/default/root_file_system/etc/fastdstart.sh.tpl +++ b/bsp/default/root_file_system/etc/fastdstart.sh.tpl @@ -91,4 +91,4 @@ else fi exit 0 -# vim: noexpandtab +# vim: noexpandtab \ No newline at end of file diff --git a/bsp/default/root_file_system/etc/firewall.user b/bsp/default/root_file_system/etc/firewall.user index fc2ba265..c2eddfc0 100755 --- a/bsp/default/root_file_system/etc/firewall.user +++ b/bsp/default/root_file_system/etc/firewall.user @@ -11,4 +11,4 @@ iptables -A INPUT -i $WAN -j REJECT # 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 --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 \ No newline at end of file diff --git a/bsp/default/root_file_system/etc/hostsupdate.sh b/bsp/default/root_file_system/etc/hostsupdate.sh index 8a1955f8..48d2e3bf 100644 --- a/bsp/default/root_file_system/etc/hostsupdate.sh +++ b/bsp/default/root_file_system/etc/hostsupdate.sh @@ -1,3 +1,3 @@ #!/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 \ No newline at end of file diff --git a/bsp/default/root_file_system/etc/network.sh b/bsp/default/root_file_system/etc/network.sh index 939990fb..63d3815c 100644 --- a/bsp/default/root_file_system/etc/network.sh +++ b/bsp/default/root_file_system/etc/network.sh @@ -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 @@ -99,4 +100,4 @@ if [[ -n "$ROUTERMAC" ]]; then ifconfig br-mesh up /etc/init.d/network restart fi -fi +fi \ No newline at end of file diff --git a/bsp/default/root_file_system/etc/nodewatcher.sh b/bsp/default/root_file_system/etc/nodewatcher.sh index 9d1a2ce1..930776c4 100755 --- a/bsp/default/root_file_system/etc/nodewatcher.sh +++ b/bsp/default/root_file_system/etc/nodewatcher.sh @@ -215,4 +215,4 @@ delete_log err "`date`: Generate actual status data" crawl -exit 0 +exit 0 \ No newline at end of file diff --git a/bsp/default/root_file_system/etc/passwd b/bsp/default/root_file_system/etc/passwd index 6b3e1fdc..3a7ff4ac 100644 --- a/bsp/default/root_file_system/etc/passwd +++ b/bsp/default/root_file_system/etc/passwd @@ -1,3 +1,3 @@ root:$1$OmvoKpjK$e.lPVnBxsrAbNV4EoH3xb1:0:0:root:/root:/bin/ash nobody:*:65534:65534:nobody:/var:/bin/false -daemon:*:65534:65534:daemon:/var:/bin/false +daemon:*:65534:65534:daemon:/var:/bin/false \ No newline at end of file diff --git a/bsp/default/root_file_system/etc/rc.local.tpl b/bsp/default/root_file_system/etc/rc.local.tpl index c88aba17..2edc04c4 100755 --- a/bsp/default/root_file_system/etc/rc.local.tpl +++ b/bsp/default/root_file_system/etc/rc.local.tpl @@ -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. @@ -38,4 +39,4 @@ httpd -h /tmp/crawldata touch /tmp/started -exit 0 +exit 0 \ No newline at end of file diff --git a/bsp/default/root_file_system/etc/showmacs.sh b/bsp/default/root_file_system/etc/showmacs.sh index 81a5c63a..92634206 100755 --- a/bsp/default/root_file_system/etc/showmacs.sh +++ b/bsp/default/root_file_system/etc/showmacs.sh @@ -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. # @@ -22,4 +22,4 @@ DEV=$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/ /\//"` -brctl showmacs $DEV | sed -e "$SEDMAC" | sed -e "$SEDDEV" +brctl showmacs $DEV | sed -e "$SEDMAC" | sed -e "$SEDDEV" \ No newline at end of file diff --git a/bsp/default/root_file_system/etc/sysctl.conf b/bsp/default/root_file_system/etc/sysctl.conf index e9b92c23..f6d85a76 100644 --- a/bsp/default/root_file_system/etc/sysctl.conf +++ b/bsp/default/root_file_system/etc/sysctl.conf @@ -68,6 +68,4 @@ 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 - - +net.ipv6.conf.all.max_addresses = 0 \ No newline at end of file diff --git a/bsp/default/root_file_system/etc/sysupgrade.conf b/bsp/default/root_file_system/etc/sysupgrade.conf index 25b11090..e5e29bb3 100644 --- a/bsp/default/root_file_system/etc/sysupgrade.conf +++ b/bsp/default/root_file_system/etc/sysupgrade.conf @@ -1 +1 @@ -/etc/shadow +/etc/shadow \ No newline at end of file diff --git a/bsp/default/root_file_system/etc/sysupgrade.sh b/bsp/default/root_file_system/etc/sysupgrade.sh index 2e85b397..86993b17 100755 --- a/bsp/default/root_file_system/etc/sysupgrade.sh +++ b/bsp/default/root_file_system/etc/sysupgrade.sh @@ -24,4 +24,4 @@ else [Nn]|* ) echo -ne "\nAborting firmware upgrade.\n\n"; rm -f ${FILE}*; exit 0;; esac done -fi +fi \ No newline at end of file diff --git a/bsp/default/root_file_system/etc/wlanwatchdog.sh b/bsp/default/root_file_system/etc/wlanwatchdog.sh index d1737f3a..ad002165 100755 --- a/bsp/default/root_file_system/etc/wlanwatchdog.sh +++ b/bsp/default/root_file_system/etc/wlanwatchdog.sh @@ -170,5 +170,4 @@ fsm_transition() { # program fsm_load fsm_transition -fsm_save - +fsm_save \ No newline at end of file diff --git a/bsp/wdr4300/root_file_system/etc/config/network b/bsp/wdr4300/root_file_system/etc/config/network index b2ec5d96..9301678d 100644 --- a/bsp/wdr4300/root_file_system/etc/config/network +++ b/bsp/wdr4300/root_file_system/etc/config/network @@ -27,4 +27,4 @@ config 'interface' 'ethmesh' option proto 'batadv' option mesh 'bat0' -# vim: noexpandtab +# vim: noexpandtab \ No newline at end of file diff --git a/bsp/wdr4300/root_file_system/etc/config/wireless.tpl b/bsp/wdr4300/root_file_system/etc/config/wireless.tpl index 4a92240e..7b511831 100644 --- a/bsp/wdr4300/root_file_system/etc/config/wireless.tpl +++ b/bsp/wdr4300/root_file_system/etc/config/wireless.tpl @@ -52,4 +52,4 @@ config wifi-iface 'w5ap' option ssid '${ESSID_AP}' option 'encryption' 'none' -# vim: noexpandtab +# vim: noexpandtab \ No newline at end of file diff --git a/bsp/wdr4300/root_file_system/etc/network.tl-wdr3500 b/bsp/wdr4300/root_file_system/etc/network.tl-wdr3500 index 60445933..480fddb3 100644 --- a/bsp/wdr4300/root_file_system/etc/network.tl-wdr3500 +++ b/bsp/wdr4300/root_file_system/etc/network.tl-wdr3500 @@ -1,4 +1,3 @@ - WANDEV=eth1 SWITCHDEV=eth0 CLIENT_PORTS="0t 1 2" @@ -7,4 +6,4 @@ BATMAN_PORTS="0t 3 4" CLIENTIF="eth0.1 w2ap w5ap" ETHMESHMAC= -ROUTERMAC=w2mesh +ROUTERMAC=w2mesh \ No newline at end of file diff --git a/bsp/wdr4300/root_file_system/etc/network.tl-wdr4300 b/bsp/wdr4300/root_file_system/etc/network.tl-wdr4300 index fd7617b7..fcac1236 100644 --- a/bsp/wdr4300/root_file_system/etc/network.tl-wdr4300 +++ b/bsp/wdr4300/root_file_system/etc/network.tl-wdr4300 @@ -1,4 +1,3 @@ - WANDEV=eth0 SWITCHDEV=eth0 CLIENT_PORTS="0t 4 5" @@ -7,4 +6,4 @@ BATMAN_PORTS="0t 2 3" CLIENTIF="eth0.1 w2ap w5ap" ETHMESHMAC= -ROUTERMAC=w5mesh +ROUTERMAC=w5mesh \ No newline at end of file diff --git a/bsp/wdr4900/root_file_system/etc/config/network b/bsp/wdr4900/root_file_system/etc/config/network index b2ec5d96..9301678d 100644 --- a/bsp/wdr4900/root_file_system/etc/config/network +++ b/bsp/wdr4900/root_file_system/etc/config/network @@ -27,4 +27,4 @@ config 'interface' 'ethmesh' option proto 'batadv' option mesh 'bat0' -# vim: noexpandtab +# vim: noexpandtab \ No newline at end of file diff --git a/bsp/wdr4900/root_file_system/etc/config/wireless.tpl b/bsp/wdr4900/root_file_system/etc/config/wireless.tpl index f3cd49e1..b223f5c4 100644 --- a/bsp/wdr4900/root_file_system/etc/config/wireless.tpl +++ b/bsp/wdr4900/root_file_system/etc/config/wireless.tpl @@ -52,4 +52,4 @@ config wifi-iface 'w2ap' option ssid '${ESSID_AP}' option 'encryption' 'none' -# vim: noexpandtab +# vim: noexpandtab \ No newline at end of file diff --git a/bsp/wdr4900/root_file_system/etc/network.tl-wdr4900-v1 b/bsp/wdr4900/root_file_system/etc/network.tl-wdr4900-v1 index fd7617b7..fcac1236 100644 --- a/bsp/wdr4900/root_file_system/etc/network.tl-wdr4900-v1 +++ b/bsp/wdr4900/root_file_system/etc/network.tl-wdr4900-v1 @@ -1,4 +1,3 @@ - WANDEV=eth0 SWITCHDEV=eth0 CLIENT_PORTS="0t 4 5" @@ -7,4 +6,4 @@ BATMAN_PORTS="0t 2 3" CLIENTIF="eth0.1 w2ap w5ap" ETHMESHMAC= -ROUTERMAC=w5mesh +ROUTERMAC=w5mesh \ No newline at end of file diff --git a/bsp/wr1043nd/root_file_system/etc/network.tl-wr1043nd-v1 b/bsp/wr1043nd/root_file_system/etc/network.tl-wr1043nd-v1 index 496cf02f..4c4629a4 100644 --- a/bsp/wr1043nd/root_file_system/etc/network.tl-wr1043nd-v1 +++ b/bsp/wr1043nd/root_file_system/etc/network.tl-wr1043nd-v1 @@ -1,4 +1,3 @@ - WANDEV=eth0 SWITCHDEV=eth0 CLIENT_PORTS="3 4 5t" @@ -7,4 +6,4 @@ BATMAN_PORTS="1 2 5t" CLIENTIF="eth0.1 w2ap" ETHMESHMAC=w2ap -ROUTERMAC=eth0 +ROUTERMAC=eth0 \ No newline at end of file diff --git a/bsp/wr1043nd/root_file_system/etc/network.tl-wr1043nd-v2 b/bsp/wr1043nd/root_file_system/etc/network.tl-wr1043nd-v2 index 874a1528..2f0e5f61 100644 --- a/bsp/wr1043nd/root_file_system/etc/network.tl-wr1043nd-v2 +++ b/bsp/wr1043nd/root_file_system/etc/network.tl-wr1043nd-v2 @@ -1,4 +1,3 @@ - WANDEV=eth0 SWITCHDEV=eth0 CLIENT_PORTS="1 2 6t" @@ -7,4 +6,4 @@ BATMAN_PORTS="3 4 6t" CLIENTIF="eth0.1 w2ap" ETHMESHMAC= -ROUTERMAC=eth1 +ROUTERMAC=eth1 \ No newline at end of file diff --git a/bsp/wr740n/root_file_system/etc/network.tl-wr740n-v4 b/bsp/wr740n/root_file_system/etc/network.tl-wr740n-v4 index 155e2917..5d19a388 100644 --- a/bsp/wr740n/root_file_system/etc/network.tl-wr740n-v4 +++ b/bsp/wr740n/root_file_system/etc/network.tl-wr740n-v4 @@ -1,4 +1,3 @@ - WANDEV=eth1 # WANDEV=eth0 SWITCHDEV=eth0 @@ -8,4 +7,4 @@ BATMAN_PORTS="2 3 0t" CLIENTIF="eth0.1 w2ap" ETHMESHMAC=eth1 -ROUTERMAC=w2mesh +ROUTERMAC=w2mesh \ No newline at end of file diff --git a/bsp/wr741/root_file_system/etc/network.tl-wr741nd-v2 b/bsp/wr741/root_file_system/etc/network.tl-wr741nd-v2 index 6e73cdf4..2ffdff64 100644 --- a/bsp/wr741/root_file_system/etc/network.tl-wr741nd-v2 +++ b/bsp/wr741/root_file_system/etc/network.tl-wr741nd-v2 @@ -1,4 +1,3 @@ - WANDEV=eth1 # WANDEV=eth0 SWITCHDEV=eth0 @@ -8,4 +7,4 @@ BATMAN_PORTS="3 4 0t" CLIENTIF="eth0.1 w2ap" ETHMESHMAC=eth1 -ROUTERMAC=w2mesh +ROUTERMAC=w2mesh \ No newline at end of file diff --git a/bsp/wr741/root_file_system/etc/network.tl-wr741nd-v4 b/bsp/wr741/root_file_system/etc/network.tl-wr741nd-v4 index 155e2917..5d19a388 100644 --- a/bsp/wr741/root_file_system/etc/network.tl-wr741nd-v4 +++ b/bsp/wr741/root_file_system/etc/network.tl-wr741nd-v4 @@ -1,4 +1,3 @@ - WANDEV=eth1 # WANDEV=eth0 SWITCHDEV=eth0 @@ -8,4 +7,4 @@ BATMAN_PORTS="2 3 0t" CLIENTIF="eth0.1 w2ap" ETHMESHMAC=eth1 -ROUTERMAC=w2mesh +ROUTERMAC=w2mesh \ No newline at end of file diff --git a/build_patches/0001-batman-adv-no-rebroadcast-option.patch b/build_patches/0001-batman-adv-no-rebroadcast-option.patch index f539e7f0..f8d9d095 100644 --- a/build_patches/0001-batman-adv-no-rebroadcast-option.patch +++ b/build_patches/0001-batman-adv-no-rebroadcast-option.patch @@ -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 ++Signed-off-by: Linus L�ssing +--- + hard-interface.c | 2 ++ + send.c | 4 +++ @@ -79,7 +79,7 @@ index 0000000..57d8491 + ++What: /sys/class/net//batman-adv/no_rebroadcast ++Date: Sep 2013 -++Contact: Linus Lüssing +++Contact: Linus L�ssing ++Description: ++ With this option set incoming multicast payload frames on ++ are not being rebroadcasted on again. This @@ -192,4 +192,3 @@ index 0000000..57d8491 + -- 1.7.10.4 - diff --git a/build_patches/feeds.conf b/build_patches/feeds.conf index 76b46cab..4d6c7fea 100644 --- a/build_patches/feeds.conf +++ b/build_patches/feeds.conf @@ -3,4 +3,4 @@ src-link routing PATH/routing src-link tunneldigger PATH/tunneldigger src-link fastd PATH/fastd src-link libremap PATH/libremap -src-link packagesol PATH/ffol +src-link packagesol PATH/ffol \ No newline at end of file diff --git a/build_patches/sysupgrade_no_config_save.patch b/build_patches/sysupgrade_no_config_save.patch index b40f1a83..072b91ba 100644 --- a/build_patches/sysupgrade_no_config_save.patch +++ b/build_patches/sysupgrade_no_config_save.patch @@ -10,4 +10,4 @@ Index: package/base-files/files/sbin/sysupgrade + /etc/sysupgrade.conf 2>/dev/null) \ -type f 2>/dev/null; opkg list-changed-conffiles ) | sort -u > "$file" - return 0 + return 0 \ No newline at end of file diff --git a/community/oldenburg.cfg b/community/oldenburg.cfg deleted file mode 100644 index c9002d19..00000000 --- a/community/oldenburg.cfg +++ /dev/null @@ -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/ diff --git a/src/packages/ffol/libwlocate/Makefile b/src/packages/ffol/libwlocate/Makefile index 39e191c3..7946da32 100644 --- a/src/packages/ffol/libwlocate/Makefile +++ b/src/packages/ffol/libwlocate/Makefile @@ -48,4 +48,4 @@ define Package/libwlocate/install $(CP) $(PKG_BUILD_DIR)/libwlocate.so $(1)/usr/lib/ endef -$(eval $(call BuildPackage,libwlocate)) +$(eval $(call BuildPackage,libwlocate)) \ No newline at end of file From fd1195d15ec5c64119da9f06c594923a8c9d3eff Mon Sep 17 00:00:00 2001 From: Oliver Voelker Date: Wed, 12 Nov 2014 22:49:28 +0100 Subject: [PATCH 8/9] buildscript can also "clean" up --- buildscript | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/buildscript b/buildscript index 94d1884c..5be862f3 100755 --- a/buildscript +++ b/buildscript @@ -307,7 +307,7 @@ case "$1" in "clean") if [ "$2" = "help" ] || [ "$2" = "x" ]; then echo "This option cleans all build files." - echo "$0 $1 all" + echo "$0 $1" else clean fi @@ -332,6 +332,7 @@ case "$1" in echo " config" echo " build" echo " buildall" + echo " clean" echo "" echo "If you need help to one of these options just type $0 command help" ;; From 9b077d4cc7dd59c1c57ea788e8e471745b0bc296 Mon Sep 17 00:00:00 2001 From: Oliver Voelker Date: Thu, 13 Nov 2014 00:05:07 +0100 Subject: [PATCH 9/9] Hilfetext erweitert --- buildscript | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/buildscript b/buildscript index 5be862f3..5ff3c845 100755 --- a/buildscript +++ b/buildscript @@ -244,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 @@ -329,12 +329,12 @@ case "$1" in echo " selectcommunity [communityfile]" echo " selectbsp [bsp file]" echo " prepare" - echo " config" - echo " build" - echo " buildall" + echo " config " + echo " build []" + echo " buildall []" echo " clean" echo "" echo "If you need help to one of these options just type $0 command help" ;; esac -# vim: noexpandtab \ No newline at end of file +# vim: noexpandtab