[PATCH v4 1/2] fff-boardname: introduce new ubnt boards

[mail at adrianschmutzler.de]

Hallo Tim,

die neuen Boards musst du dann für das sysupgrade wieder rückgängig machen,
da wir ja nur die vier Images haben, die OpenWRT vorgibt:

https://github.com/FreifunkFranken/firmware/blob/master/src/packages/fff/fff
-sysupgrade/files/etc/sysupgrade.sh#L28

Das ist einer der Gründe, warum ich kein Fan dieser Lösung war/bin und
lieber den Image-Namen von OpenWRT folgen wollte.

Wenn du das hier noch einbauen willst, kann ich aber auch mit deiner Lösung
leben (und werde sie reviewen), ich finde es halt nur unnötig kompliziert.

Grüße

Adrian



> -----Original Message-----
> From: franken-dev [mailto:franken-dev-bounces at freifunk.net] On Behalf
> Of Tim Niemeyer
> Sent: Samstag, 3. März 2018 19:41
> To: franken-dev at freifunk.net
> Subject: [PATCH v4 1/2] fff-boardname: introduce new ubnt boards
> 
> Signed-off-by: Tim Niemeyer <tim at tn-x.org>
> ---
> 
> Changes in v4:
> - New patch
> 
>  src/packages/fff/fff-boardname/Makefile                        |  2 +-
>  .../fff/fff-boardname/files/etc/uci-defaults/50-fff-boardname  |  3 +++
>  src/packages/fff/fff-network/ar71xx/network.ubnt-loco-m        | 10
> ++++++++++
>  src/packages/fff/fff-network/ar71xx/network.ubnt-pico-m        | 10
> ++++++++++
>  src/packages/fff/fff-network/ar71xx/network.ubnt-power-m-xw    | 10
> ++++++++++
>  5 files changed, 34 insertions(+), 1 deletion(-)  create mode 100644
> src/packages/fff/fff-network/ar71xx/network.ubnt-loco-m
>  create mode 100644 src/packages/fff/fff-network/ar71xx/network.ubnt-
> pico-m
>  create 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 9848f80..d7ccd00 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_VERSION:=4
> +PKG_VERSION:=5
>  PKG_RELEASE:=1
> 
>  PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
> diff --git a/src/packages/fff/fff-boardname/files/etc/uci-defaults/50-fff-
> boardname b/src/packages/fff/fff-boardname/files/etc/uci-defaults/50-fff-
> boardname
> index 7d4cdb6..db2f253 100644
> --- a/src/packages/fff/fff-boardname/files/etc/uci-defaults/50-fff-
> boardname
> +++ b/src/packages/fff/fff-boardname/files/etc/uci-defaults/50-fff-board
> +++ name
> @@ -34,12 +34,15 @@ case "$BOARD" in
>          ;;
>      bullet-m)
>          BOARD=ubnt-bullet-m
> +        grep -i "Pico" /var/sysinfo/model && BOARD=ubnt-pico-m
> +        grep -i "Loco" /var/sysinfo/model && BOARD=ubnt-loco-m
>          ;;
>      unifi)
>          BOARD=ubnt-unifi
>          ;;
>      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/ar71xx/network.ubnt-loco-m
> b/src/packages/fff/fff-network/ar71xx/network.ubnt-loco-m
> new file mode 100644
> index 0000000..372750c
> --- /dev/null
> +++ b/src/packages/fff/fff-network/ar71xx/network.ubnt-loco-m
> @@ -0,0 +1,10 @@
> +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-network/ar71xx/network.ubnt-pico-m
> b/src/packages/fff/fff-network/ar71xx/network.ubnt-pico-m
> new file mode 100644
> index 0000000..372750c
> --- /dev/null
> +++ b/src/packages/fff/fff-network/ar71xx/network.ubnt-pico-m
> @@ -0,0 +1,10 @@
> +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-network/ar71xx/network.ubnt-power-m-xw
> b/src/packages/fff/fff-network/ar71xx/network.ubnt-power-m-xw
> new file mode 100644
> index 0000000..372750c
> --- /dev/null
> +++ b/src/packages/fff/fff-network/ar71xx/network.ubnt-power-m-xw
> @@ -0,0 +1,10 @@
> +WANDEV=eth0
> +SWITCHDEV=eth0
> +CLIENT_PORTS=""
> +WAN_PORTS=""
> +BATMAN_PORTS=""
> +ONE_PORT="YES"
> +
> +. /etc/network.mode
> +
> +ROUTERMAC=$(cat /sys/class/ieee80211/phy0/macaddress)
> --
> 2.11.0
> 
> --
> franken-dev mailing list
> franken-dev at freifunk.net
> http://lists.freifunk.net/mailman/listinfo/franken-dev-freifunk.net