update 2026-06-08 11:29:01

This commit is contained in:
action 2026-06-08 11:29:01 +08:00
parent 4eab58177b
commit cab25d5c4a
6 changed files with 8 additions and 17 deletions

View File

@ -5,12 +5,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=dae
PKG_VERSION:=2026.06.05
PKG_VERSION:=2026.06.08
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_PROTO:=git
PKG_SOURCE_VERSION:=ba50380e15649b0c83ec04c07f355dece19b0cea
PKG_SOURCE_VERSION:=0dd83147223ea0c6af3efb48f465c375a97f30d9
PKG_SOURCE_URL:=https://github.com/olicesx/dae.git
PKG_MIRROR_HASH:=skip

View File

@ -16,7 +16,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-amlogic
PKG_VERSION:=3.1.315
PKG_VERSION:=3.1.316
PKG_RELEASE:=2
PKG_LICENSE:=GPL-2.0 License

View File

@ -82,7 +82,7 @@ return view.extend({
kpath.rmempty = false;
// 6. Kernel tags; available tags depend on the selected kernel repo.
// Default is auto-derived from kernel_release suffixes (-rk3588/-rk35xx/-h6).
// Default is auto-derived from kernel_release suffixes (-rk3588/-rk35xx).
const currentKpath = uci.get('amlogic', 'config', 'amlogic_kernel_path') ||
'https://github.com/breakingbadboy/OpenWrt';
const knownTags = {
@ -92,7 +92,6 @@ return view.extend({
};
if (currentKpath.indexOf('ophub/kernel') >= 0) {
knownTags.kernel_flippy = 'kernel_flippy [Mainline Stable Kernel by Flippy]';
knownTags.kernel_h6 = 'kernel_h6 [Allwinner H6 Kernel]';
knownTags.kernel_beta = 'kernel_beta [Beta Kernel]';
}
// Determine default tag from saved config or kernel_release uname string.
@ -101,7 +100,7 @@ return view.extend({
const u = state.kernel_release || '';
if (u.indexOf('-rk3588') >= 0) kernelTagDefault = 'kernel_rk3588';
else if (u.indexOf('-rk35xx') >= 0) kernelTagDefault = 'kernel_rk35xx';
else if (u.indexOf('-h6') >= 0 || u.indexOf('-zicai') >= 0) kernelTagDefault = 'kernel_h6';
else if (u.indexOf('-beta') >= 0) kernelTagDefault = 'kernel_beta';
else kernelTagDefault = 'kernel_stable';
}
const ktags = o.option(form.ListValue, 'amlogic_kernel_tags',
@ -116,7 +115,7 @@ return view.extend({
const kbranch = o.option(form.ListValue, 'amlogic_kernel_branch',
_('Set version branch:'),
_('Set the version branch of the OpenWrt files and kernel selected in [Online Download Update].'));
['5.4', '5.10', '5.15', '6.1', '6.6', '6.12', '6.18'].forEach(function (b) {
['5.10', '5.15', '6.1', '6.6', '6.12', '6.18'].forEach(function (b) {
kbranch.value(b, _(b));
});
const m2 = (state.kernel_release || '').match(/^(\d+\.\d+)/);

View File

@ -410,9 +410,6 @@ msgstr "kernel_stable [Стабильное ядро из mainline]"
msgid "kernel_flippy [Mainline Stable Kernel by Flippy]"
msgstr "kernel_flippy [Стабильное ядро от Flippy]"
msgid "kernel_h6 [Allwinner H6 Kernel]"
msgstr "kernel_h6 [Ядро для Allwinner H6]"
msgid "kernel_beta [Beta Kernel]"
msgstr "kernel_beta [Бета-версия ядра]"

View File

@ -410,9 +410,6 @@ msgstr "kernel_stable [主线稳定内核]"
msgid "kernel_flippy [Mainline Stable Kernel by Flippy]"
msgstr "kernel_flippy [Flippy 的主线稳定内核]"
msgid "kernel_h6 [Allwinner H6 Kernel]"
msgstr "kernel_h6 [Allwinner H6 内核]"
msgid "kernel_beta [Beta Kernel]"
msgstr "kernel_beta [测试版内核]"
@ -599,8 +596,6 @@ msgstr "等待设备关机..."
msgid "The device has been turned off"
msgstr "设备已经关机"
msgid "Are you sure you want to power off the device?"
msgstr "确定要关闭设备吗?"

View File

@ -129,8 +129,8 @@ else
kernel_tag="rk35xx"
elif [[ "${kernel_uname}" =~ -flippy ]]; then
kernel_tag="flippy"
elif [[ "${kernel_uname}" =~ -h6|-zicai ]]; then
kernel_tag="h6"
elif [[ "${kernel_uname}" =~ -beta ]]; then
kernel_tag="beta"
else
kernel_tag="stable"
fi