From 357d47fa61691b2064f2f5eca6afd3dd76be9ad4 Mon Sep 17 00:00:00 2001 From: Petru Soroaga Date: Tue, 11 Mar 2025 14:10:47 +0200 Subject: [PATCH] Update to Ruby 10.6, update sysupgrade procedure Fix sysupgrade bug, updated Ruby code. The /etc/rc.local.stop (to stop Ruby) is created at runtime by Ruby, if missing. (to cover OTA updates of existing installs too). --- general/overlay/usr/sbin/sysupgrade | 3 --- general/package/rubyfpv/files/ruby_stop.sh | 4 +++- general/package/rubyfpv/files/version_ruby_base.txt | 2 +- general/package/rubyfpv/rubyfpv.mk | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/general/overlay/usr/sbin/sysupgrade b/general/overlay/usr/sbin/sysupgrade index 10ea28fd..7dd21438 100755 --- a/general/overlay/usr/sbin/sysupgrade +++ b/general/overlay/usr/sbin/sysupgrade @@ -98,9 +98,6 @@ download_firmware() { free_resources() { echo_c 37 "\nStop services, sync files, free up memory" - if [ -f /etc/init.d/S73ruby ]; then - /etc/init.d/S73ruby stop - fi killall -q -3 majestic sleep 1 /etc/init.d/S99rc.local stop diff --git a/general/package/rubyfpv/files/ruby_stop.sh b/general/package/rubyfpv/files/ruby_stop.sh index 53394518..35e946c4 100755 --- a/general/package/rubyfpv/files/ruby_stop.sh +++ b/general/package/rubyfpv/files/ruby_stop.sh @@ -1,6 +1,8 @@ +echo -n "Stopping Ruby..." pidof ruby_start | xargs kill -9 2>/dev/null pidof ruby_rx_commands | xargs kill -9 2>/dev/null pidof ruby_tx_telemetry | xargs kill -9 2>/dev/null pidof ruby_rt_vehicle | xargs kill -9 2>/dev/null +pidof ruby_start | xargs kill -9 2>/dev/null pidof ruby_logger | xargs kill -9 2>/dev/null -pidof majestic | xargs kill -9 2>/dev/null +echo "OK" diff --git a/general/package/rubyfpv/files/version_ruby_base.txt b/general/package/rubyfpv/files/version_ruby_base.txt index 9a62de22..12c0281a 100644 --- a/general/package/rubyfpv/files/version_ruby_base.txt +++ b/general/package/rubyfpv/files/version_ruby_base.txt @@ -1 +1 @@ -10.5 +10.6 diff --git a/general/package/rubyfpv/rubyfpv.mk b/general/package/rubyfpv/rubyfpv.mk index 7644baa6..9620d07e 100644 --- a/general/package/rubyfpv/rubyfpv.mk +++ b/general/package/rubyfpv/rubyfpv.mk @@ -6,7 +6,7 @@ RUBYFPV_SITE_METHOD = git RUBYFPV_SITE = https://github.com/PetruSoroaga/RubyFPV -RUBYFPV_VERSION = 0b856c2d26fccbdca8b3cea6f08e92824d423593 +RUBYFPV_VERSION = 00e7101c58f0697a63ba4e572a7b02de0605dad7 RUBYFPV_DEPENDENCIES += libpcap iw