ar71xx: remove non-existant ubnt-power-m-xw

Submitted by Adrian Schmutzler on March 31, 2020, 5:03 p.m.

Details

Message ID 20200331170330.44591-1-freifunk@adrianschmutzler.de
State Accepted
Headers show

Commit Message

Adrian Schmutzler March 31, 2020, 5:03 p.m. 
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 <freifunk@adrianschmutzler.de>
---
 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

Patch hide | download patch | download mbox 

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

Comments

Christian Dresel March 31, 2020, 5:10 p.m. 
Hallo

Reviewed-by: Christian Dresel <fff@chrisi01.de>

wäre aber gut wenn es noch jemand auf einer loco xw testet ob das da
auch ordentlich geht.

Gruß

Christian

On 31.03.20 19:03, Adrian Schmutzler wrote:
> 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 <freifunk@adrianschmutzler.de>
> ---
>  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
>
Fabian Blaese March 31, 2020, 6:58 p.m. 
Reviewed-by: Fabian Bläse <fabian@blaese.de>
Adrian Schmutzler March 31, 2020, 9:54 p.m. 
Ich habe noch den Absatz wie besprochen ergänzt und den Patch applied.

Zudem sei noch darauf hingewiesen, dass dieser Patch effektiv nur den veränderten Board-Namen entfernt, der eigentlich gar nicht Bestandteil von Christians ursprünglichem Patch war.

Tatsächlich stellen wir mit meinem Patch einfach nur die Situation wieder her, die Christian mit seinem Patch ja gerade erzeugt hat:
Wir haben ein Image, dass loco-m-xw heißt, und für die PowerBeam gedacht ist. In Christians ursprünglichem Patch stand "Power" kein einziges mal im Code, nur in der Commit Message.

Wir verbieten ja nicht, dass man dieses Image für die PowerBeam verwendet, sondern entfernen nur den internen Namen, der eh nie angewandt wurde.

Beste Grüße

Adrian

> -----Original Message-----
> From: franken-dev [mailto:franken-dev-bounces@freifunk.net] On Behalf
> Of Adrian Schmutzler
> Sent: Dienstag, 31. März 2020 19:04
> To: franken-dev@freifunk.net
> Subject: [PATCH] ar71xx: remove non-existant ubnt-power-m-xw
> 
> 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 <freifunk@adrianschmutzler.de>
> ---
>  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-board
> +++ name
> @@ -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-wi
> +++ reless
> @@ -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
> --
> 2.20.1