xinb
/
X-OpenWrt
mirror of https://github.com/xopenwrt/X-OpenWrt-New.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

移除 INCLUDE_Argon

This commit is contained in:
Hyy2001X 2021-11-16 20:24:58 +08:00
parent da3f3a4fdf
commit 1208a2e73d
2 changed files with 2 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Scripts/AutoBuild_DiyScript.sh
View File

@ -16,7 +16,6 @@ Diy_Core() {
INCLUDE_AutoBuild_Features=true INCLUDE_AutoBuild_Features=true
INCLUDE_DRM_I915=true INCLUDE_DRM_I915=true
INCLUDE_Argon=true
INCLUDE_Obsolete_PKG_Compatible=false INCLUDE_Obsolete_PKG_Compatible=false
} }
@ -39,6 +38,8 @@ Firmware-Diy() {
case "${OP_Maintainer}/${OP_REPO_NAME}:${OP_BRANCH}" in case "${OP_Maintainer}/${OP_REPO_NAME}:${OP_BRANCH}" in
coolsnowwolf/lede:master) coolsnowwolf/lede:master)
sed -i "s?/bin/login?/usr/libexec/login.sh?g" ${feeds_pkgs}/ttyd/files/ttyd.config sed -i "s?/bin/login?/usr/libexec/login.sh?g" ${feeds_pkgs}/ttyd/files/ttyd.config
AddPackage git lean luci-theme-argon jerrykuku 18.06
AddPackage git lean luci-app-argon-config jerrykuku master
;; ;;
esac esac

32
Scripts/AutoBuild_Function.sh
View File

@ -176,38 +176,6 @@ EOF
;; ;;
esac esac
fi fi
[[ ${INCLUDE_Argon} == true ]] && {
case "${OP_Maintainer}/${OP_REPO_NAME}:${OP_BRANCH}" in
coolsnowwolf/lede:master)
AddPackage git lean luci-theme-argon jerrykuku 18.06
;;
[Ll]ienol/openwrt:main)
AddPackage git other luci-theme-argon jerrykuku master
;;
[Ll]ienol/openwrt:19.07)
AddPackage git other luci-theme-argon jerrykuku v2.2.5
;;
*)
[[ ! ${OP_Maintainer}/${OP_REPO_NAME} = immortalwrt/immortalwrt ]] && {
case "${OP_BRANCH}" in
19.07)
AddPackage git other luci-theme-argon jerrykuku v2.2.5
;;
21.02)
AddPackage git other luci-theme-argon jerrykuku master
;;
18.06)
AddPackage git other luci-theme-argon jerrykuku 18.06
;;
esac
} || {
ECHO "[${OP_Maintainer}/${OP_REPO_NAME}:${OP_BRANCH}]: Current Source is not supported ..."
Argon_Controller=1
}
;;
esac
[[ ${Argon_Controller} == 1 ]] && AddPackage git other luci-app-argon-config jerrykuku master
}
[[ -n ${Before_IP_Address} ]] && Default_LAN_IP="${Before_IP_Address}" [[ -n ${Before_IP_Address} ]] && Default_LAN_IP="${Before_IP_Address}"
[[ -n ${Default_LAN_IP} && ${Default_LAN_IP} =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]] && { [[ -n ${Default_LAN_IP} && ${Default_LAN_IP} =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]] && {
Old_IP_Address=$(awk -F '[="]+' '/ipaddr:-/{print $3}' ${base_files}/bin/config_generate | awk 'NR==1') Old_IP_Address=$(awk -F '[="]+' '/ipaddr:-/{print $3}' ${base_files}/bin/config_generate | awk 'NR==1')