Merge branch 'OpenIPC:master' into master

.github/workflows/matrix_build.yml

@@ -22,7 +22,7 @@ env:
   MAX_ROOTFS_SIZE: 0x500000
   MAX_KERNEL_SIZE_ULTIMATE: 0x300000
   MAX_ROOTFS_SIZE_ULTIMATE: 0xa00000
-  TG_OPTIONS: -s --connect-timeout 30 --retry 10 --verbose
+  TG_OPTIONS: -s --connect-timeout 30 --retry 10 --http1.1 --verbose
 
 jobs:
   toolchain:

br-ext-chip-goke/configs/unknown_unknown_gk7205v200_fpv_defconfig

@@ -76,7 +76,7 @@ BR2_PACKAGE_MICROBE_WEB=y
 # BR2_PACKAGE_MINI_SNMPD is not set
 # BR2_PACKAGE_MOTORS is not set
 # BR2_PACKAGE_SSHPASS is not set
-# BR2_PACKAGE_VTUND_OPENIPC is not set
+BR2_PACKAGE_VTUND_OPENIPC=y
 BR2_PACKAGE_YAML_CLI=y
 
 # WiFi

br-ext-chip-goke/configs/unknown_unknown_gk7205v300_fpv_defconfig

@@ -76,7 +76,7 @@ BR2_PACKAGE_MICROBE_WEB=y
 # BR2_PACKAGE_MINI_SNMPD is not set
 # BR2_PACKAGE_MOTORS is not set
 # BR2_PACKAGE_SSHPASS is not set
-# BR2_PACKAGE_VTUND_OPENIPC is not set
+BR2_PACKAGE_VTUND_OPENIPC=y
 BR2_PACKAGE_YAML_CLI=y
 
 # WiFi

br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev200_fpv_defconfig

@@ -76,7 +76,7 @@ BR2_PACKAGE_MICROBE_WEB=y
 # BR2_PACKAGE_MINI_SNMPD is not set
 # BR2_PACKAGE_MOTORS is not set
 # BR2_PACKAGE_SSHPASS is not set
-# BR2_PACKAGE_VTUND_OPENIPC is not set
+BR2_PACKAGE_VTUND_OPENIPC=y
 BR2_PACKAGE_YAML_CLI=y
 
 # WiFi

br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_fpv_defconfig

@@ -76,7 +76,7 @@ BR2_PACKAGE_MICROBE_WEB=y
 # BR2_PACKAGE_MINI_SNMPD is not set
 # BR2_PACKAGE_MOTORS is not set
 # BR2_PACKAGE_SSHPASS is not set
-# BR2_PACKAGE_VTUND_OPENIPC is not set
+BR2_PACKAGE_VTUND_OPENIPC=y
 BR2_PACKAGE_YAML_CLI=y
 
 # WiFi

building.sh

@@ -122,7 +122,7 @@ rename() {
   mv -v ./output/images/rootfs.cpio ./output/images/rootfs.${SOC}.cpio
   mv -v ./output/images/rootfs.tar ./output/images/rootfs.${SOC}.tar
   date >>/tmp/openipc_buildtime.txt
-  echo -e "\n\n$(cat /tmp/openipc_buildtime.txt)"
+  echo_c 31 "\n\n$(cat /tmp/openipc_buildtime.txt)\n\n"
 }
 
 rename_initramfs() {
@@ -131,25 +131,25 @@ rename_initramfs() {
   mv -v ./output/images/rootfs.cpio ./output/images/rootfs.${SOC}.cpio
   mv -v ./output/images/rootfs.tar ./output/images/rootfs.${SOC}.tar
   date >>/tmp/openipc_buildtime.txt
-  echo -e "\n\n$(cat /tmp/openipc_buildtime.txt)"
+  echo_c 31 "\n\n$(cat /tmp/openipc_buildtime.txt)\n\n"
 }
 
 autoup_rootfs() {
-  echo_c 34 "Downloading u-boot-hi3518ev200-universal.bin"
+  echo_c 34 "\nDownloading u-boot-hi3518ev200-universal.bin"
   curl --location --output ./output/images/u-boot-hi3518ev200-universal.bin \
     https://github.com/OpenIPC/firmware/releases/download/latest/u-boot-hi3518ev200-universal.bin
 
-  echo_c 34 "Making autoupdate firmware image"
+  echo_c 34 "\nMaking autoupdate u-boot image"
   ./output/host/bin/mkimage -A arm -O linux -T firmware -n "$OPENIPC_VER" \
     -a 0x0 -e 0x50000 -d ./output/images/u-boot-hi3518ev200-universal.bin \
     ./output/images/autoupdate-uboot.img
 
-  echo_c 34 "Making autoupdate kernel image"
+  echo_c 34 "\nMaking autoupdate kernel image"
   ./output/host/bin/mkimage -A arm -O linux -T kernel -C none -n "$OPENIPC_VER" \
     -a 0x50000 -e 0x250000 -d ./output/images/uImage.${SOC} \
     ./output/images/autoupdate-kernel.img
 
-  echo_c 34 "Making autoupdate rootfs image"
+  echo_c 34 "\nMaking autoupdate rootfs image"
   ./output/host/bin/mkimage -A arm -O linux -T filesystem -n "$OPENIPC_VER" \
     -a 0x250000 -e 0x750000 -d ./output/images/rootfs.squashfs.${SOC} \
     ./output/images/autoupdate-rootfs.img

general/overlay/etc/network/interfaces

@@ -46,6 +46,16 @@ iface usb0 inet dhcp
     post-down echo 1 > /sys/class/gpio/gpio9/value
     post-down echo 9 > /sys/class/gpio/unexport
 
+manual ppp0
+iface ppp0 inet manual
+    pre-up echo 61 > /sys/class/gpio/export
+    pre-up echo out > /sys/class/gpio/gpio61/direction
+    pre-up echo 0 > /sys/class/gpio/gpio61/value
+    pre-up (sleep 7; pon)
+    post-down poff
+    post-down echo 1 > /sys/class/gpio/gpio61/value
+    post-down echo 61 > /sys/class/gpio/unexport
+
 manual wg0
 iface wg0 inet static
     address 192.168.99.1

general/overlay/usr/sbin/sysupgrade

@@ -3,7 +3,7 @@
 # OpenIPC.org | v.20220827
 #
 
-scr_version=1.0.6
+scr_version=1.0.7
 
 args=" $@"
 
@@ -109,9 +109,7 @@ free_resources() {
 }
 
 self_update() {
-	if echo "${args}" | grep "rootfs" || echo "${args}" | grep "kernel" || echo "${args}" | grep -- "-n" >/dev/null 2>&1; then
+	if echo "${args}" | grep -E "\-(k|r|w|url)" >/dev/null 2>&1; then
-		echo -e "\nOffline operations."
-	else
 		echo -e "\nChecking for sysupgrade update..."
 		curl -s -k -L -o /tmp/sysupgrade "https://raw.githubusercontent.com/OpenIPC/firmware/master/general/overlay/usr/sbin/sysupgrade"
 		if [ -f /tmp/sysupgrade ] && grep -q "#!/bin/sh" /tmp/sysupgrade; then
@@ -128,6 +126,8 @@ self_update() {
 		else
 			echo -e "\nVersion checking failed, proceeding with the installed version."
 		fi
+	else
+		echo -e "\nOffline operations."
 	fi
 }