From c3d525d4be5e10ceeb85eb841b0afc5be914efba Mon Sep 17 00:00:00 2001
From: cronyx <xcronyx@gmail.com>
Date: Sun, 17 Mar 2024 16:26:05 +0300
Subject: [PATCH] minimize rubyfpv mk (#1347)
---
general/package/rubyfpv/files/ruby_stop.sh | 0
general/package/rubyfpv/rubyfpv.mk | 35 +++++++------------
.../scripts/excludes/gk7205v200_rubyfpv.list | 1 +
.../scripts/excludes/gk7205v210_rubyfpv.list | 1 +
.../scripts/excludes/gk7205v300_rubyfpv.list | 1 +
5 files changed, 16 insertions(+), 22 deletions(-)
mode change 100644 => 100755 general/package/rubyfpv/files/ruby_stop.sh
create mode 120000 general/scripts/excludes/gk7205v200_rubyfpv.list
create mode 120000 general/scripts/excludes/gk7205v210_rubyfpv.list
create mode 120000 general/scripts/excludes/gk7205v300_rubyfpv.list
diff --git a/general/package/rubyfpv/files/ruby_stop.sh b/general/package/rubyfpv/files/ruby_stop.sh
old mode 100644
new mode 100755
diff --git a/general/package/rubyfpv/rubyfpv.mk b/general/package/rubyfpv/rubyfpv.mk
index 08ad8beb..532c857c 100644
--- a/general/package/rubyfpv/rubyfpv.mk
+++ b/general/package/rubyfpv/rubyfpv.mk
@@ -8,37 +8,28 @@ RUBYFPV_MAKE_OPTS = \
CC="$(TARGET_CC)" \
CXX="$(TARGET_CXX)"
-define RUBYFPV_EXTRACT_CMDS
- cd $(RUBYFPV_DL_DIR); tar -xf rubyfpv-$(RUBYFPV_VERSION)-br1.tar.gz -S
- cp -avr $(RUBYFPV_DL_DIR)/rubyfpv-$(RUBYFPV_VERSION)/* $(@D)
- cd $(@D); cp -avr $(RUBYFPV_PKGDIR)/files/* $(@D)/
-endef
-
-
define RUBYFPV_BUILD_CMDS
$(MAKE) $(RUBYFPV_MAKE_OPTS) -C $(@D) vehicle RUBY_BUILD_ENV=openipc
endef
define RUBYFPV_INSTALL_TARGET_CMDS
$(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d
+ $(INSTALL) -m 755 -t $(TARGET_DIR)/etc/init.d $(RUBYFPV_PKGDIR)/files/S73ruby
+
$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/sbin
+ $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/sbin $(@D)/ruby_start
+ $(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
+
$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin
+ $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(RUBYFPV_PKGDIR)/files/tweaksys
+
$(INSTALL) -m 755 -d $(TARGET_DIR)/root/ruby/licenses
-
- cp $(RUBYFPV_PKGDIR)/files/S73ruby $(TARGET_DIR)/etc/init.d
- chmod 755 $(TARGET_DIR)/etc/init.d/S73ruby
-
- install -m 0755 -D $(@D)/ruby_start $(TARGET_DIR)/usr/sbin/ruby_start
- install -m 0755 -D $(@D)/ruby_logger $(TARGET_DIR)/usr/sbin/ruby_logger
- install -m 0755 -D $(@D)/ruby_rt_vehicle $(TARGET_DIR)/usr/sbin/ruby_rt_vehicle
- install -m 0755 -D $(@D)/ruby_tx_telemetry $(TARGET_DIR)/usr/sbin/ruby_tx_telemetry
- install -m 0755 -D $(@D)/ruby_rx_commands $(TARGET_DIR)/usr/sbin/ruby_rx_commands
-
- cp $(RUBYFPV_PKGDIR)/files/ruby_stop.sh $(TARGET_DIR)/usr/sbin
- chmod 755 $(TARGET_DIR)/usr/sbin/ruby_stop.sh
- cp $(RUBYFPV_PKGDIR)/files/tweaksys $(TARGET_DIR)/usr/bin
- $(INSTALL) -m 644 -D $(@D)/licenses/* $(TARGET_DIR)/root/ruby/licenses
- cp $(RUBYFPV_PKGDIR)/files/version_ruby_base.txt $(TARGET_DIR)/usr/sbin
+ $(INSTALL) -m 644 -t $(TARGET_DIR)/root/ruby/licenses $(@D)/licenses/*
endef
$(eval $(generic-package))
diff --git a/general/scripts/excludes/gk7205v200_rubyfpv.list b/general/scripts/excludes/gk7205v200_rubyfpv.list
new file mode 120000
index 00000000..34fd8aa0
--- /dev/null
+++ b/general/scripts/excludes/gk7205v200_rubyfpv.list
@@ -0,0 +1 @@
+gk7205v200_fpv.list
\ No newline at end of file
diff --git a/general/scripts/excludes/gk7205v210_rubyfpv.list b/general/scripts/excludes/gk7205v210_rubyfpv.list
new file mode 120000
index 00000000..34fd8aa0
--- /dev/null
+++ b/general/scripts/excludes/gk7205v210_rubyfpv.list
@@ -0,0 +1 @@
+gk7205v200_fpv.list
\ No newline at end of file
diff --git a/general/scripts/excludes/gk7205v300_rubyfpv.list b/general/scripts/excludes/gk7205v300_rubyfpv.list
new file mode 120000
index 00000000..34fd8aa0
--- /dev/null
+++ b/general/scripts/excludes/gk7205v300_rubyfpv.list
@@ -0,0 +1 @@
+gk7205v200_fpv.list
\ No newline at end of file