diff --git a/general/external.mk b/general/external.mk index 6f3f6539..ff116940 100644 --- a/general/external.mk +++ b/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)) diff --git a/general/package/Config.in b/general/package/Config.in index bae7c89f..355d9716 100644 --- a/general/package/Config.in +++ b/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" diff --git a/general/package/datalink/Config.in b/general/package/legacy/datalink/Config.in similarity index 100% rename from general/package/datalink/Config.in rename to general/package/legacy/datalink/Config.in diff --git a/general/package/datalink/datalink.mk b/general/package/legacy/datalink/datalink.mk similarity index 100% rename from general/package/datalink/datalink.mk rename to general/package/legacy/datalink/datalink.mk diff --git a/general/package/datalink/files/S98datalink b/general/package/legacy/datalink/files/S98datalink similarity index 100% rename from general/package/datalink/files/S98datalink rename to general/package/legacy/datalink/files/S98datalink diff --git a/general/package/datalink/files/datalink.conf b/general/package/legacy/datalink/files/datalink.conf similarity index 100% rename from general/package/datalink/files/datalink.conf rename to general/package/legacy/datalink/files/datalink.conf diff --git a/general/package/datalink/files/telemetry b/general/package/legacy/datalink/files/telemetry similarity index 100% rename from general/package/datalink/files/telemetry rename to general/package/legacy/datalink/files/telemetry diff --git a/general/package/datalink/files/telemetry_drone.conf b/general/package/legacy/datalink/files/telemetry_drone.conf similarity index 100% rename from general/package/datalink/files/telemetry_drone.conf rename to general/package/legacy/datalink/files/telemetry_drone.conf diff --git a/general/package/datalink/files/telemetry_gs.conf b/general/package/legacy/datalink/files/telemetry_gs.conf similarity index 100% rename from general/package/datalink/files/telemetry_gs.conf rename to general/package/legacy/datalink/files/telemetry_gs.conf diff --git a/general/package/datalink/files/tweaksys b/general/package/legacy/datalink/files/tweaksys similarity index 100% rename from general/package/datalink/files/tweaksys rename to general/package/legacy/datalink/files/tweaksys diff --git a/general/package/mavlink-router/000-disable_systemd.patch b/general/package/legacy/mavlink-router/000-disable_systemd.patch similarity index 100% rename from general/package/mavlink-router/000-disable_systemd.patch rename to general/package/legacy/mavlink-router/000-disable_systemd.patch diff --git a/general/package/mavlink-router/001-change_config_location.patch b/general/package/legacy/mavlink-router/001-change_config_location.patch similarity index 100% rename from general/package/mavlink-router/001-change_config_location.patch rename to general/package/legacy/mavlink-router/001-change_config_location.patch diff --git a/general/package/mavlink-router/Config.in b/general/package/legacy/mavlink-router/Config.in similarity index 100% rename from general/package/mavlink-router/Config.in rename to general/package/legacy/mavlink-router/Config.in diff --git a/general/package/mavlink-router/files/S97mavlink b/general/package/legacy/mavlink-router/files/S97mavlink similarity index 100% rename from general/package/mavlink-router/files/S97mavlink rename to general/package/legacy/mavlink-router/files/S97mavlink diff --git a/general/package/mavlink-router/files/mavlink_drone.conf b/general/package/legacy/mavlink-router/files/mavlink_drone.conf similarity index 100% rename from general/package/mavlink-router/files/mavlink_drone.conf rename to general/package/legacy/mavlink-router/files/mavlink_drone.conf diff --git a/general/package/mavlink-router/files/mavlink_gs.conf b/general/package/legacy/mavlink-router/files/mavlink_gs.conf similarity index 100% rename from general/package/mavlink-router/files/mavlink_gs.conf rename to general/package/legacy/mavlink-router/files/mavlink_gs.conf diff --git a/general/package/mavlink-router/files/meson-cross-arm-glibc-hf-openipc.ini b/general/package/legacy/mavlink-router/files/meson-cross-arm-glibc-hf-openipc.ini similarity index 100% rename from general/package/mavlink-router/files/meson-cross-arm-glibc-hf-openipc.ini rename to general/package/legacy/mavlink-router/files/meson-cross-arm-glibc-hf-openipc.ini diff --git a/general/package/mavlink-router/files/meson-cross-arm-glibc-openipc.ini b/general/package/legacy/mavlink-router/files/meson-cross-arm-glibc-openipc.ini similarity index 100% rename from general/package/mavlink-router/files/meson-cross-arm-glibc-openipc.ini rename to general/package/legacy/mavlink-router/files/meson-cross-arm-glibc-openipc.ini diff --git a/general/package/mavlink-router/files/meson-cross-arm-musl-hf-openipc.ini b/general/package/legacy/mavlink-router/files/meson-cross-arm-musl-hf-openipc.ini similarity index 100% rename from general/package/mavlink-router/files/meson-cross-arm-musl-hf-openipc.ini rename to general/package/legacy/mavlink-router/files/meson-cross-arm-musl-hf-openipc.ini diff --git a/general/package/mavlink-router/files/meson-cross-arm-musl-openipc.ini b/general/package/legacy/mavlink-router/files/meson-cross-arm-musl-openipc.ini similarity index 100% rename from general/package/mavlink-router/files/meson-cross-arm-musl-openipc.ini rename to general/package/legacy/mavlink-router/files/meson-cross-arm-musl-openipc.ini diff --git a/general/package/mavlink-router/files/meson-cross-mipsel-musl-openipc.ini b/general/package/legacy/mavlink-router/files/meson-cross-mipsel-musl-openipc.ini similarity index 100% rename from general/package/mavlink-router/files/meson-cross-mipsel-musl-openipc.ini rename to general/package/legacy/mavlink-router/files/meson-cross-mipsel-musl-openipc.ini diff --git a/general/package/mavlink-router/mavlink-router.mk b/general/package/legacy/mavlink-router/mavlink-router.mk similarity index 100% rename from general/package/mavlink-router/mavlink-router.mk rename to general/package/legacy/mavlink-router/mavlink-router.mk diff --git a/general/package/microsnander/Config.in b/general/package/legacy/microsnander/Config.in similarity index 100% rename from general/package/microsnander/Config.in rename to general/package/legacy/microsnander/Config.in diff --git a/general/package/microsnander/microsnander.mk b/general/package/legacy/microsnander/microsnander.mk similarity index 100% rename from general/package/microsnander/microsnander.mk rename to general/package/legacy/microsnander/microsnander.mk diff --git a/general/package/webui/Config.in b/general/package/legacy/webui/Config.in similarity index 100% rename from general/package/webui/Config.in rename to general/package/legacy/webui/Config.in diff --git a/general/package/webui/files/etc/httpd.conf b/general/package/legacy/webui/files/etc/httpd.conf similarity index 100% rename from general/package/webui/files/etc/httpd.conf rename to general/package/legacy/webui/files/etc/httpd.conf diff --git a/general/package/webui/files/init.d/S50httpd b/general/package/legacy/webui/files/init.d/S50httpd similarity index 100% rename from general/package/webui/files/init.d/S50httpd rename to general/package/legacy/webui/files/init.d/S50httpd diff --git a/general/package/webui/files/init.d/S93telegrambot b/general/package/legacy/webui/files/init.d/S93telegrambot similarity index 100% rename from general/package/webui/files/init.d/S93telegrambot rename to general/package/legacy/webui/files/init.d/S93telegrambot diff --git a/general/package/webui/webui.mk b/general/package/legacy/webui/webui.mk similarity index 100% rename from general/package/webui/webui.mk rename to general/package/legacy/webui/webui.mk diff --git a/general/package/wifibroadcast/Config.in b/general/package/legacy/wifibroadcast/Config.in similarity index 100% rename from general/package/wifibroadcast/Config.in rename to general/package/legacy/wifibroadcast/Config.in diff --git a/general/package/wifibroadcast/files/drone.key b/general/package/legacy/wifibroadcast/files/drone.key similarity index 100% rename from general/package/wifibroadcast/files/drone.key rename to general/package/legacy/wifibroadcast/files/drone.key diff --git a/general/package/wifibroadcast/files/gs.key b/general/package/legacy/wifibroadcast/files/gs.key similarity index 100% rename from general/package/wifibroadcast/files/gs.key rename to general/package/legacy/wifibroadcast/files/gs.key diff --git a/general/package/wifibroadcast/files/htc_9271.fw.1 b/general/package/legacy/wifibroadcast/files/htc_9271.fw.1 similarity index 100% rename from general/package/wifibroadcast/files/htc_9271.fw.1 rename to general/package/legacy/wifibroadcast/files/htc_9271.fw.1 diff --git a/general/package/wifibroadcast/files/htc_9271.fw.3 b/general/package/legacy/wifibroadcast/files/htc_9271.fw.3 similarity index 100% rename from general/package/wifibroadcast/files/htc_9271.fw.3 rename to general/package/legacy/wifibroadcast/files/htc_9271.fw.3 diff --git a/general/package/wifibroadcast/files/setmcs b/general/package/legacy/wifibroadcast/files/setmcs similarity index 100% rename from general/package/wifibroadcast/files/setmcs rename to general/package/legacy/wifibroadcast/files/setmcs diff --git a/general/package/wifibroadcast/files/wfb_drone.conf b/general/package/legacy/wifibroadcast/files/wfb_drone.conf similarity index 100% rename from general/package/wifibroadcast/files/wfb_drone.conf rename to general/package/legacy/wifibroadcast/files/wfb_drone.conf diff --git a/general/package/wifibroadcast/files/wfb_gs.conf b/general/package/legacy/wifibroadcast/files/wfb_gs.conf similarity index 100% rename from general/package/wifibroadcast/files/wfb_gs.conf rename to general/package/legacy/wifibroadcast/files/wfb_gs.conf diff --git a/general/package/wifibroadcast/files/wifibroadcast b/general/package/legacy/wifibroadcast/files/wifibroadcast similarity index 100% rename from general/package/wifibroadcast/files/wifibroadcast rename to general/package/legacy/wifibroadcast/files/wifibroadcast diff --git a/general/package/wifibroadcast/wifibroadcast.mk b/general/package/legacy/wifibroadcast/wifibroadcast.mk similarity index 100% rename from general/package/wifibroadcast/wifibroadcast.mk rename to general/package/legacy/wifibroadcast/wifibroadcast.mk diff --git a/general/package/wifibroadcast-ext/Config.in b/general/package/wifibroadcast-ext/Config.in new file mode 100644 index 00000000..519e79b9 --- /dev/null +++ b/general/package/wifibroadcast-ext/Config.in @@ -0,0 +1,4 @@ +config BR2_PACKAGE_WIFIBROADCAST_EXT + bool "wifibroadcast-ext" + help + Additional scripts for wifibroadcast-ng diff --git a/general/package/wifibroadcast-ext/files/S75generate_vtx_info b/general/package/wifibroadcast-ext/files/S75generate_vtx_info new file mode 100755 index 00000000..ea9aac4b --- /dev/null +++ b/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 diff --git a/general/package/wifibroadcast-ng/files/generate_vtx_info.sh b/general/package/wifibroadcast-ext/files/generate_vtx_info old mode 100644 new mode 100755 similarity index 100% rename from general/package/wifibroadcast-ng/files/generate_vtx_info.sh rename to general/package/wifibroadcast-ext/files/generate_vtx_info diff --git a/general/package/wifibroadcast-ng/src/keygen.c b/general/package/wifibroadcast-ext/src/keygen.c similarity index 100% rename from general/package/wifibroadcast-ng/src/keygen.c rename to general/package/wifibroadcast-ext/src/keygen.c diff --git a/general/package/wifibroadcast-ext/wifibroadcast-ext.mk b/general/package/wifibroadcast-ext/wifibroadcast-ext.mk new file mode 100644 index 00000000..268bb637 --- /dev/null +++ b/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)) diff --git a/general/package/wifibroadcast-ng/files/S75generate_vtx_info b/general/package/wifibroadcast-ng/files/S75generate_vtx_info deleted file mode 100644 index b717cae6..00000000 --- a/general/package/wifibroadcast-ng/files/S75generate_vtx_info +++ /dev/null @@ -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 diff --git a/general/package/wifibroadcast-ng/wifibroadcast-ng.mk b/general/package/wifibroadcast-ng/wifibroadcast-ng.mk index 718d9aa5..2c4fcb33 100644 --- a/general/package/wifibroadcast-ng/wifibroadcast-ng.mk +++ b/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/*