AutoBuild-Actions: 20211120 功能更新

2021/11/20 更新内容

1. 修改部分变量和函数名
2.0 workflows: 所有文件新增 支持使用 /Configs 目录中的临时配置文件; 优化流程
2.1 workflows: 删除 AutoBuild.yml
3.0 AutoBuild_DiyScript.sh: 新增用户自定义变量 Author_URL=AUTO; 移除 Load_CustomPackages_List
3.1 AutoBuild_DiyScript.sh: 修改与新增预设变量
3.2 x86 设备在 lean 源码中默认修改为 ImmortalWrt 软件源
4. 删除软件包列表: AutoBuild_ExtraPackages.sh,所有内容移至 AutoBuild_DiyScript.sh
5. 删除无用文件: CustomFiles\Depends\{base-files-essential,Custom_Variable,DRM-I915}, 内容移至 AutoBuild_Function.sh
6. {Sync.sh,AutoUpdate.sh,AutoBuild_Function.sh} 同步改动
7. 重命名 {d-team_newifi-d2_mac80211.patch,d-team_newifi-d2_system}
8. 修改 x86 固件格式为 {BIOS,UEFI}
9. 固件升级保留列表添加 /.uuplugin_uuid

改动内容较大, 建议重新 Fork 本仓库
This commit is contained in:
Hyy2001X
2021-11-20 22:04:51 +08:00
parent 689e53f08c
commit 64e87c84df
18 changed files with 596 additions and 670 deletions
+53 -31
View File
@@ -2,53 +2,75 @@
# AutoBuild Module by Hyy2001 <https://github.com/Hyy2001X/AutoBuild-Actions>
# AutoBuild DiyScript
Diy_Core() {
Firmware_Diy_Core() {
Author=Hyy2001
Banner_Title="Powered by AutoBuild-Actions"
Default_LAN_IP=192.168.1.1
Author=AUTO
Author_URL=AUTO
Default_IP="192.168.1.1"
Banner_Message="Powered by AutoBuild-Actions"
Load_CustomPackages_List=true
Short_Firmware_Date=true
Checkout_Virtual_Images=false
Firmware_Format=false
Firmware_Format=AUTO
REGEX_Skip_Checkout="packages|buildinfo|sha256sums|manifest|kernel|rootfs|factory"
INCLUDE_AutoBuild_Features=true
INCLUDE_DRM_I915=true
INCLUDE_Obsolete_PKG_Compatible=false
INCLUDE_Original_OpenWrt_Compatible=false
}
Firmware-Diy() {
Firmware_Diy() {
# 部分可调用变量如下
# OP_Maintainer 源码作者
# OP_REPO_NAME 仓库名称
# OP_BRANCH 源码分支
# TARGET_PROFILE 设备名称
# TARGET_BOARD 设备架构
# 请在该函数内定制固件, 建议使用专业文本编辑器进行修改
# CustomFiles 仓库 /CustomFiles 绝对路径
# Scripts 仓库 /Scripts 绝对路径
# Home 源码存放绝对路径,等同 ${GITHUB_WORKSPACE}/openwrt
# feeds_luci 绝对路径,等同 ${GITHUB_WORKSPACE}/openwrt/package/feeds/luci
# feeds_pkgs 绝对路径,等同 ${GITHUB_WORKSPACE}/openwrt/package/feeds/packages
# base_files 绝对路径,等同 ${GITHUB_WORKSPACE}/openwrt/package/base-files/files
# 可用预设变量, 其他可用变量请参考运行日志
# ${OP_AUTHOR} OpenWrt 源码作者
# ${OP_REPO} OpenWrt 仓库名称
# ${OP_BRANCH} OpenWrt 源码分支
# ${TARGET_PROFILE} 设备名称, 例如: d-team_newifi-d2
# ${TARGET_BOARD} 设备架构, 例如: ramips
case "${OP_Maintainer}/${OP_REPO_NAME}:${OP_BRANCH}" in
# ${Home} OpenWrt 源码位置
# ${FEEDS_CONF} [feeds.conf.default] 文件
# ${CustomFiles} 仓库中的 /CustomFiles 绝对路径
# ${Scripts} 仓库中的 /Scripts 绝对路径
# ${FEEDS_LUCI} OpenWrt 源码目录下的 package/feeds/luci
# ${FEEDS_PKG} OpenWrt 源码目录下的 package/feeds/packages
# ${BASE_FILES} 俗称替换大法的路径, 位于 package/base-files/files
case "${OP_AUTHOR}/${OP_REPO}:${OP_BRANCH}" in
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_PKG}/ttyd/files/ttyd.config
AddPackage git lean luci-theme-argon jerrykuku 18.06
AddPackage git lean luci-app-argon-config jerrykuku master
AddPackage git other AutoBuild-Packages Hyy2001X master
AddPackage svn other luci-app-smartdns kenzok8/openwrt-packages/trunk
AddPackage svn other luci-app-socat Lienol/openwrt-package/trunk
AddPackage svn other luci-app-eqos kenzok8/openwrt-packages/trunk
AddPackage git other OpenClash vernesong master
# AddPackage git other OpenAppFilter destan19 master
# AddPackage svn other luci-app-ddnsto linkease/nas-packages/trunk/luci
# AddPackage svn other ddnsto linkease/nas-packages/trunk/network/services
case "${TARGET_PROFILE}" in
d-team_newifi-d2)
patch -i ${CustomFiles}/${TARGET_PROFILE}_mac80211.patch package/kernel/mac80211/files/lib/wifi/mac80211.sh
Copy ${CustomFiles}/${TARGET_PROFILE}_system ${BASE_FILES}/etc/config system
sed -i "/DEVICE_COMPAT_VERSION := 1.1/d" target/linux/ramips/image/mt7621.mk
AddPackage git other luci-app-usb3disable rufengsuixing master
;;
x86_64)
cat >> ${Version_File} <<EOF
sed -i 's#mirrors.cloud.tencent.com/lede#downloads.immortalwrt.cnsztl.eu.org#g' /etc/opkg/distfeeds.conf
sed -i 's#18.06.9/##g' /etc/opkg/distfeeds.conf
sed -i 's#releases/#snapshots/#g' /etc/opkg/distfeeds.conf
EOF
AddPackage git other openwrt-passwall xiaorouji main
rm -rf packages/lean/autocore
AddPackage git lean autocore-modify Hyy2001X master
;;
esac
;;
esac
case "${TARGET_PROFILE}" in
d-team_newifi-d2)
patch -i ${CustomFiles}/mac80211_d-team_newifi-d2.patch package/kernel/mac80211/files/lib/wifi/mac80211.sh
Copy ${CustomFiles}/system_d-team_newifi-d2 ${base_files}/etc/config system
[[ ${OP_REPO_NAME} == lede ]] && sed -i "/DEVICE_COMPAT_VERSION := 1.1/d" target/linux/ramips/image/mt7621.mk
;;
esac
}