[no ci] Package: create legacy subfolder

general/external.mk

@@ -11,3 +11,4 @@ OPENIPC_KERNEL := $(OPENIPC_SOC_VENDOR)-$(OPENIPC_SOC_FAMILY)
 OPENIPC_TOOLCHAIN := toolchain/toolchain.$(OPENIPC_KERNEL)
 
 include $(sort $(wildcard $(BR2_EXTERNAL)/package/*/*.mk))
+include $(sort $(wildcard $(BR2_EXTERNAL)/package/legacy/*/*.mk))

general/package/Config.in

@@ -11,7 +11,6 @@ source "$BR2_EXTERNAL_GENERAL_PATH/package/aws-webrtc/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/baresip-openipc/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/capjpeg/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/comgt/Config.in"
-source "$BR2_EXTERNAL_GENERAL_PATH/package/datalink/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/divinus/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/dropbear-openipc/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/exfat-openipc/Config.in"
@@ -65,9 +64,7 @@ source "$BR2_EXTERNAL_GENERAL_PATH/package/majestic-plugins/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/majestic-webui/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/majestic/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/mavfwd/Config.in"
-source "$BR2_EXTERNAL_GENERAL_PATH/package/mavlink-router/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/mbedtls-openipc/Config.in"
-source "$BR2_EXTERNAL_GENERAL_PATH/package/microsnander/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/mini-snmpd-openipc/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/mini/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/motors/Config.in"
@@ -112,9 +109,8 @@ source "$BR2_EXTERNAL_GENERAL_PATH/package/vdec-openipc/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/venc-openipc/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/vtund-openipc/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/w1-ds18b20/Config.in"
-source "$BR2_EXTERNAL_GENERAL_PATH/package/webui/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/webrtc-audio-processing-openipc/Config.in"
-source "$BR2_EXTERNAL_GENERAL_PATH/package/wifibroadcast/Config.in"
+source "$BR2_EXTERNAL_GENERAL_PATH/package/wifibroadcast-ext/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/wifibroadcast-ng/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/xiongmai-opensdk-xm510/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/xiongmai-osdrv-xm510/Config.in"
@@ -122,3 +118,9 @@ source "$BR2_EXTERNAL_GENERAL_PATH/package/xiongmai-osdrv-xm530/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/xmdp/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/yaml-cli/Config.in"
 source "$BR2_EXTERNAL_GENERAL_PATH/package/zerotier-one/Config.in"
+
+source "$BR2_EXTERNAL_GENERAL_PATH/package/legacy/datalink/Config.in"
+source "$BR2_EXTERNAL_GENERAL_PATH/package/legacy/mavlink-router/Config.in"
+source "$BR2_EXTERNAL_GENERAL_PATH/package/legacy/microsnander/Config.in"
+source "$BR2_EXTERNAL_GENERAL_PATH/package/legacy/webui/Config.in"
+source "$BR2_EXTERNAL_GENERAL_PATH/package/legacy/wifibroadcast/Config.in"

general/package/wifibroadcast-ext/Config.in

@@ -0,0 +1,4 @@
+config BR2_PACKAGE_WIFIBROADCAST_EXT
+	bool "wifibroadcast-ext"
+	help
+	  Additional scripts for wifibroadcast-ng

general/package/wifibroadcast-ext/files/S75generate_vtx_info

@@ -0,0 +1,17 @@
+#!/bin/sh
+
+case "$1" in
+	start)
+		echo "Generating or updating /etc/vtx_info.yaml..."
+		generate_vtx_info
+		;;
+
+	stop)
+		echo "Generating or updating /etc/vtx_info.yaml only done when starting..."
+		;;
+
+	*)
+		echo "Usage: $0 {start|stop}"
+		exit 1
+		;;
+esac

general/package/wifibroadcast-ext/wifibroadcast-ext.mk

@@ -0,0 +1,22 @@
+################################################################################
+#
+# wifibroadcast-ext
+#
+################################################################################
+
+WIFIBROADCAST_EXT_DEPENDENCIES += libsodium
+
+define WIFIBROADCAST_EXT_BUILD_CMDS
+	$(TARGET_CC) $(WIFIBROADCAST_EXT_PKGDIR)/src/keygen.c -o $(@D)/keygen -lsodium -s
+endef
+
+define WIFIBROADCAST_EXT_INSTALL_TARGET_CMDS
+	$(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d
+	$(INSTALL) -m 755 -t $(TARGET_DIR)/etc/init.d $(WIFIBROADCAST_EXT_PKGDIR)/files/S75generate_vtx_info
+
+	$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin
+	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/keygen
+	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(WIFIBROADCAST_EXT_PKGDIR)/files/generate_vtx_info
+endef
+
+$(eval $(generic-package))

general/package/wifibroadcast-ng/files/S75generate_vtx_info

@@ -1,16 +0,0 @@
-#!/bin/sh
-
-case "$1" in
-        start)
-                echo "Generating or updating /etc/vtx_info.yaml..."
-                generate_vtx_info.sh
-                ;;
-
-        stop)
-                echo "Generating or updating /etc/vtx_info.yaml only done when starting..."
-                ;;
-        *)
-                echo "Usage: $0 {start|stop}"
-                exit 1
-                ;;
-esac

general/package/wifibroadcast-ng/wifibroadcast-ng.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WIFIBROADCAST_NG_VERSION = 82fd8b2d3caa52000b51a8c750db8b8af052c079
+WIFIBROADCAST_NG_VERSION = 1d14a1a32df559b5a421fa15841e79e3b7a8ef99
 WIFIBROADCAST_NG_SITE = $(call github,svpcom,wfb-ng,$(WIFIBROADCAST_NG_VERSION))
 WIFIBROADCAST_NG_LICENSE = GPL-3.0
 
@@ -12,7 +12,6 @@ WIFIBROADCAST_NG_DEPENDENCIES += libpcap libsodium
 
 define WIFIBROADCAST_NG_BUILD_CMDS
 	$(MAKE) CC=$(TARGET_CC) CXX=$(TARGET_CXX) LDFLAGS=-s -C $(@D) all_bin
-	$(TARGET_CC) $(WIFIBROADCAST_NG_PKGDIR)/src/keygen.c -o $(@D)/keygen -lsodium -s
 endef
 
 define WIFIBROADCAST_NG_INSTALL_TARGET_CMDS
@@ -22,17 +21,14 @@ define WIFIBROADCAST_NG_INSTALL_TARGET_CMDS
 
 	$(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 -t $(TARGET_DIR)/etc/init.d $(WIFIBROADCAST_NG_PKGDIR)/files/S75generate_vtx_info
 
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin
-	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/keygen
 	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/wfb_rx
 	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/wfb_tx
 	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/wfb_tx_cmd
 	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/wfb_tun
 	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(WIFIBROADCAST_NG_PKGDIR)/files/wfb-cli
 	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(WIFIBROADCAST_NG_PKGDIR)/files/wifibroadcast
-	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(WIFIBROADCAST_NG_PKGDIR)/files/generate_vtx_info.sh
 
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/var/www
 	$(INSTALL) -m 644 -t $(TARGET_DIR)/var/www $(WIFIBROADCAST_NG_PKGDIR)/www/*