From c9aeec56338371862638f8f2d196bcb9255426e8 Mon Sep 17 00:00:00 2001
From: viktorxda <35473052+viktorxda@users.noreply.github.com>
Date: Wed, 11 Dec 2024 14:33:45 +0100
Subject: [PATCH] [no ci] Package: update wifibroadcast-ng (#1638)

---
 general/package/mavfwd/Config.in                     | 5 +----
 general/package/mavlink-router/Config.in             | 1 -
 general/package/wifibroadcast-ng/Config.in           | 1 +
 general/package/wifibroadcast-ng/files/wifibroadcast | 9 ++++-----
 general/package/wifibroadcast-ng/wifibroadcast-ng.mk | 7 +++++--
 5 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/general/package/mavfwd/Config.in b/general/package/mavfwd/Config.in
index d29ca286..5185126c 100644
--- a/general/package/mavfwd/Config.in
+++ b/general/package/mavfwd/Config.in
@@ -1,9 +1,6 @@
 config BR2_PACKAGE_MAVFWD
 	bool "mavfwd"
-	default n
-	select BR2_PACKAGE_LIBEVENT_OPENIPC
-	select BR2_PACKAGE_DATALINK
 	help
-	  mavfwd - Cool and awesome mavlink forwader for FPV
+	  Simple mavlink forwarder.
 
 	  https://github.com/OpenIPC/mavfwd
diff --git a/general/package/mavlink-router/Config.in b/general/package/mavlink-router/Config.in
index 01810db4..666743fd 100644
--- a/general/package/mavlink-router/Config.in
+++ b/general/package/mavlink-router/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_MAVLINK_ROUTER
 	bool "mavlink-router"
-	select BR2_PACKAGE_DATALINK
 	help
 	  MAVLink Router is an application to distribute MAVLink messages between multiple endpoints (connections). It distributes packets to a single port or multiple endpoints depending on the target address. Connections can be made via UART, UDP or TCP.
 
diff --git a/general/package/wifibroadcast-ng/Config.in b/general/package/wifibroadcast-ng/Config.in
index 32fe231a..45211e16 100644
--- a/general/package/wifibroadcast-ng/Config.in
+++ b/general/package/wifibroadcast-ng/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_WIFIBROADCAST_NG
 	bool "wifibroadcast-ng"
+	select BR2_PACKAGE_IW
 	help
 	  Long-range packet radio link based on raw WiFi radio.
 	  https://github.com/svpcom/wfb-ng
diff --git a/general/package/wifibroadcast-ng/files/wifibroadcast b/general/package/wifibroadcast-ng/files/wifibroadcast
index 62d3ff6c..30eb40ad 100755
--- a/general/package/wifibroadcast-ng/files/wifibroadcast
+++ b/general/package/wifibroadcast-ng/files/wifibroadcast
@@ -40,14 +40,13 @@ load_modules() {
 
 load_interface() {
 	ifconfig "$wlan" up
-	iwconfig "$wlan" mode monitor
+	iw "$wlan" set type monitor
+	iw "$wlan" set channel "$channel"
+	iw reg set "$region"
 
 	if [ "$driver" = "8812eu" ] || [ "$driver" = "8733bu" ]; then
-		iw dev "$wlan" set txpower fixed $((txpower * 50))
+		iw "$wlan" set txpower fixed $((txpower * 50))
 	fi
-
-	iw reg set "$region"
-	iwconfig "$wlan" channel "$channel"
 }
 
 start_wfb() {
diff --git a/general/package/wifibroadcast-ng/wifibroadcast-ng.mk b/general/package/wifibroadcast-ng/wifibroadcast-ng.mk
index b6e32a77..6d18bcf3 100644
--- a/general/package/wifibroadcast-ng/wifibroadcast-ng.mk
+++ b/general/package/wifibroadcast-ng/wifibroadcast-ng.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-WIFIBROADCAST_NG_VERSION = 3a053040442174e6c1ce76866c6da4b12c19dbb4
+WIFIBROADCAST_NG_VERSION = 7dbdf92919cfccffa5ff46b0b8294e243f5f5a37
 WIFIBROADCAST_NG_SITE = $(call github,svpcom,wfb-ng,$(WIFIBROADCAST_NG_VERSION))
 WIFIBROADCAST_NG_LICENSE = GPL-3.0
 
-WIFIBROADCAST_NG_DEPENDENCIES += libpcap libsodium iw
+WIFIBROADCAST_NG_DEPENDENCIES += libpcap libsodium
 
 define WIFIBROADCAST_NG_BUILD_CMDS
 	$(MAKE) CC=$(TARGET_CC) CXX=$(TARGET_CXX) LDFLAGS=-s -C $(@D) all_bin
@@ -19,6 +19,9 @@ define WIFIBROADCAST_NG_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 644 -t $(TARGET_DIR)/etc $(WIFIBROADCAST_NG_PKGDIR)/files/drone.key
 	$(INSTALL) -m 644 -t $(TARGET_DIR)/etc $(WIFIBROADCAST_NG_PKGDIR)/files/wfb.conf
 
+	$(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d
+	$(INSTALL) -m 755 -t $(TARGET_DIR)/etc/init.d $(WIFIBROADCAST_NG_PKGDIR)/files/S98wifibroadcast
+
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin
 	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/wfb_rx
 	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/wfb_tx