From patchwork Tue Mar 31 17:03:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: ar71xx: remove non-existant ubnt-power-m-xw From: Adrian Schmutzler X-Patchwork-Id: 1315 Message-Id: <20200331170330.44591-1-freifunk@adrianschmutzler.de> To: franken-dev@freifunk.net Date: Tue, 31 Mar 2020 19:03:30 +0200 The ubnt-power-m-xw identifier was introduced in 0447d0c709ac ("fff-boardname: introduce new ubnt boards") assuming that the Ubiquiti Powerbeam M2 XW had a separate model identifier in /var/sysinfo/model (otherwise, it was derived from loco-m-xw image). However, OpenWrt has never known about a PowerBeam device. Consequently, on devices nothing changed, and all PowerBeam devices were still recognized as Nanostation Loco M XW. Thus, this patch removes all references to a ubnt-power-m-xw, as it's never been working anyway. Note that this also implies that any user of a PowerBeam would have used the wrong antenna_gain values of the Loco M XW by default (and will continue to do so). The board and model names set in ar71xx are found in the OpenWrt file target/linux/ar71xx/base-files/lib/ar71xx.sh Fixes: 0447d0c709ac ("fff-boardname: introduce new ubnt boards") Signed-off-by: Adrian Schmutzler Reviewed-by: Christian Dresel Reviewed-by: Fabian Bläse --- src/packages/fff/fff-boardname/Makefile | 2 +- .../files/etc/uci-defaults/15-fff-boardname | 1 - src/packages/fff/fff-network/Makefile | 2 +- .../fff/fff-network/ar71xx/network.ubnt-power-m-xw | 10 ---------- src/packages/fff/fff-wireless/Makefile | 2 +- .../files/etc/uci-defaults/24b-config-wireless | 4 ---- 6 files changed, 3 insertions(+), 18 deletions(-) delete mode 100644 src/packages/fff/fff-network/ar71xx/network.ubnt-power-m-xw diff --git a/src/packages/fff/fff-boardname/Makefile b/src/packages/fff/fff-boardname/Makefile index 9c2f76d9..01fcc0ae 100644 --- a/src/packages/fff/fff-boardname/Makefile +++ b/src/packages/fff/fff-boardname/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fff-boardname -PKG_RELEASE:=6 +PKG_RELEASE:=7 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) diff --git a/src/packages/fff/fff-boardname/files/etc/uci-defaults/15-fff-boardname b/src/packages/fff/fff-boardname/files/etc/uci-defaults/15-fff-boardname index ee9c3d39..a96c05a8 100644 --- a/src/packages/fff/fff-boardname/files/etc/uci-defaults/15-fff-boardname +++ b/src/packages/fff/fff-boardname/files/etc/uci-defaults/15-fff-boardname @@ -42,7 +42,6 @@ case "$BOARD" in ;; loco-m-xw) BOARD=ubnt-loco-m-xw - grep -i "Power" /var/sysinfo/model && BOARD=ubnt-power-m-xw ;; unifiac-lite) BOARD=ubnt-unifiac-lite diff --git a/src/packages/fff/fff-network/Makefile b/src/packages/fff/fff-network/Makefile index 8f8c7f23..0c7e2bd5 100644 --- a/src/packages/fff/fff-network/Makefile +++ b/src/packages/fff/fff-network/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fff-network -PKG_RELEASE:=17 +PKG_RELEASE:=18 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) diff --git a/src/packages/fff/fff-network/ar71xx/network.ubnt-power-m-xw b/src/packages/fff/fff-network/ar71xx/network.ubnt-power-m-xw deleted file mode 100644 index 372750c3..00000000 --- a/src/packages/fff/fff-network/ar71xx/network.ubnt-power-m-xw +++ /dev/null @@ -1,10 +0,0 @@ -WANDEV=eth0 -SWITCHDEV=eth0 -CLIENT_PORTS="" -WAN_PORTS="" -BATMAN_PORTS="" -ONE_PORT="YES" - -. /etc/network.mode - -ROUTERMAC=$(cat /sys/class/ieee80211/phy0/macaddress) diff --git a/src/packages/fff/fff-wireless/Makefile b/src/packages/fff/fff-wireless/Makefile index 02328a2b..6b459757 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_RELEASE:=15 +PKG_RELEASE:=16 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) diff --git a/src/packages/fff/fff-wireless/files/etc/uci-defaults/24b-config-wireless b/src/packages/fff/fff-wireless/files/etc/uci-defaults/24b-config-wireless index d4f2267e..f0257fb7 100644 --- a/src/packages/fff/fff-wireless/files/etc/uci-defaults/24b-config-wireless +++ b/src/packages/fff/fff-wireless/files/etc/uci-defaults/24b-config-wireless @@ -23,10 +23,6 @@ case "$BOARD" in uci set wireless.radio0.antenna_gain=12 uci commit wireless ;; - ubnt-power-m-xw) - uci set wireless.radio0.antenna_gain=18 - uci commit wireless - ;; ubnt-unifi) # No support for Unifi AP Pro! uci set wireless.radio0.antenna_gain=3