diff --git a/luci-app-amlogic/Makefile b/luci-app-amlogic/Makefile index fd4c4060..8fd1a37f 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.111 +PKG_VERSION:=3.1.112 PKG_RELEASE:=1 PKG_LICENSE:=GPL-2.0 License diff --git a/luci-app-amlogic/luasrc/model/cbi/amlogic/amlogic_config.lua b/luci-app-amlogic/luasrc/model/cbi/amlogic/amlogic_config.lua index ffe67199..ce741e50 100644 --- a/luci-app-amlogic/luasrc/model/cbi/amlogic/amlogic_config.lua +++ b/luci-app-amlogic/luasrc/model/cbi/amlogic/amlogic_config.lua @@ -62,8 +62,6 @@ kernel_branch.description = translate("Set the version branch of the openwrt fir kernel_branch:value("5.4", translate("5.4")) kernel_branch:value("5.10", translate("5.10")) kernel_branch:value("5.15", translate("5.15")) -kernel_branch:value("5.16", translate("5.16")) -kernel_branch:value("5.17", translate("5.17")) kernel_branch:value("5.18", translate("5.18")) kernel_branch:value("5.19", translate("5.19")) local default_kernel_branch = luci.sys.exec("ls /lib/modules/ 2>/dev/null | grep -oE '^[1-9].[0-9]{1,3}'") diff --git a/luci-app-amlogic/root/usr/share/amlogic/amlogic_check_firmware.sh b/luci-app-amlogic/root/usr/share/amlogic/amlogic_check_firmware.sh index 66fd4dfb..941ecea1 100755 --- a/luci-app-amlogic/root/usr/share/amlogic/amlogic_check_firmware.sh +++ b/luci-app-amlogic/root/usr/share/amlogic/amlogic_check_firmware.sh @@ -173,7 +173,7 @@ check_updated() { if [[ -n "${api_op_down_line}" && -n "$(echo ${api_op_down_line} | sed -n "/^[0-9]\+$/p")" ]]; then tolog ' Latest updated: '${latest_updated_at_format}'' "1" else - tolog "02.02 No firmware available." "1" + tolog "02.02 No firmware available, please use another kernel branch." "1" fi exit 0 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 784f98df..62062d77 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 @@ -172,7 +172,7 @@ check_kernel() { latest_version="$(cat ${github_api_kernel_library} | grep "name" | grep -oE "${main_line_version}.[0-9]+" | sed -e "s/${main_line_version}.//g" | sort -n | sed -n '$p')" #latest_version="124" - [[ -n "${latest_version}" ]] || tolog "02.03 Failed to get the version on the server." "1" + [[ -n "${latest_version}" ]] || tolog "02.03 No kernel available, please use another kernel branch." "1" tolog "02.03 current version: ${current_kernel_v}, Latest version: ${main_line_version}.${latest_version}" sleep 2 diff --git a/luci-app-amlogic/root/usr/share/amlogic/amlogic_check_plugin.sh b/luci-app-amlogic/root/usr/share/amlogic/amlogic_check_plugin.sh index 95c60b2e..1a460602 100755 --- a/luci-app-amlogic/root/usr/share/amlogic/amlogic_check_plugin.sh +++ b/luci-app-amlogic/root/usr/share/amlogic/amlogic_check_plugin.sh @@ -101,7 +101,7 @@ curl -s "https://api.github.com/repos/ophub/luci-app-amlogic/releases" >${github sleep 1 server_plugin_version="$(cat ${github_api_plugin} | grep "tag_name" | awk -F '"' '{print $4}' | tr " " "\n" | sort -rV | head -n 1)" -[[ -n "${server_plugin_version}" ]] || tolog "02.01 Failed to get the version on the server." "1" +[[ -n "${server_plugin_version}" ]] || tolog "02.01 Query failed, please try again." "1" tolog "02.01 current version: ${current_plugin_v}, Latest version: ${server_plugin_version}" sleep 2 diff --git a/smartdns/Makefile b/smartdns/Makefile index 8f9d566f..06312bb7 100644 --- a/smartdns/Makefile +++ b/smartdns/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=smartdns -PKG_VERSION:=36.1 +PKG_VERSION:=37 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/pymumu/smartdns/tar.gz/Release$(PKG_VERSION)? -PKG_HASH:=92bba606295869ecdced2c1f0939baa90a9838e554a7f63208da988432769e6f +PKG_HASH:=87ddd578d5157e0de06a0e76eaf3c2715d786f6461dba70fd721b6d5cf712b71 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-Release$(PKG_VERSION) PKG_MAINTAINER:=Nick Peng