From f82578174385cf57784b2f7282fbed62a9cf25bc Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Mon, 14 Mar 2022 08:45:45 +0100
Subject: [PATCH] Clean RUTX unused files and change for sysupgrade

---
 .../base-files/lib/preinit/82_modem_power     |  20 ---
 .../base-files/lib/upgrade/platform.sh        |   4 +-
 .../target/linux/ipq40xx/base-files/sbin/mctl | 120 ------------------
 .../ipq40xx/base-files/sbin/user_defaults     |  14 --
 4 files changed, 3 insertions(+), 155 deletions(-)
 delete mode 100644 root/target/linux/ipq40xx/base-files/lib/preinit/82_modem_power
 delete mode 100755 root/target/linux/ipq40xx/base-files/sbin/mctl
 delete mode 100755 root/target/linux/ipq40xx/base-files/sbin/user_defaults

diff --git a/root/target/linux/ipq40xx/base-files/lib/preinit/82_modem_power b/root/target/linux/ipq40xx/base-files/lib/preinit/82_modem_power
deleted file mode 100644
index 7db2ecf2..00000000
--- a/root/target/linux/ipq40xx/base-files/lib/preinit/82_modem_power
+++ /dev/null
@@ -1,20 +0,0 @@
-set_state() {
-	local label="$1"
-	local disable
-
-	[ -e "/sys/class/gpio/${label}_power/value" ] || return
-
-	config_get disable ${label} disable
-	[ "${disable}" -eq 1 ] && \
-		/sbin/mctl -s -m "${label}" || \
-		/sbin/mctl -p -m "${label}"
-}
-
-do_power_modem() {
-	[ -z "$(uci -q get system.modem.disable)" ] && /sbin/mctl -p || {
-		config_load system
-		config_foreach set_state mctl
-	}
-}
-
-boot_hook_add preinit_main do_power_modem
diff --git a/root/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh b/root/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
index cb8d7658..70dc76ae 100644
--- a/root/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
+++ b/root/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
@@ -184,7 +184,9 @@ platform_do_upgrade() {
 		PART_NAME="inactive"
 		platform_do_upgrade_dualboot_datachk "$1"
 		;;
-	teltonika,rutx |\
+	teltonika,rutx)
+		platform_do_upgrade_ipq "$1"
+		;;
 	zte,mf286d)
 		CI_UBIPART="rootfs"
 		nand_do_upgrade "$1"
diff --git a/root/target/linux/ipq40xx/base-files/sbin/mctl b/root/target/linux/ipq40xx/base-files/sbin/mctl
deleted file mode 100755
index f501cc2e..00000000
--- a/root/target/linux/ipq40xx/base-files/sbin/mctl
+++ /dev/null
@@ -1,120 +0,0 @@
-#!/bin/sh
-
-. /usr/share/libubox/jshn.sh
-
-PS_ON=1
-PS_OFF=2
-
-MPS=0
-MLBL="modem"
-
-modem_reset() {
-	local label="$1"
-
-	[ -e "/sys/class/gpio/${label}_reset/value" ] || return
-
-	echo 1 > "/sys/class/gpio/${label}_reset/value"
-	sleep 1
-	echo 0 > "/sys/class/gpio/${label}_reset/value"
-}
-
-modem_off() {
-	local label="$1"
-
-	[ -e "/sys/class/gpio/${label}_reset/value" ] || return
-
-	echo 1 > "/sys/class/gpio/${label}_reset/value"
-}
-
-modem_power() {
-	local label="$1"
-
-	[ -e "/sys/class/gpio/${label}_power/value" ] || return
-
-	# simulate power press
-	echo 1 > "/sys/class/gpio/${label}_power/value"
-	sleep 1
-	echo 0 > "/sys/class/gpio/${label}_power/value"
-}
-
-modem_list() {
-	local list="modem"
-	local label
-
-	[ "$(modem_fetch_primary)" -eq 0 ] && {
-		echo "${list}"
-		return
-	}
-
-	for m in /sys/class/gpio/modem*_power; do
-	        label="$(basename $m | awk -F_ '{print $1}')"
-	        [ "${label}" != "modem" ] && list="${list},${label}"
-	done
-
-	echo "${list}"
-}
-
-modem_fetch_primary() {
-	local modem modems primary
-
-	json_init
-	json_load_file "/etc/board.json"
-
-	json_get_keys modems modems
-	json_select modems
-
-	for modem in $modems; do
-		json_select "$modem"
-		json_get_vars primary
-
-		[ -n "$primary" ] && {
-			echo 1
-			return
-		}
-
-		json_select ..
-	done
-	echo 0
-}
-
-modem_is_available() {
-	local label="$1"
-	[ -e "/sys/class/gpio/${label}_power/value" ]
-}
-
-usage() {
-	cat <<EOF
-Usage $0 <option>
-Control modem power state.
-
-Options:
- -p, --power-on                power on modem
- -s, --shutdown                shutdown modem
- -r, --reboot                  reboot modem
- -m, --modem <label>           use specified modem instead of default one
-
-Available modem labels:
- $(modem_list)
-EOF
-	exit 1
-}
-
-while [ -n "$1" ]; do
-	case "$1" in
-	-p | --power-on) MPS="${PS_ON}";;
-	-s | --shutdown) MPS="${PS_OFF}";;
-	-r | --reboot) MPS="${PS_ON}";;
-	-m | --modem) MLBL="$2"; shift;;
-	-*) echo "Invalid option: $1"; usage;;
-	*) break;;
-	esac
-	shift
-done
-
-[ "${MPS}" -eq 0 ] && usage
-modem_is_available "${MLBL}" || usage
-
-case "${MPS}" in
-"${PS_ON}") modem_reset "${MLBL}"; sleep 1; modem_power "${MLBL}";;
-"${PS_OFF}") modem_off "${MLBL}";;
-esac
\ No newline at end of file
diff --git a/root/target/linux/ipq40xx/base-files/sbin/user_defaults b/root/target/linux/ipq40xx/base-files/sbin/user_defaults
deleted file mode 100755
index 656b01de..00000000
--- a/root/target/linux/ipq40xx/base-files/sbin/user_defaults
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-tar_file="/etc/default-config/config.tar.gz"
-
-[ ! -f "$tar_file" ] && return 1
-
-/usr/bin/ledman --clean
-cp $tar_file /tmp/user_defaults.tgz
-firstboot -y
-[ -d /tmp/overlay ] || mkdir /tmp/overlay
-mount -t ubifs ubi0:rootfs_data /tmp/overlay
-cp /tmp/user_defaults.tgz /tmp/overlay/
-sync
-umount /tmp/overlay