From afd8fcf263c253baa96b3ecb51f6382792841cd6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 9 Mar 2024 00:18:42 +0800 Subject: [PATCH] update 2024-03-09 00:18:42 --- autoupdate/files/bin/autoupdate | 3 ++- luci-app-amlogic/Makefile | 2 +- .../root/usr/share/amlogic/amlogic_check_kernel.sh | 8 +++++++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/autoupdate/files/bin/autoupdate b/autoupdate/files/bin/autoupdate index 06621c7ff..868513834 100755 --- a/autoupdate/files/bin/autoupdate +++ b/autoupdate/files/bin/autoupdate @@ -3,7 +3,7 @@ # AutoUpdate for Openwrt # Dependences: wget-ssl/wget/uclient-fetch curl jq expr sysupgrade -Version=V6.9.8 +Version=V6.9.9 function TITLE() { clear && echo "Openwrt-AutoUpdate Script by Hyy2001 ${Version}" @@ -857,6 +857,7 @@ function DO_UPGRADE() { $* if [[ $? != 0 ]] then + sleep 5 ECHO r "固件更新失败,请尝试使用 [autoupdate -F] 指令更新固件,执行此命令前请备份固件配置!" exit 1 else diff --git a/luci-app-amlogic/Makefile b/luci-app-amlogic/Makefile index bca512119..cbc2adbae 100644 --- a/luci-app-amlogic/Makefile +++ b/luci-app-amlogic/Makefile @@ -16,7 +16,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-amlogic -PKG_VERSION:=3.1.222 +PKG_VERSION:=3.1.223 PKG_RELEASE:=1 PKG_LICENSE:=GPL-2.0 License diff --git a/luci-app-amlogic/root/usr/share/amlogic/amlogic_check_kernel.sh b/luci-app-amlogic/root/usr/share/amlogic/amlogic_check_kernel.sh index d67fd8ee5..a31c6d959 100755 --- a/luci-app-amlogic/root/usr/share/amlogic/amlogic_check_kernel.sh +++ b/luci-app-amlogic/root/usr/share/amlogic/amlogic_check_kernel.sh @@ -114,7 +114,13 @@ kernel_api="https://github.com/${kernel_repo}" if [[ -n "${KERNEL_TAGS}" ]]; then kernel_tag="${KERNEL_TAGS}" else - [[ "${SOC}" == "rk3588" ]] && kernel_tag="rk3588" || kernel_tag="stable" + if [[ "${SOC}" == "rk3588" ]]; then + kernel_tag="rk3588" + elif [[ "${SOC}" == "rk3528" ]]; then + kernel_tag="rk35xx" + else + kernel_tag="stable" + fi fi kernel_tag="${kernel_tag/kernel_/}"