update 2023-12-09 02:01:07

This commit is contained in:
github-actions[bot] 2023-12-09 02:01:07 +08:00
parent 4a3921efd9
commit c3caf4a8c8
5 changed files with 42 additions and 26 deletions

View File

@ -16,7 +16,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-amlogic
PKG_VERSION:=3.1.211
PKG_VERSION:=3.1.213
PKG_RELEASE:=1
PKG_LICENSE:=GPL-2.0 License
@ -25,7 +25,7 @@ PKG_MAINTAINER:=ophub <https://github.com/ophub/luci-app-amlogic>
LUCI_TITLE:=LuCI support for Amlogic, Allwinner and Rockchip related boxs
LUCI_PKGARCH:=all
LUCI_DEPENDS:= \
@(aarch64||arm) +luci +luci-lib-nixio +block-mount +blkid +parted \
@(aarch64||arm) +luci +luci-lib-nixio +block-mount +blkid +parted +curl \
+dosfstools +e2fsprogs +jq +lsblk +pv +losetup +uuidgen +bash +perl +fdisk
define Package/$(PKG_NAME)/conffiles

View File

@ -36,7 +36,7 @@ case $MYDEVICE_NAME in
else
MYDTB_FDTFILE="rk3328-l1pro-1296mhz.dtb"
fi
SOC="l1pro"
SOC="l1pro"
;;
"BeikeYun")
if [ -n "${CURRENT_FDTFILE}" ]; then
@ -44,7 +44,7 @@ case $MYDEVICE_NAME in
else
MYDTB_FDTFILE="rk3328-beikeyun-1296mhz.dtb"
fi
SOC="beikeyun"
SOC="beikeyun"
;;
"ZCuble1 Max")
if [ -n "${CURRENT_FDTFILE}" ]; then
@ -52,7 +52,7 @@ case $MYDEVICE_NAME in
else
MYDTB_FDTFILE="rk3399-zcube1-max.dtb"
fi
SOC="zcube1 max"
SOC="zcube1 max"
;;
"JP TVbox 3566")
if [ -n "${CURRENT_FDTFILE}" ]; then
@ -60,7 +60,7 @@ case $MYDEVICE_NAME in
else
MYDTB_FDTFILE="rk3566-jp-tvbox.dtb"
fi
SOC="jp-tvbox"
SOC="jp-tvbox"
;;
"Radxa CM3 RPI CM4 IO")
if [ -n "${CURRENT_FDTFILE}" ]; then
@ -68,7 +68,7 @@ case $MYDEVICE_NAME in
else
MYDTB_FDTFILE="rk3566-radxa-cm3-rpi-cm4-io.dtb"
fi
SOC="radxa-cm3-rpi-cm4-io"
SOC="radxa-cm3-rpi-cm4-io"
;;
"FastRhino R66S")
if [ -n "${CURRENT_FDTFILE}" ]; then
@ -76,7 +76,7 @@ case $MYDEVICE_NAME in
else
MYDTB_FDTFILE="rk3568-fastrhino-r66s.dtb"
fi
SOC="r66s"
SOC="r66s"
;;
"FastRhino R68S")
if [ -n "${CURRENT_FDTFILE}" ]; then
@ -84,7 +84,15 @@ case $MYDEVICE_NAME in
else
MYDTB_FDTFILE="rk3568-fastrhino-r68s.dtb"
fi
SOC="r68s"
SOC="r68s"
;;
"RK3568 EC-X")
if [ -n "${CURRENT_FDTFILE}" ]; then
MYDTB_FDTFILE="${CURRENT_FDTFILE}"
else
MYDTB_FDTFILE="rk3568-ec-x.dtb"
fi
SOC="ec-x"
;;
"HINLINK OPC-H66K Board"|"Hlink H66K")
if [ -n "${CURRENT_FDTFILE}" ] && [ "${CURRENT_FDTFILE}" != "rk3568-opc-h66k.dtb" ];then
@ -92,7 +100,7 @@ case $MYDEVICE_NAME in
else
MYDTB_FDTFILE="rk3568-hlink-h66k.dtb"
fi
SOC="h66k"
SOC="h66k"
;;
"HINLINK OPC-H68K Board"|"Hlink H68K")
if [ -n "${CURRENT_FDTFILE}" ] && [ "${CURRENT_FDTFILE}" != "rk3568-opc-h68k.dtb" ];then
@ -100,7 +108,7 @@ case $MYDEVICE_NAME in
else
MYDTB_FDTFILE="rk3568-hlink-h68k.dtb"
fi
SOC="h68k"
SOC="h68k"
;;
"HINLINK OPC-H69K Board"|"Hlink H69K")
if [ -n "${CURRENT_FDTFILE}" ] && [ "${CURRENT_FDTFILE}" != "rk3568-opc-h69k.dtb" ];then
@ -108,7 +116,7 @@ case $MYDEVICE_NAME in
else
MYDTB_FDTFILE="rk3568-hlink-h69k.dtb"
fi
SOC="h69k"
SOC="h69k"
;;
"Radxa E25")
if [ -n "${CURRENT_FDTFILE}" ]; then
@ -116,7 +124,7 @@ case $MYDEVICE_NAME in
else
MYDTB_FDTFILE="rk3568-radxa-e25.dtb"
fi
SOC="e25"
SOC="e25"
;;
"HINLINK OWL H88K-V3 Board"|"Hlink H88K-V3")
if [ -n "${CURRENT_FDTFILE}" ] && [ "${CURRENT_FDTFILE}" != "rk3568-hinlink-h88k-v3.dtb" ];then
@ -124,7 +132,7 @@ case $MYDEVICE_NAME in
else
MYDTB_FDTFILE="rk3588-hlink-h88k-v3.dtb"
fi
SOC="h88k-v3"
SOC="h88k-v3"
;;
"HINLINK OWL H88K Board"|"Hlink H88K")
if [ -n "${CURRENT_FDTFILE}" ] && [ "${CURRENT_FDTFILE}" != "rk3568-hinlink-h88k.dtb" ];then
@ -132,7 +140,7 @@ case $MYDEVICE_NAME in
else
MYDTB_FDTFILE="rk3588-hlink-h88k.dtb"
fi
SOC="ak88/h88k"
SOC="ak88/h88k"
;;
"Hlink H28K")
if [ -n "${CURRENT_FDTFILE}" ]; then
@ -140,7 +148,15 @@ case $MYDEVICE_NAME in
else
MYDTB_FDTFILE="rk3528-hlink-h28k.dtb"
fi
SOC="h28k"
SOC="h28k"
;;
"Hlink HT2")
if [ -n "${CURRENT_FDTFILE}" ]; then
MYDTB_FDTFILE="${CURRENT_FDTFILE}"
else
MYDTB_FDTFILE="rk3528-hlink-ht2.dtb"
fi
SOC="ht2"
;;
"Ariaboard Photonicat")
if [ -n "${CURRENT_FDTFILE}" ]; then
@ -148,7 +164,7 @@ case $MYDEVICE_NAME in
else
MYDTB_FDTFILE="rk3568-photonicat.dtb"
fi
SOC="photonicat"
SOC="photonicat"
;;
"NLnet Watermelon Pi V3")
if [ -n "${CURRENT_FDTFILE}" ]; then
@ -156,7 +172,7 @@ case $MYDEVICE_NAME in
else
MYDTB_FDTFILE="rk3568-watermelon-pi-v3.dtb"
fi
SOC="watermelon-pi-v3"
SOC="watermelon-pi-v3"
;;
"NLnet Watermelon Pi")
if [ -n "${CURRENT_FDTFILE}" ]; then
@ -164,7 +180,7 @@ case $MYDEVICE_NAME in
else
MYDTB_FDTFILE="rk3568-watermelon-pi.dtb"
fi
SOC="watermelon-pi"
SOC="watermelon-pi"
;;
"Radxa ROCK 5B")
if [ -n "${CURRENT_FDTFILE}" ]; then
@ -172,7 +188,7 @@ case $MYDEVICE_NAME in
else
MYDTB_FDTFILE="rk3588-rock-5b.dtb"
fi
SOC="rock5b"
SOC="rock5b"
;;
*) #default
if [ -f "/etc/flippy-openwrt-release" ]; then
@ -647,7 +663,7 @@ cat >>./etc/crontabs/root <<EOF
EOF
sed -e 's/ttyAMA0/ttyS2/' -i ./etc/inittab
[ "${SOC}" != "h28k" ] && sed -e 's/ttyS0/tty1/' -i ./etc/inittab
[ "${SOC}" != "h28k" ] && [ "${SOC}" != "ht2" ] && sed -e 's/ttyS0/tty1/' -i ./etc/inittab
sss=$(date +%s)
ddd=$((sss / 86400))
sed -e "s/:0:0:99999:7:::/:${ddd}:0:99999:7:::/" -i ./etc/shadow

View File

@ -259,7 +259,7 @@ download_firmware() {
# Download to OpenWrt file
firmware_download_name="openwrt_${BOARD}_k${main_line_version}_github${firmware_suffix}"
wget "${latest_url}" -q -O "${FIRMWARE_DOWNLOAD_PATH}/${firmware_download_name}"
curl -fsSL "${latest_url}" -o "${FIRMWARE_DOWNLOAD_PATH}/${firmware_download_name}"
if [[ "$?" -eq "0" && -s "${FIRMWARE_DOWNLOAD_PATH}/${firmware_download_name}" ]]; then
tolog "03.01 OpenWrt downloaded successfully."
else
@ -267,7 +267,7 @@ download_firmware() {
fi
# Download sha256sums file
if wget "${latest_url}.sha" -q -O "${FIRMWARE_DOWNLOAD_PATH}/sha256sums" 2>/dev/null; then
if curl -fsSL "${latest_url}.sha" -o "${FIRMWARE_DOWNLOAD_PATH}/sha256sums" 2>/dev/null; then
tolog "03.03 sha file downloaded successfully."
# If there is a sha256sum file, compare it

View File

@ -178,7 +178,7 @@ download_kernel() {
rm -rf ${KERNEL_DOWNLOAD_PATH}/${download_version}*
kernel_down_from="https://github.com/${kernel_repo}/releases/download/kernel_${kernel_tag}/${download_version}.tar.gz"
wget "${kernel_down_from}" -q -P "${KERNEL_DOWNLOAD_PATH}"
curl -fsSL "${kernel_down_from}" -o ${KERNEL_DOWNLOAD_PATH}/${download_version}.tar.gz
[[ "${?}" -ne "0" ]] && tolog "03.03 The kernel download failed." "1"
tar -xf ${KERNEL_DOWNLOAD_PATH}/${download_version}.tar.gz -C ${KERNEL_DOWNLOAD_PATH}

View File

@ -126,7 +126,7 @@ else
language_file="${download_repo}/${latest_version}/luci-i18n-amlogic-zh-cn_${latest_version}_all.ipk"
# Download the plug-in's i18n file
wget "${language_file}" -q -P "${TMP_CHECK_DIR}"
curl -fsSL "${language_file}" -o "${TMP_CHECK_DIR}/luci-i18n-amlogic-zh-cn_${latest_version}_all.ipk"
if [[ "${?}" -eq "0" ]]; then
tolog "02.04 Language pack downloaded successfully."
else
@ -134,7 +134,7 @@ else
fi
# Download the plug-in's ipk file
wget "${plugin_file}" -q -P "${TMP_CHECK_DIR}"
curl -fsSL "${plugin_file}" -o "${TMP_CHECK_DIR}/luci-app-amlogic_${latest_version}_all.ipk"
if [[ "${?}" -eq "0" ]]; then
tolog "02.05 Plugin downloaded successfully."
else