Merge branch 'master' of https://github.com/PetruSoroaga/firmware

.github/workflows/build.yml

@@ -45,9 +45,11 @@ jobs:
           - {"platform": "ssc30kd", "release": "lite"}
           - {"platform": "ssc30kd", "release": "ultimate"}
           - {"platform": "ssc30kq", "release": "fpv"}
+          - {"platform": "ssc30kq", "release": "rubyfpv"}
           - {"platform": "ssc30kq", "release": "lite"}
           - {"platform": "ssc30kq", "release": "ultimate"}
           - {"platform": "ssc338q", "release": "fpv"}
+          - {"platform": "ssc338q", "release": "rubyfpv"}
           - {"platform": "ssc338q", "release": "lite"}
           - {"platform": "ssc338q", "release": "ultimate"}
 
@@ -128,14 +130,17 @@ jobs:
           - {"platform": "gk7202v300", "release": "lite"}
           - {"platform": "gk7205v200", "release": "lte"}
           - {"platform": "gk7205v200", "release": "fpv"}
+          - {"platform": "gk7205v200", "release": "rubyfpv"}
           - {"platform": "gk7205v200", "release": "venc"}
           - {"platform": "gk7205v200", "release": "lite"}
           - {"platform": "gk7205v200", "release": "ultimate"}
           - {"platform": "gk7205v210", "release": "fpv"}
+          - {"platform": "gk7205v210", "release": "rubyfpv"}
           - {"platform": "gk7205v210", "release": "venc"}
           - {"platform": "gk7205v210", "release": "lite"}
           - {"platform": "gk7205v300", "release": "lte"}
           - {"platform": "gk7205v300", "release": "fpv"}
+          - {"platform": "gk7205v300", "release": "rubyfpv"}
           - {"platform": "gk7205v300", "release": "venc"}
           - {"platform": "gk7205v300", "release": "lite"}
           - {"platform": "gk7205v300", "release": "ultimate"}

br-ext-chip-sigmastar/board/infinity6/kernel/infinity6-ssc009a.config

@@ -1853,7 +1853,7 @@ CONFIG_MS_ZEN=y
 CONFIG_MS_SERIAL=y
 # CONFIG_MS_USCLK is not set
 CONFIG_MS_FLASH_ISP=y
-CONFIG_MS_FLASH_ISP_MXP_PARTS=y
+# CONFIG_MS_FLASH_ISP_MXP_PARTS is not set
 CONFIG_MS_PWM=y
 CONFIG_MS_SPINAND=y
 # CONFIG_NAND_SINGLE_READ is not set

br-ext-chip-sigmastar/board/infinity6/kernel/infinity6-ssc009b.config

@@ -1853,7 +1853,7 @@ CONFIG_MS_ZEN=y
 CONFIG_MS_SERIAL=y
 # CONFIG_MS_USCLK is not set
 CONFIG_MS_FLASH_ISP=y
-CONFIG_MS_FLASH_ISP_MXP_PARTS=y
+# CONFIG_MS_FLASH_ISP_MXP_PARTS is not set
 CONFIG_MS_PWM=y
 CONFIG_MS_SPINAND=y
 # CONFIG_NAND_SINGLE_READ is not set

br-ext-chip-sigmastar/board/infinity6b0/kernel/infinity6b0-ssc009a.config

@@ -1877,7 +1877,7 @@ CONFIG_MS_ZEN=y
 CONFIG_MS_SERIAL=y
 # CONFIG_MS_USCLK is not set
 CONFIG_MS_FLASH_ISP=y
-CONFIG_MS_FLASH_ISP_MXP_PARTS=y
+# CONFIG_MS_FLASH_ISP_MXP_PARTS is not set
 CONFIG_MS_PWM=y
 # CONFIG_PWM_NEW is not set
 CONFIG_MS_SPINAND=y

br-ext-chip-sigmastar/board/infinity6b0/kernel/infinity6b0-ssc009b.config

@@ -1877,7 +1877,7 @@ CONFIG_MS_ZEN=y
 CONFIG_MS_SERIAL=y
 # CONFIG_MS_USCLK is not set
 CONFIG_MS_FLASH_ISP=y
-CONFIG_MS_FLASH_ISP_MXP_PARTS=y
+# CONFIG_MS_FLASH_ISP_MXP_PARTS is not set
 CONFIG_MS_PWM=y
 # CONFIG_PWM_NEW is not set
 CONFIG_MS_SPINAND=y

br-ext-chip-sigmastar/board/infinity6e/kernel/infinity6e-ssc012b.config

@@ -1887,7 +1887,7 @@ CONFIG_MS_ZEN=y
 CONFIG_MS_SERIAL=y
 # CONFIG_MS_USCLK is not set
 CONFIG_MS_FLASH_ISP=y
-CONFIG_MS_FLASH_ISP_MXP_PARTS=y
+# CONFIG_MS_FLASH_ISP_MXP_PARTS is not set
 CONFIG_MS_PWM=y
 # CONFIG_PWM_NEW is not set
 CONFIG_MS_SPINAND=y

general/external.mk

@@ -9,6 +9,6 @@ EXTERNAL_VENDOR := $(BR2_EXTERNAL)/../br-ext-chip-$(OPENIPC_SOC_VENDOR)
 OPENIPC_TOOLCHAIN := latest/$(shell $(BR2_EXTERNAL)/scripts/show_toolchains.sh $(BR2_DEFCONFIG))
 OPENIPC_KERNEL := $(OPENIPC_SOC_VENDOR)-$(OPENIPC_SOC_FAMILY)
 
-export WGET := wget -q --show-progress --passive-ftp -nd -t3 -T5
+export WGET := wget --show-progress --passive-ftp -nd -t5 -T5
 
 include $(sort $(wildcard $(BR2_EXTERNAL)/package/*/*.mk))

general/overlay/etc/init.d/S01syslogd

@@ -2,38 +2,27 @@
 
 DAEMON="syslogd"
 PIDFILE="/var/run/$DAEMON.pid"
-
 SYSLOGD_ARGS="-C64 -t"
 
-# shellcheck source=/dev/null
-[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON"
-
-# BusyBox' syslogd does not create a pidfile, so pass "-n" in the command line
-# and use "-m" to instruct start-stop-daemon to create one.
 start() {
-	printf 'Starting %s: ' "$DAEMON"
-	# shellcheck disable=SC2086 # we need the word splitting
+	printf "Starting $DAEMON: "
 	start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/sbin/$DAEMON" -- -n $SYSLOGD_ARGS
-	status=$?
-	if [ "$status" -eq 0 ]; then
+	if [ $? = 0 ]; then
 		echo "OK"
 	else
 		echo "FAIL"
 	fi
-	return "$status"
 }
 
 stop() {
-	printf 'Stopping %s: ' "$DAEMON"
+	printf "Stopping $DAEMON: "
 	start-stop-daemon -K -q -p "$PIDFILE"
-	status=$?
-	if [ "$status" -eq 0 ]; then
+	if [ $? = 0 ]; then
 		rm -f "$PIDFILE"
 		echo "OK"
 	else
 		echo "FAIL"
 	fi
-	return "$status"
 }
 
 case "$1" in

general/overlay/etc/init.d/S21rngd

@@ -1,27 +1,23 @@
 #!/bin/sh
 
-NAME="rngd"
-DAEMON="/usr/sbin/${NAME}"
-DAEMON_ARGS="-r /dev/urandom"
-CFG_FILE="/etc/default/${NAME}"
-PID_FILE="/var/run/${NAME}.pid"
-
-# Read configuration variable file if it is present
-[ -r "${CFG_FILE}" ] && . "${CFG_FILE}"
+DAEMON="rngd"
+PIDFILE="/var/run/$DAEMON.pid"
+RNGD_ARGS="-r /dev/urandom"
 
 start() {
-	printf "Starting ${NAME}: "
-	start-stop-daemon -S -q -x "${DAEMON}" -- ${DAEMON_ARGS}
-	[ $? = 0 ] && echo "OK" || echo "FAIL"
+	printf "Starting $DAEMON: "
+	start-stop-daemon -S -q -x "/usr/sbin/$DAEMON" -- $RNGD_ARGS
+	if [ $? = 0 ]; then
+		echo "OK"
+	else
+		echo "FAIL"
+	fi
 }
 
 stop() {
-	printf "Stopping ${NAME}: "
-	# This daemon does not exit properly with the default TERM signal unless
-	# it's forced to work by something reading /dev/random. Killing it and
-	# removing its PID file is more straightforward.
-	if start-stop-daemon -K -q -s KILL -p "${PID_FILE}" -n "${NAME}"; then
-		rm -f "${PID_FILE}"
+	printf "Stopping $DAEMON: "
+	start-stop-daemon -K -q -n "$DAEMON"
+	if [ $? = 0 ]; then
 		echo "OK"
 	else
 		echo "FAIL"
@@ -35,11 +31,12 @@ case "$1" in
 
 	restart|reload)
 		stop
+		sleep 1
 		start
 		;;
 
 	*)
-		echo "Usage: $0 {start|stop|restart|reload}" >&2
+		echo "Usage: $0 {start|stop|restart|reload}"
 		exit 1
 		;;
 esac

general/overlay/etc/init.d/S30customizer

@@ -14,9 +14,4 @@ case "$1" in
 			touch /etc/network.ok
 		fi
 		;;
-
-	*)
-		echo "Usage: $0 {start}"
-		exit 1
-		;;
 esac

general/overlay/etc/init.d/S35modules

@@ -2,9 +2,7 @@
 
 case "$1" in
 	start)
-		printf "Loading modules:"
-		# load modules for detected devices
-		# find /sys/ -name modalias -print0 | xargs -0 sort -u -z | xargs -0 modprobe -abq
+		echo "Loading modules..."
 
 		# load modules from /etc/modules
 		[ -r /etc/modules ] || exit 0

general/overlay/etc/init.d/S40mdev

@@ -6,11 +6,4 @@ case "$1" in
 		echo /sbin/mdev > /proc/sys/kernel/hotplug
 		/sbin/mdev -s
 		;;
-
-	*)
-		echo "Usage: $0 {start}"
-		exit 1
-		;;
 esac
-
-exit $?

general/overlay/etc/init.d/S40network

@@ -46,5 +46,3 @@ case "$1" in
 		exit 1
 		;;
 esac
-
-exit 0

general/overlay/etc/init.d/S49ntpd

@@ -2,38 +2,27 @@
 
 DAEMON="ntpd"
 PIDFILE="/var/run/$DAEMON.pid"
-
 NTPD_ARGS="-n"
 
-# shellcheck source=/dev/null
-[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON"
-
-# BusyBox' ntpd does not create a pidfile, so pass "-n" in the command line
-# and use "-m" to instruct start-stop-daemon to create one.
 start() {
-	printf 'Starting %s: ' "$DAEMON"
-	# shellcheck disable=SC2086 # we need the word splitting
+	printf "Starting $DAEMON: "
 	start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/sbin/$DAEMON" -- $NTPD_ARGS
-	status=$?
-	if [ "$status" -eq 0 ]; then
+	if [ $? = 0 ]; then
 		echo "OK"
 	else
 		echo "FAIL"
 	fi
-	return "$status"
 }
 
 stop() {
-	printf 'Stopping %s: ' "$DAEMON"
+	printf "Stopping $DAEMON: "
 	start-stop-daemon -K -q -p "$PIDFILE"
-	status=$?
-	if [ "$status" -eq 0 ]; then
+	if [ $? = 0 ]; then
 		rm -f "$PIDFILE"
 		echo "OK"
 	else
 		echo "FAIL"
 	fi
-	return "$status"
 }
 
 case "$1" in
@@ -41,7 +30,7 @@ case "$1" in
 		"$1"
 		;;
 
-	reload)
+	restart|reload)
 		stop
 		sleep 1
 		start

general/overlay/etc/init.d/S50dropbear

@@ -1,14 +1,10 @@
 #!/bin/sh
-#
-# Starts dropbear sshd.
-#
 
-# Allow a few customizations from a config file
-test -r /etc/default/dropbear && . /etc/default/dropbear
+DAEMON="dropbear"
+PIDFILE="/var/run/$DAEMON.pid"
+DROPBEAR_ARGS="-R -B -k -p 22 -K 300"
 
 start() {
-	DROPBEAR_ARGS="$DROPBEAR_ARGS -R -B -k -p 22 -K 300"
-
 	# If /etc/dropbear is a symlink to /var/run/dropbear, and
 	#   - the filesystem is RO (i.e. we can not rm the symlink),
 	#     create the directory pointed to by the symlink.
@@ -24,17 +20,25 @@ start() {
 		fi
 	fi
 
-	printf "Starting dropbear sshd: "
+	printf "Starting $DAEMON: "
 	umask 077
 
-	start-stop-daemon -S -q -p /var/run/dropbear.pid --exec /usr/sbin/dropbear -- $DROPBEAR_ARGS
-	[ $? = 0 ] && echo "OK" || echo "FAIL"
+	start-stop-daemon -S -q -p "$PIDFILE" -x "/usr/sbin/$DAEMON" -- $DROPBEAR_ARGS
+	if [ $? = 0 ]; then
+		echo "OK"
+	else
+		echo "FAIL"
+	fi
 }
 
 stop() {
-	printf "Stopping dropbear sshd: "
-	start-stop-daemon -K -q -p /var/run/dropbear.pid
-	[ $? = 0 ] && echo "OK" || echo "FAIL"
+	printf "Stopping $DAEMON: "
+	start-stop-daemon -K -q -p "$PIDFILE"
+	if [ $? = 0 ]; then
+		echo "OK"
+	else
+		echo "FAIL"
+	fi
 }
 
 case "$1" in
@@ -44,6 +48,7 @@ case "$1" in
 
 	restart|reload)
 		stop
+		sleep 1
 		start
 		;;
 
@@ -52,5 +57,3 @@ case "$1" in
 		exit 1
 		;;
 esac
-
-exit $?

general/overlay/etc/init.d/S60crond

@@ -2,40 +2,27 @@
 
 DAEMON="crond"
 PIDFILE="/var/run/$DAEMON.pid"
-
 CROND_ARGS="-f -c /etc/crontabs"
 
-# shellcheck source=/dev/null
-[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON"
-
-# The mini-snmpd does not create a pidfile, so pass "-n" in the command line
-# and use "-m" to instruct start-stop-daemon to create one.
 start() {
-	printf 'Starting %s: ' "$DAEMON"
-	[ -f /usr/sbin/$DAEMON ] || echo -en "DISABLED, "
-	# shellcheck disable=SC2086 # we need the word splitting
+	printf "Starting $DAEMON: "
 	start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/sbin/$DAEMON" -- $CROND_ARGS
-	status=$?
-	if [ "$status" -eq 0 ]; then
+	if [ $? = 0 ]; then
 		echo "OK"
 	else
 		echo "FAIL"
 	fi
-	return "$status"
 }
 
 stop() {
-	printf 'Stopping %s: ' "$DAEMON"
-	[ -f /usr/sbin/$DAEMON ] || echo -en "DISABLED, "
+	printf "Stopping $DAEMON: "
 	start-stop-daemon -K -q -p "$PIDFILE"
-	status=$?
-	if [ "$status" -eq 0 ]; then
+	if [ $? = 0 ]; then
 		rm -f "$PIDFILE"
 		echo "OK"
 	else
 		echo "FAIL"
 	fi
-	return "$status"
 }
 
 case "$1" in

general/overlay/etc/init.d/S70vendor

@@ -1,6 +1,4 @@
 #!/bin/sh
-
-# load vendor specific drivers
 vendor=$(ipcinfo -v)
 
 log_vendor() {
@@ -11,7 +9,7 @@ case "$1" in
 	start)
 		[ "${vendor}" = "goke" ] || [ "${vendor}" = "hisilicon" ] && status=$(check_mac)
 		[ -n "${status}" ] && log_vendor "${status}"
-		echo -e '\nLoading of kernel modules...'
+		echo -e "\nLoading vendor modules..."
 		load_${vendor} -i
 		;;
 esac

general/overlay/etc/init.d/rcK

@@ -0,0 +1,23 @@
+#!/bin/sh
+
+# Stop all init scripts in /etc/init.d executing them in reversed numerical order.
+for i in $(ls -r /etc/init.d/S??*); do
+	# Ignore dangling symlinks (if any).
+	[ ! -f "$i" ] && continue
+
+	case "$i" in
+		*.sh)
+			# Source shell script for speed.
+			(
+				trap - INT QUIT TSTP
+				set stop
+				. $i
+			)
+			;;
+
+		*)
+			# No sh extension, so fork subprocess.
+			$i stop
+			;;
+	esac
+done

general/overlay/etc/init.d/rcS

@@ -7,8 +7,7 @@ export TZ=$(cat /etc/TZ)
 # Set the firmware creation time as the base system time
 /bin/date -s @$(stat -t /etc/os-release | cut -d" " -f12)
 
-# Start all init scripts in /etc/init.d
-# executing them in numerical order.
+# Start all init scripts in /etc/init.d executing them in numerical order.
 for i in /etc/init.d/S??*; do
 	# Ignore dangling symlinks (if any).
 	[ ! -f "$i" ] && continue
@@ -19,7 +18,7 @@ for i in /etc/init.d/S??*; do
 			(
 				trap - INT QUIT TSTP
 				set start
-				$i
+				. $i
 			)
 			;;
 

general/overlay/usr/sbin/sysupgrade

@@ -108,6 +108,7 @@ free_resources() {
 	fi
 	/etc/init.d/S60crond stop
 	/etc/init.d/S49ntpd stop
+	/etc/init.d/S21rngd stop
 	/etc/init.d/S02klogd stop
 	/etc/init.d/S01syslogd stop
 	sleep 1

general/package/majestic/files/S95majestic

@@ -2,7 +2,7 @@
 
 DAEMON="majestic"
 PIDFILE="/var/run/$DAEMON.pid"
-DAEMON_ARGS="-s"
+MAJESTIC_ARGS="-s"
 
 debug_majestic() {
 	[ -f /etc/coredump.conf ] && . /etc/coredump.conf
@@ -13,9 +13,8 @@ debug_majestic() {
 
 load_majestic() {
 	printf "Starting $DAEMON: "
-	start-stop-daemon -b -S -m -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" -- $DAEMON_ARGS
-	status=$?
-	if [ "$status" -eq 0 ]; then
+	start-stop-daemon -b -S -m -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" -- $MAJESTIC_ARGS
+	if [ $? = 0 ]; then
 		echo "OK"
 	else
 		echo "FAIL"
@@ -23,7 +22,7 @@ load_majestic() {
 }
 
 start() {
-	logger -s -p daemon.info -t $(ipcinfo -v) "Loading video system has started..."
+	logger -s -p daemon.info -t $(ipcinfo -v) "Loading video system..."
 	export SENSOR=$(fw_printenv -n sensor)
 	debug_majestic
 	load_majestic
@@ -32,8 +31,7 @@ start() {
 stop() {
 	printf "Stopping $DAEMON: "
 	start-stop-daemon -K -q -p "$PIDFILE"
-	status=$?
-	if [ "$status" -eq 0 ]; then
+	if [ $? = 0 ]; then
 		rm -f "$PIDFILE"
 		echo "OK"
 	else

general/package/rubyfpv/files/S73ruby

@@ -17,7 +17,7 @@ case "$1" in
 	fi
 
 	echo "Starting Ruby..." >> /tmp/ruby_boot.log
-	/usr/sbin/ruby_start&
+	/usr/sbin/ruby_start &
 	;;
   stop)
 	echo "Stopping Ruby..." >> /tmp/ruby_boot.log