diff --git a/br-ext-chip-goke/configs/gk7205v200_rubyfpv_defconfig b/br-ext-chip-goke/configs/gk7205v200_rubyfpv_defconfig index 8c65d6da..64ac14a1 100644 --- a/br-ext-chip-goke/configs/gk7205v200_rubyfpv_defconfig +++ b/br-ext-chip-goke/configs/gk7205v200_rubyfpv_defconfig @@ -65,13 +65,13 @@ BR2_PACKAGE_HISILICON_OPENSDK=y BR2_PACKAGE_IPCTOOL=y BR2_PACKAGE_JSON_C=y # BR2_PACKAGE_JSONFILTER is not set -# BR2_PACKAGE_LIBCURL_OPENIPC=y -# BR2_PACKAGE_LIBCURL_OPENIPC_CURL=y +BR2_PACKAGE_LIBCURL_OPENIPC=y +BR2_PACKAGE_LIBCURL_OPENIPC_CURL=y # BR2_PACKAGE_LIBCURL_OPENIPC_VERBOSE is not set # BR2_PACKAGE_LIBCURL_OPENIPC_PROXY_SUPPORT is not set # BR2_PACKAGE_LIBCURL_OPENIPC_COOKIES_SUPPORT is not set # BR2_PACKAGE_LIBCURL_OPENIPC_EXTRA_PROTOCOLS_FEATURES is not set -# BR2_PACKAGE_LIBCURL_OPENIPC_MBEDTLS=y +BR2_PACKAGE_LIBCURL_OPENIPC_MBEDTLS=y BR2_PACKAGE_LIBEVENT_OPENIPC=y BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y BR2_PACKAGE_LIBYAML=y diff --git a/br-ext-chip-goke/configs/gk7205v210_rubyfpv_defconfig b/br-ext-chip-goke/configs/gk7205v210_rubyfpv_defconfig index 5cf2beb7..3647c944 100644 --- a/br-ext-chip-goke/configs/gk7205v210_rubyfpv_defconfig +++ b/br-ext-chip-goke/configs/gk7205v210_rubyfpv_defconfig @@ -65,13 +65,13 @@ BR2_PACKAGE_HISILICON_OPENSDK=y BR2_PACKAGE_IPCTOOL=y BR2_PACKAGE_JSON_C=y # BR2_PACKAGE_JSONFILTER is not set -# BR2_PACKAGE_LIBCURL_OPENIPC=y -# BR2_PACKAGE_LIBCURL_OPENIPC_CURL=y +BR2_PACKAGE_LIBCURL_OPENIPC=y +BR2_PACKAGE_LIBCURL_OPENIPC_CURL=y # BR2_PACKAGE_LIBCURL_OPENIPC_VERBOSE is not set # BR2_PACKAGE_LIBCURL_OPENIPC_PROXY_SUPPORT is not set # BR2_PACKAGE_LIBCURL_OPENIPC_COOKIES_SUPPORT is not set # BR2_PACKAGE_LIBCURL_OPENIPC_EXTRA_PROTOCOLS_FEATURES is not set -# BR2_PACKAGE_LIBCURL_OPENIPC_MBEDTLS=y +BR2_PACKAGE_LIBCURL_OPENIPC_MBEDTLS=y BR2_PACKAGE_LIBEVENT_OPENIPC=y BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y BR2_PACKAGE_LIBYAML=y diff --git a/br-ext-chip-goke/configs/gk7205v300_rubyfpv_defconfig b/br-ext-chip-goke/configs/gk7205v300_rubyfpv_defconfig index 06e24f45..cc9c6297 100644 --- a/br-ext-chip-goke/configs/gk7205v300_rubyfpv_defconfig +++ b/br-ext-chip-goke/configs/gk7205v300_rubyfpv_defconfig @@ -65,13 +65,13 @@ BR2_PACKAGE_HISILICON_OPENSDK=y BR2_PACKAGE_IPCTOOL=y BR2_PACKAGE_JSON_C=y # BR2_PACKAGE_JSONFILTER is not set -# BR2_PACKAGE_LIBCURL_OPENIPC=y -# BR2_PACKAGE_LIBCURL_OPENIPC_CURL=y +BR2_PACKAGE_LIBCURL_OPENIPC=y +BR2_PACKAGE_LIBCURL_OPENIPC_CURL=y # BR2_PACKAGE_LIBCURL_OPENIPC_VERBOSE is not set # BR2_PACKAGE_LIBCURL_OPENIPC_PROXY_SUPPORT is not set # BR2_PACKAGE_LIBCURL_OPENIPC_COOKIES_SUPPORT is not set # BR2_PACKAGE_LIBCURL_OPENIPC_EXTRA_PROTOCOLS_FEATURES is not set -# BR2_PACKAGE_LIBCURL_OPENIPC_MBEDTLS=y +BR2_PACKAGE_LIBCURL_OPENIPC_MBEDTLS=y BR2_PACKAGE_LIBEVENT_OPENIPC=y BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y BR2_PACKAGE_LIBYAML=y diff --git a/general/package/rubyfpv/rubyfpv.mk b/general/package/rubyfpv/rubyfpv.mk index 532c857c..58a08d5e 100644 --- a/general/package/rubyfpv/rubyfpv.mk +++ b/general/package/rubyfpv/rubyfpv.mk @@ -1,6 +1,6 @@ RUBYFPV_SITE_METHOD = git RUBYFPV_SITE = https://github.com/PetruSoroaga/RubyFPV -RUBYFPV_VERSION = dca5c9ff9ca9a06bbf5289639f0a6e0715f77471 +RUBYFPV_VERSION = 457e26be5061ed36f16d8b312cef4b98361f5d97 RUBYFPV_DEPENDENCIES += libpcap iw @@ -21,7 +21,6 @@ define RUBYFPV_INSTALL_TARGET_CMDS $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/sbin $(@D)/ruby_logger $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/sbin $(@D)/ruby_rt_vehicle $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/sbin $(@D)/ruby_tx_telemetry - $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/sbin $(@D)/ruby_rx_commands $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/sbin $(RUBYFPV_PKGDIR)/files/ruby_stop.sh $(INSTALL) -m 644 -t $(TARGET_DIR)/usr/sbin $(RUBYFPV_PKGDIR)/files/version_ruby_base.txt diff --git a/general/scripts/rootfs_script.sh b/general/scripts/rootfs_script.sh index 117c1102..328f456d 100755 --- a/general/scripts/rootfs_script.sh +++ b/general/scripts/rootfs_script.sh @@ -7,7 +7,7 @@ date +GITHUB_VERSION="\"${GIT_BRANCH-local}+${GIT_HASH-build}, %Y-%m-%d"\" >> ${ echo BUILD_OPTION=${OPENIPC_VARIANT} >> ${FILE} date +TIME_STAMP=%s >> ${FILE} -CONF="USES_GLIBC=y|INGENIC_OSDRV_T30=y|LIBV4L=y|MAVLINK_ROUTER=y|RUBYFPV=y|WIFIBROADCAST=y|WEBRTC_AUDIO_PROCESSING=y" +CONF="USES_GLIBC=y|INGENIC_OSDRV_T30=y|LIBV4L=y|MAVLINK_ROUTER=y|RUBYFPV=y|WEBRTC_AUDIO_PROCESSING=y|WIFIBROADCAST=y" if ! grep -qP ${CONF} ${BR2_CONFIG}; then rm -f ${TARGET_DIR}/usr/lib/libstdc++* fi