| Message ID | 1510582424-2464-1-git-send-email-freifunk@adrianschmutzler.de |
|---|---|
| State | Superseded |
| Headers | show |
diff --git a/src/packages/fff/fff-wireless/Makefile b/src/packages/fff/fff-wireless/Makefile index c15b2f1..6c62449 100644 --- a/src/packages/fff/fff-wireless/Makefile +++ b/src/packages/fff/fff-wireless/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fff-wireless -PKG_VERSION:=0.0.2 +PKG_VERSION:=5 PKG_RELEASE:=1 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) diff --git a/src/packages/fff/fff-wireless/files/etc/uci-defaults/60-fff-wireless b/src/packages/fff/fff-wireless/files/etc/uci-defaults/60-fff-wireless deleted file mode 100644 index 7e2fcf9..0000000 --- a/src/packages/fff/fff-wireless/files/etc/uci-defaults/60-fff-wireless +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -# Copyright 2016 Tim Niemeyer -# License GPLv3 - -. /lib/functions/fff/wireless - -if ! wifiDelAll; then - echo "Can't delete current wifi setup" - exit 1 -fi - -for phy in $(iw phy | awk '/^Wiphy/{ print $2 }'); do - radio="$(wifiAddPhyCond "$phy" "2" "1")" - radio5="$(wifiAddPhyCond "$phy" "5" "36")" - [ -n "$radio5" ] && radio="$radio5" - if [ -z "$radio" ] ; then - echo "Can't create radio for $phy" - exit 1 - fi - - if ! wifiAddAP "$radio" "do.not.use" "mesh" "ap" "0" ; then - echo "Can't add AP interface on $radio." - exit 1 - fi - - if ! wifiAddMesh "$radio" "mesh.do.not.use" ; then - echo "Can't add Mesh interface on $radio." - exit 1 - fi -done - -# vim: set noexpandtab:tabstop=4
Hi Schon cool. Aber da gibt es noch Abhängigkeiten nach w2ap/w2mesh. :( ./fff-network/files/usr/sbin/configurenetwork: ETH0MAC="w2ap" Tim Am Montag, den 13.11.2017, 15:13 +0100 schrieb Adrian Schmutzler: > This removes the uci-defaults script setting up dummy networks. > Since we use the phyX adapters now, initial setup is not > required any more. > > Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> > --- > src/packages/fff/fff-wireless/Makefile | 2 +- > .../files/etc/uci-defaults/60-fff-wireless | 32 ---------------------- > 2 files changed, 1 insertion(+), 33 deletions(-) > delete mode 100644 src/packages/fff/fff-wireless/files/etc/uci-defaults/60-fff-wireless > > diff --git a/src/packages/fff/fff-wireless/Makefile b/src/packages/fff/fff-wireless/Makefile > index c15b2f1..6c62449 100644 > --- a/src/packages/fff/fff-wireless/Makefile > +++ b/src/packages/fff/fff-wireless/Makefile > @@ -1,7 +1,7 @@ > include $(TOPDIR)/rules.mk > > PKG_NAME:=fff-wireless > -PKG_VERSION:=0.0.2 > +PKG_VERSION:=5 > PKG_RELEASE:=1 > > PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) > diff --git a/src/packages/fff/fff-wireless/files/etc/uci-defaults/60-fff-wireless b/src/packages/fff/fff-wireless/files/etc/uci-defaults/60-fff-wireless > deleted file mode 100644 > index 7e2fcf9..0000000 > --- a/src/packages/fff/fff-wireless/files/etc/uci-defaults/60-fff-wireless > +++ /dev/null > @@ -1,32 +0,0 @@ > -#!/bin/sh > -# Copyright 2016 Tim Niemeyer > -# License GPLv3 > - > -. /lib/functions/fff/wireless > - > -if ! wifiDelAll; then > - echo "Can't delete current wifi setup" > - exit 1 > -fi > - > -for phy in $(iw phy | awk '/^Wiphy/{ print $2 }'); do > - radio="$(wifiAddPhyCond "$phy" "2" "1")" > - radio5="$(wifiAddPhyCond "$phy" "5" "36")" > - [ -n "$radio5" ] && radio="$radio5" > - if [ -z "$radio" ] ; then > - echo "Can't create radio for $phy" > - exit 1 > - fi > - > - if ! wifiAddAP "$radio" "do.not.use" "mesh" "ap" "0" ; then > - echo "Can't add AP interface on $radio." > - exit 1 > - fi > - > - if ! wifiAddMesh "$radio" "mesh.do.not.use" ; then > - echo "Can't add Mesh interface on $radio." > - exit 1 > - fi > -done > - > -# vim: set noexpandtab:tabstop=4 > -- > 2.7.4 >
This removes the uci-defaults script setting up dummy networks. Since we use the phyX adapters now, initial setup is not required any more. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> --- src/packages/fff/fff-wireless/Makefile | 2 +- .../files/etc/uci-defaults/60-fff-wireless | 32 ---------------------- 2 files changed, 1 insertion(+), 33 deletions(-) delete mode 100644 src/packages/fff/fff-wireless/files/etc/uci-defaults/60-fff-wireless