OpenIPC
/
firmware
mirror of https://github.com/OpenIPC/firmware.git
1
0
Fork 0
Code Activity

[no ci] Overlay: update sysupgrade nand detection (#1027)

pull/1031/head
viktorxda 2023-10-09 20:33:22 +02:00 committed by GitHub
parent be82305b0d
commit 24277e412c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
general/overlay/usr/sbin/sysupgrade
View File

@ -1,9 +1,9 @@
#!/bin/sh #!/bin/sh
# #
# OpenIPC.org | v.20230520 # OpenIPC.org | v.20231008
# #
scr_version=1.0.20 scr_version=1.0.21
args=" $@" args=" $@"
@ -79,7 +79,7 @@ do_update_rootfs() {
do_wipe_overlay() { do_wipe_overlay() {
echo_c 33 "\nOverlayFS" echo_c 33 "\nOverlayFS"
echo "Erase overlay partition" echo "Erase overlay partition"
[ $(get_flash_type mtd) = "nand" ] || jffs2="-j" [ "$flash_type" = "nand" ] || jffs2="-j"
busybox flash_eraseall $jffs2 "$(get_device "rootfs_data")" busybox flash_eraseall $jffs2 "$(get_device "rootfs_data")"
} }
@ -87,7 +87,7 @@ download_firmware() {
echo_c 33 "\nFirmware" echo_c 33 "\nFirmware"
[ "$branch_dev" = "1" ] && branch="dev" || branch="latest" [ "$branch_dev" = "1" ] && branch="dev" || branch="latest"
osr=$(get_system_build) osr=$(get_system_build)
ftype=$(get_flash_type) ftype="nor"
build="${soc}-${ftype}-${osr}" build="${soc}-${ftype}-${osr}"
[ -z "$url" ] && url="https://github.com/OpenIPC/firmware/releases/download/${branch}/openipc.${build}.tgz" [ -z "$url" ] && url="https://github.com/OpenIPC/firmware/releases/download/${branch}/openipc.${build}.tgz"
echo "Download from $url" echo "Download from $url"
@ -198,6 +198,7 @@ get_system_info() {
kernel_device=$(get_device "kernel") kernel_device=$(get_device "kernel")
kernel_version=$(get_kernel_version "$kernel_device") kernel_version=$(get_kernel_version "$kernel_device")
system_version=$(get_system_version "") system_version=$(get_system_version "")
flash_type=$(${IPCINFO} -F)
} }
get_system_version() { get_system_version() {
@ -208,12 +209,6 @@ get_system_build() {
grep "BUILD_OPTION" "/etc/os-release" | head -1 | cut -d= -f2 grep "BUILD_OPTION" "/etc/os-release" | head -1 | cut -d= -f2
} }
get_flash_type() {
local x=$(${IPCINFO} -F)
[ -z "$1" ] && [ "$x" = "nand" ] && $(fw_printenv bootcmd | grep -qv nand) && x=nor
echo "$x"
}
print_sysinfo() { print_sysinfo() {
get_system_info get_system_info
echo_c 33 "OpenIPC System Updater v${scr_version}" echo_c 33 "OpenIPC System Updater v${scr_version}"