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

修复编译冲突

This commit is contained in:
Hyy2001X 2022-03-22 19:01:58 +08:00
parent fd5dff9bf2
commit e3216e6876
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/AutoBuild-xiaomi_redmi-router-ax6s-test.yml vendored
View File

@ -35,9 +35,9 @@ on:
### 环境变量设置 ### 环境变量设置
env: env:
# 编译时调用的 [.config] 文件名称 # 编译时调用的 [.config] 文件名称
CONFIG_FILE: xiaomi_redmi-router-ax6s CONFIG_FILE: xiaomi_redmi-router-ax6s-test
# 源码仓库:分支 # 源码仓库:分支
DEFAULT_SOURCE: immortalwrt/immortalwrt:openwrt-18.06-k5.4 DEFAULT_SOURCE: immortalwrt/immortalwrt:master
# 上传固件到 Github Releases # 上传固件到 Github Releases
UPLOAD_RELEASES: true UPLOAD_RELEASES: true
# 上传固件到 Github Artifacts # 上传固件到 Github Artifacts

1
Configs/xiaomi_redmi-router-ax6s-test
View File

@ -12,7 +12,6 @@ CONFIG_PACKAGE_ipv6helper=y
CONFIG_PACKAGE_dnsmasq_full_dhcpv6=y CONFIG_PACKAGE_dnsmasq_full_dhcpv6=y
# LUCI Appliciations # LUCI Appliciations
CONFIG_PACKAGE_luci-app-argon-config=y
CONFIG_PACKAGE_luci-app-adbyby-plus=y CONFIG_PACKAGE_luci-app-adbyby-plus=y
CONFIG_PACKAGE_luci-app-adguardhome=y CONFIG_PACKAGE_luci-app-adguardhome=y
CONFIG_PACKAGE_luci-app-autoupdate=y CONFIG_PACKAGE_luci-app-autoupdate=y

2
Scripts/AutoBuild_Function.sh
View File

@ -163,7 +163,7 @@ EOF
Copy ${Scripts}/AutoBuild_Tools.sh ${BASE_FILES}/bin Copy ${Scripts}/AutoBuild_Tools.sh ${BASE_FILES}/bin
Copy ${Scripts}/AutoUpdate.sh ${BASE_FILES}/bin Copy ${Scripts}/AutoUpdate.sh ${BASE_FILES}/bin
AutoUpdate_Version=$(awk -F '=' '/Version/{print $2}' ${BASE_FILES}/bin/AutoUpdate.sh | awk 'NR==1') AutoUpdate_Version=$(awk -F '=' '/Version/{print $2}' ${BASE_FILES}/bin/AutoUpdate.sh | awk 'NR==1')
AddPackage svn lean luci-app-autoupdate Hyy2001X/AutoBuild-Packages/trunk AddPackage svn other luci-app-autoupdate Hyy2001X/AutoBuild-Packages/trunk
Copy ${CustomFiles}/Depends/profile ${BASE_FILES}/etc Copy ${CustomFiles}/Depends/profile ${BASE_FILES}/etc
Copy ${CustomFiles}/Depends/base-files-essential ${BASE_FILES}/lib/upgrade/keep.d Copy ${CustomFiles}/Depends/base-files-essential ${BASE_FILES}/lib/upgrade/keep.d
case "${OP_AUTHOR}/${OP_REPO}" in case "${OP_AUTHOR}/${OP_REPO}" in