From 51dc2d9dc8e03fa0310966cbaf8a362a846cd3a0 Mon Sep 17 00:00:00 2001 From: kenzok8 Date: Sat, 15 Jun 2024 10:28:46 +0800 Subject: [PATCH] update 2024-06-15 10:28:46 --- luci-app-amlogic/Makefile | 3 ++- luci-app-amlogic/root/usr/sbin/openwrt-kernel | 4 ++-- luci-app-amlogic/root/usr/sbin/openwrt-update-amlogic | 2 +- luci-app-amlogic/root/usr/sbin/openwrt-update-kvm | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/luci-app-amlogic/Makefile b/luci-app-amlogic/Makefile index 00cdd6975..384fdd3b6 100644 --- a/luci-app-amlogic/Makefile +++ b/luci-app-amlogic/Makefile @@ -26,7 +26,8 @@ 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 +curl \ - +dosfstools +e2fsprogs +jq +lsblk +pv +losetup +uuidgen +bash +perl +fdisk + +dosfstools +e2fsprogs +jq +lsblk +pv +losetup +uuidgen +bash +perl +fdisk \ + +busybox define Package/$(PKG_NAME)/conffiles /etc/config/amlogic diff --git a/luci-app-amlogic/root/usr/sbin/openwrt-kernel b/luci-app-amlogic/root/usr/sbin/openwrt-kernel index d205c1611..a2d095040 100755 --- a/luci-app-amlogic/root/usr/sbin/openwrt-kernel +++ b/luci-app-amlogic/root/usr/sbin/openwrt-kernel @@ -56,7 +56,7 @@ init_var() { [[ "${1}" == "yes" ]] && AUTO_MAINLINE_UBOOT="yes" # Check dependencies - [[ -n "$(which tar)" ]] || error_msg "Missing [ tar ] in OpenWrt firmware, unable to update kernel" + [[ -n "$(busybox which tar)" ]] || error_msg "Missing [ tar ] in OpenWrt firmware, unable to update kernel" # Check release file if [[ -s "${release_file}" ]]; then @@ -148,7 +148,7 @@ check_kernel() { sha256sums_file="sha256sums" sha256sums_check="1" [[ -s "${sha256sums_file}" && -n "$(cat ${sha256sums_file})" ]] || sha256sums_check="0" - [[ -n "$(which sha256sum)" ]] || sha256sums_check="0" + [[ -n "$(busybox which sha256sum)" ]] || sha256sums_check="0" [[ "${sha256sums_check}" -eq "1" ]] && echo -e "Enable sha256sum checking..." # Loop check file diff --git a/luci-app-amlogic/root/usr/sbin/openwrt-update-amlogic b/luci-app-amlogic/root/usr/sbin/openwrt-update-amlogic index 679fd6005..6454f85bc 100755 --- a/luci-app-amlogic/root/usr/sbin/openwrt-update-amlogic +++ b/luci-app-amlogic/root/usr/sbin/openwrt-update-amlogic @@ -117,7 +117,7 @@ fi DEPENDS="lsblk uuidgen grep awk btrfs mkfs.fat mkfs.btrfs md5sum fatlabel" echo "Check the necessary dependencies..." for dep in ${DEPENDS}; do - WITCH=$(which ${dep}) + WITCH=$(busybox which ${dep}) if [ "${WITCH}" == "" ]; then echo "Dependent command: ${dep} does not exist, upgrade cannot be performed, only flash through U disk/TF card!" exit 1 diff --git a/luci-app-amlogic/root/usr/sbin/openwrt-update-kvm b/luci-app-amlogic/root/usr/sbin/openwrt-update-kvm index 84035a64c..dec2c9ae2 100755 --- a/luci-app-amlogic/root/usr/sbin/openwrt-update-kvm +++ b/luci-app-amlogic/root/usr/sbin/openwrt-update-kvm @@ -23,7 +23,7 @@ WORK_DIR="${4}" DEPENDS="lsblk uuidgen grep awk btrfs mkfs.fat mkfs.btrfs md5sum fatlabel jq" echo "Check the necessary dependencies..." for dep in ${DEPENDS}; do - WITCH=$(which ${dep}) + WITCH=$(busybox which ${dep}) if [ "${WITCH}" == "" ]; then echo "Dependent command: ${dep} does not exist, upgrade cannot be performed!" exit 1