From ee16f91c95d4c02a3977e30692e911207448e4eb Mon Sep 17 00:00:00 2001 From: Conrad Lara - KG6JEI Date: Wed, 25 Mar 2015 17:03:23 -0700 Subject: [PATCH 1/3] Remove programs that are not used by us. --- files/usr/local/bin/fw-debug | 48 ---------------------------- files/usr/local/bin/ifstat | 39 ----------------------- files/usr/local/bin/recvudp | Bin 7507 -> 0 bytes files/usr/local/bin/reflash | 60 ----------------------------------- 4 files changed, 147 deletions(-) delete mode 100755 files/usr/local/bin/fw-debug delete mode 100755 files/usr/local/bin/ifstat delete mode 100755 files/usr/local/bin/recvudp delete mode 100755 files/usr/local/bin/reflash diff --git a/files/usr/local/bin/fw-debug b/files/usr/local/bin/fw-debug deleted file mode 100755 index d3d04c1b..00000000 --- a/files/usr/local/bin/fw-debug +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/sh -<<'LICENSE' - Part of AREDN -- Used for creating Amateur Radio Emergency Data Networks - Copyright (C) 2015 Conrad Lara - See Contributors file for additional contributors - - Copyright (c) 2013 David Rivenburg et al. BroadBand-HamNet - - 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 version 3 of the License. - - 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 - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - - Additional Terms: - - Additional use restrictions exist on the AREDN(TM) trademark and logo. - See AREDNLicense.txt for more info. - - Attributions to the AREDN Project must be retained in the source code. - If importing this code into a new or existing project attribution - to the AREDN project must be added to the source code. - - You must not misrepresent the origin of the material conained within. - - Modified versions must be modified to attribute to the original source - and be marked in reasonable ways as differentiate it from the original - version. - -LICENSE - - -# this script displays the iptables commands that the firewall config file -# generates without running them - -LAN_IP=`ifconfig eth0.0 | grep "inet addr" | cut -f2 -d: | cut -f1 -d' '` -LAN_MASK=`ifconfig eth0.0 | grep " Mask:" | cut -f4 -d:` -eval `ipcalc.sh $LAN_IP $LAN_MASK` -awk -f /usr/lib/common.awk \ - -f /usr/lib/firewall.awk \ - LAN_NET=$NETWORK/$PREFIX \ - /etc/config/firewall diff --git a/files/usr/local/bin/ifstat b/files/usr/local/bin/ifstat deleted file mode 100755 index c95eb1e0..00000000 --- a/files/usr/local/bin/ifstat +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh -<<'LICENSE' - Part of AREDN -- Used for creating Amateur Radio Emergency Data Networks - Copyright (C) 2015 Conrad Lara - See Contributors file for additional contributors - - Copyright (c) 2013 David Rivenburg et al. BroadBand-HamNet - - 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 version 3 of the License. - - 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 - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - - Additional Terms: - - Additional use restrictions exist on the AREDN(TM) trademark and logo. - See AREDNLicense.txt for more info. - - Attributions to the AREDN Project must be retained in the source code. - If importing this code into a new or existing project attribution - to the AREDN project must be added to the source code. - - You must not misrepresent the origin of the material conained within. - - Modified versions must be modified to attribute to the original source - and be marked in reasonable ways as differentiate it from the original - version. - -LICENSE - - -ifconfig -a | grep -B1 "inet addr" diff --git a/files/usr/local/bin/recvudp b/files/usr/local/bin/recvudp deleted file mode 100755 index 53366f9837b459250207986b2c1275a51a3a1198..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7507 zcmb_hZ){w}5udwr5+@|~IichLL*Io1n<^X!aUoEDc>b5f;3TKSEg%J+@1LCm+jqTt zjvOgc4rB_dC^l+UgoMB?O-m~(r~QChiNFb{)T#*OBdVejm8u1aN{NIDs!*@L-@e_u z=kqygrA{=Not@d)nc3ZUyW`U%WBUSufEWl$yO2A-(Uv|?yGvwKSdx8W$wujwZn+jz zl&nvvV@nl0aRaao7y^E#&<3^TYP5-z>6wb{XtW1xg%R`B1GDkuxG>T z8%F=I{2tw(0_hj!K@bb}E!Zc%2cyJI=%@YLr}OFCr?a=s4WW^VmkaTP{4*fGhG-R3 zpB)zZy87@==FQv=}#m z`6V!>%|Mec_T2zfdjRx0b^y3<2;D&D^h!{Ja0xjlgyHcyQ2ImIA(v|#!Ent9Venso z@*EJti1>X_t|6fdBf6m9-`UXL(!~D-dR${q|8ngn$R~XIH#F)09E!`>Q{$k_=O_ni z*af;rw;3z>GH?m{+?UkP0tszEvu@m@)ZdQGz6@Ha^WGYqZMWq&NZfYBHxGFc@+GD3 zt?LAM8w*DJW-ZP9r_q;$d|K;22Wo>i{yzpj0lr_$5w1EroBbDnAP@n=9p}@?|$yawbcunH+Q{3+Qjz zd*2D?h}IsOPL<2KvXl#%$8xTeT^K6KWU-W=btfe^j|pdTGi8c$E|m&JSBlUnlq8*> z%}ObkIWbu(%t(GV=Q^`)AtjmVLOCb+*i2pI61HBq|0Te z?50YTq74B&+CMbp?7=sVyM66HbgL8TodvFu;TxyJ8@U1r&pRP`%Sn6=g3{{^z`5-1 zpMUzrp6JCFLKkc2dcyL?O1HeV5&;cJ7q_I+8CNi)iy=$S^+ZAa_Z;LtU zwTWfH7t2;XrVn-_+V2JUy|LcE*8gT-X`B9rwZB&7T+fBmZ>@ZA`puQ4N~rIqk6#Hz zFD-|>Js0dR%3xnK{0K%3zlL1&yLEo#wO)C<=YYJuvKMp=l(|ZRwt1Q8STezsexh%?j=zk8yQwA{TT7_%k)lX_n`Ew&8)fW8H{2XTiOOw?o; z*BCvZ-t^Zksgg>Cv3luZ3wl0-bwUhJpDgv__l|D*mE((gnI`Fi`5 zJ`#9-lTUcxn-B0iVd4APEx*Dy_pJVodf$Qhj(d8(tlfh>#BbP=%A4B}zGbuQ+EJ@@ z#lEbez3O-4+GlD1U$r}SQU<$=u)7Gm>bId6zYUa!;d6BUVu)jJkVwqWcQ^6ZH}Tgs z@sTEeXA^%-6MuCRzoUuoYT`SZ_^ZG(20t*L@_6I>&EKL{zq=PI-tVCK-A!z|^6#jb zqfpGvTKX=;JAb-VNM$prvWs>pH&@Q3ve^>*dG!GtEKgay{a81b?*($m8o=9xS8={k z6kVfmg^r58PhUZWq6)sjAU1F{EN`>x9ZR}h1+4&i7cPQM=>8Qc=_avn@UT(?3O%w+_Z3`&XtN1=arn7 z^LX~;Y-%Q-k@)dc`M6>+*rRSq;#0G8@e{dHIbWDv#W;|umq1+Ii{l4JlSeV#T)HfA z^)`r?3hI6w&mH$30}{`;g%ZSBk35=z2~VXooy8LZUQHETiSrH}&lF~6a*$^F=`BESVV!w@;nQQSWC?l+^cgU5oJEJ3mo<^mPPwwqN^P3P-Q8a2~ zA-s4AJWqs>t{9r%h>))C@qBo493}wI0U@L+hu(hocyH0TuRY$|1>C z3Ts&BcPQS};6nO~%l$( zS-u6H_sM=Oe+0bk)6anC@76IT-y)BJPeRUbCheU7PoTYBz~{9-`&grX3B1|=tWm!T zegfldd>T0Zb@2Y0_1oZ!kaL|W{{wh`P56EA705mR@i!3gCZAD^_y~NpF5fDjfG4y8 zncqv`{qube-kirS. - - Additional Terms: - - Additional use restrictions exist on the AREDN(TM) trademark and logo. - See AREDNLicense.txt for more info. - - Attributions to the AREDN Project must be retained in the source code. - If importing this code into a new or existing project attribution - to the AREDN project must be added to the source code. - - You must not misrepresent the origin of the material conained within. - - Modified versions must be modified to attribute to the original source - and be marked in reasonable ways as differentiate it from the original - version. - -LICENSE - - -N=`ls /tmp/*.trx 2>/dev/null | wc -l` - -if [ $N == 0 ]; then - echo "no image to flash" - exit 1 -fi - -if [ $N -gt 1 ]; then - echo "more than one image found" - exit 1 -fi - -mtd write /tmp/*.trx firmware - -if [ $? != 0 ]; then - echo "ERROR: flash write failed!" - exit -fi - -echo "flash written successfully - rebooting" -reboot - From 303c9c264ff0e76b0c712a1c42651851ecfddf86 Mon Sep 17 00:00:00 2001 From: Conrad Lara - KG6JEI Date: Fri, 27 Mar 2015 19:20:23 -0700 Subject: [PATCH 2/3] cleanup: opkg.conf is now built by the BuildRoot and is no longer needed. --- files/etc/opkg.conf | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 files/etc/opkg.conf diff --git a/files/etc/opkg.conf b/files/etc/opkg.conf deleted file mode 100644 index 5252130a..00000000 --- a/files/etc/opkg.conf +++ /dev/null @@ -1,6 +0,0 @@ -src/gz packages http://downloads.aredn.org/attitude_adjustment/12.09/ar71xx/generic/packages -dest root / -dest ram /tmp -lists_dir ext /var/opkg-lists -option overlay_root /overlay - From ef941fe9a4f95a0c5589c07cb5941be2e8e051aa Mon Sep 17 00:00:00 2001 From: Conrad Lara - KG6JEI Date: Fri, 27 Mar 2015 19:21:37 -0700 Subject: [PATCH 3/3] cleanup: BuildImage.sh is no longer needed as it was for use under the Image Builder We now let the BuildRoot build the system, as such this script no longer works. --- BuildImage.sh | 67 --------------------------------------------------- 1 file changed, 67 deletions(-) delete mode 100755 BuildImage.sh diff --git a/BuildImage.sh b/BuildImage.sh deleted file mode 100755 index 273c9cc6..00000000 --- a/BuildImage.sh +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/bash -<<'LICENSE' - Part of AREDN -- Used for creating Amateur Radio Emergency Data Networks - Copyright (C) 2015 Conrad Lara - See Contributors file for additional contributors - - 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 version 3 of the License. - - 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 - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - - Additional Terms: - - Additional use restrictions exist on the AREDN(TM) trademark and logo. - See AREDNLicense.txt for more info. - - Attributions to the AREDN Project must be retained in the source code. - If importing this code into a new or existing project attribution - to the AREDN project must be added to the source code. - - You must not misrepresent the origin of the material contained within. - - Modified versions must be modified to attribute to the original source - and be marked in reasonable ways as differentiate it from the original - version. - -LICENSE - -#This is a build script for use with the OpenWRT Image Builder to create the final images as used by AREDN - -# Initialize variables -FILESDIR="files" - -while getopts "v:a:d:f" flag; do -case "$flag" in - v) REQVERSION=$OPTARG;; - d) DESTINATION=$OPTARG;; - f) FILESDIR=$OPTARG;; -esac -done - -if [ ! $REQVERSION ] - then - echo "A version number must be provided with -v flag" - exit 1 -fi - -VERSION=$REQVERSION - -if [ ! $DESTINATION ] - then - echo "A destination folder must be provided with the -d flag" - exit 1 -fi - -mkdir -p $DESTINATION; - -echo $VERSION > files/etc/mesh-release -fakeroot make image PLATFORM="UBNT" PACKAGES="bridge busybox dnsmasq dropbear iptables kmod-ipt-nathelper kmod-usb-core kmod-usb-uhci kmod-usb2 libgcc mtd ppp ppp-mod-pppoe uhttpd olsrd perl olsrd-mod-arprefresh olsrd-mod-dyn-gw olsrd-mod-httpinfo olsrd-mod-nameservice olsrd-mod-txtinfo olsrd-mod-dot-draw olsrd-mod-watchdog olsrd-mod-secure perlbase-essential perlbase-xsloader perlbase-file perlbase-perlio libpcap tcpdump-mini ntpclient xinetd kmod-ipv6 ip6tables kmod-ip6tables libip6tc ip iptables-mod-ipopt iwinfo libiwinfo socat" FILES="$FILESDIR" BIN_DIR="$DESTINATION/$VERSION" -rename "s/openwrt/AREDN-$VERSION/g" /$DESTINATION/$VERSION/*