From 0fbb5e3d7de1cb722b7ee2785cb13484065d1587 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 26 Dec 2022 20:16:47 +0800 Subject: [PATCH] update 2022-12-26 20:16:47 --- luci-app-amlogic/Makefile | 2 +- luci-app-amlogic/root/usr/sbin/openwrt-ddbr | 18 +++++++++++++----- .../model/cbi/gpsysupgrade/sysupgrade.lua | 4 ++++ luci-app-lucky/lucky/Makefile | 2 +- v2ray-core/Makefile | 6 +++--- v2ray-plugin/Makefile | 6 +++--- xray-core/Makefile | 4 ++-- xray-plugin/Makefile | 6 +++--- 8 files changed, 30 insertions(+), 18 deletions(-) diff --git a/luci-app-amlogic/Makefile b/luci-app-amlogic/Makefile index 326aab95f..039a516ff 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.149 +PKG_VERSION:=3.1.150 PKG_RELEASE:=1 PKG_LICENSE:=GPL-2.0 License diff --git a/luci-app-amlogic/root/usr/sbin/openwrt-ddbr b/luci-app-amlogic/root/usr/sbin/openwrt-ddbr index d6a9c22fe..5862759fb 100755 --- a/luci-app-amlogic/root/usr/sbin/openwrt-ddbr +++ b/luci-app-amlogic/root/usr/sbin/openwrt-ddbr @@ -51,15 +51,19 @@ do_checkemmc() { mydevice_name="$(cat /proc/device-tree/model | tr -d '\000')" echo -e "${INFO} The device name: [ ${mydevice_name} ]" - # Find the EMMC drive - emmc="$(lsblk -l -o NAME | grep -oE "mmcblk[0-9]boot0" | sort | uniq | sed "s/boot0//g")" - [[ -z "${emmc}" ]] && error_msg "Cannot find your EMMC drive!" - echo -e "${INFO} The device EMMC name: [ /dev/${emmc} ]" - # Find the partition where root is located root_ptname="$(df / | tail -n1 | awk '{print $1}' | awk -F '/' '{print $3}')" [[ -z "${root_ptname}" ]] && error_msg "Cannot find the partition corresponding to the root file system!" + # Find the EMMC drive + emmc="$(lsblk -l -o NAME | grep -oE "mmcblk[0-9]boot0" | sort | uniq | sed "s/boot0//g")" + # Find emmc disk, find emmc that does not contain the boot0 partition + [[ -z "${emmc}" ]] && emmc="$(lsblk -l -o NAME | grep -oE '(mmcblk[0-9]?)' | grep -vE ^${root_ptname:0:-2} | uniq)" + # Check if emmc exists + [[ -z "${emmc}" ]] && error_msg "The eMMC storage not found in this device!" + # Show the emmc name + echo -e "${INFO} The device eMMC name: [ /dev/${emmc} ]" + # Find the disk where the partition is located, only supports mmcblk?p? sd?? hd?? vd?? and other formats case "${root_ptname}" in mmcblk?p[1-4]) @@ -73,6 +77,10 @@ do_checkemmc() { disk_name="$(echo ${root_ptname} | awk '{print substr($1, 1, length($1)-1)}')" link_ptname="" ;; + nvme?n?p[1-4]) + disk_name="$(echo ${root_ptname} | awk '{print substr($1, 1, length($1)-2)}')" + link_ptname="p" + ;; *) error_msg "Unable to recognize the disk type of ${root_ptname}!" ;; diff --git a/luci-app-gpsysupgrade/luasrc/model/cbi/gpsysupgrade/sysupgrade.lua b/luci-app-gpsysupgrade/luasrc/model/cbi/gpsysupgrade/sysupgrade.lua index 7fd5f02a6..fd328aa24 100644 --- a/luci-app-gpsysupgrade/luasrc/model/cbi/gpsysupgrade/sysupgrade.lua +++ b/luci-app-gpsysupgrade/luasrc/model/cbi/gpsysupgrade/sysupgrade.lua @@ -552,6 +552,10 @@ function to_check() model = "ath79_nand/zte_mf286" check_update() download_url = "https://op.supes.top/firmware/" ..model.. "/" ..remote_version.. "-openwrt-ath79-nand-zte_mf286-squashfs-sysupgrade.bin" + elseif board_name:match("mt7981$") then + model = "mediatek_gl/mt7981" + check_update() + download_url = "https://op.supes.top/firmware/" ..model.. "/" ..remote_version.. "-openwrt-mediatek_gl-mt7981-glinet_gl-mt2500-squashfs-sysupgrade.bin" else local needs_update = false return { diff --git a/luci-app-lucky/lucky/Makefile b/luci-app-lucky/lucky/Makefile index 44867de7d..b704a1280 100644 --- a/luci-app-lucky/lucky/Makefile +++ b/luci-app-lucky/lucky/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=lucky -PKG_VERSION:=1.7.4 +PKG_VERSION:=1.7.5 PKG_RELEASE:=1 PKGARCH:=all diff --git a/v2ray-core/Makefile b/v2ray-core/Makefile index d263e7d35..084c8f2d6 100644 --- a/v2ray-core/Makefile +++ b/v2ray-core/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=v2ray-core -PKG_VERSION:=5.1.0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=5.2.0 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/v2fly/v2ray-core/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=b3dbd2bbee9486999b81d1968545c5a6caa7b0f4726a7259939f1bda54fcf5ea +PKG_HASH:=3594fcec033706cbc94ff76ecf86a44f025164baa5da9b2286dea32f2b6029f9 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE diff --git a/v2ray-plugin/Makefile b/v2ray-plugin/Makefile index 094aac4fe..0cddf9ecc 100644 --- a/v2ray-plugin/Makefile +++ b/v2ray-plugin/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=v2ray-plugin -PKG_VERSION:=5.1.0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=5.2.0 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/teddysun/v2ray-plugin/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=8793a4d94131271f3c48b7e2a4d9c0b97148192b96e275717fbc621d8927f7de +PKG_HASH:=777752cbe579d4d20fe175f11e10881d4a093398433762724b7c41284870d189 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE diff --git a/xray-core/Makefile b/xray-core/Makefile index b9e1d5c2d..b14b46e35 100644 --- a/xray-core/Makefile +++ b/xray-core/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=Xray-core -PKG_VERSION:=1.6.6-2 +PKG_VERSION:=1.7.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/XTLS/Xray-core/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=228fedbf5b624883ed2b0d1e3acf66842df483aa5a113995a4434314b3e755eb +PKG_HASH:=6dbf3d9103e62f9e72b7ac231e1d5a65e2a5c40810500a7e757a4ef71dcc32fd PKG_MAINTAINER:=Tianling Shen PKG_LICENSE:=MPL-2.0 diff --git a/xray-plugin/Makefile b/xray-plugin/Makefile index 2f8790285..29d0ce87b 100644 --- a/xray-plugin/Makefile +++ b/xray-plugin/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xray-plugin -PKG_VERSION:=1.6.6 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=1.7.0 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/teddysun/xray-plugin/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=a4b79f79425ed4d0b5e7e6fcd20e8d68589a96e9199811f2324dd95cab40f9af +PKG_HASH:=5b0fc7d346361e1439eb6bf1e21393606bf1a753a2c9e07265d5933ada40b264 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE