Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to Ruby 10.6, update sysupgrade procedure #1750

Merged
merged 1 commit into from
Mar 11, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions general/overlay/usr/sbin/sysupgrade
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion general/package/rubyfpv/files/ruby_stop.sh
Original file line number Diff line number Diff line change
@@ -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"
2 changes: 1 addition & 1 deletion general/package/rubyfpv/files/version_ruby_base.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.5
10.6
2 changes: 1 addition & 1 deletion general/package/rubyfpv/rubyfpv.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down