xinb/X-OpenWrt
1
0
Fork 0
mirror of https://github.com/xopenwrt/X-OpenWrt-New.git synced 2026-09-18 08:20:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

调整架构;修复软件包丢失的问题

Browse Source
This commit is contained in:
Hyy2001X
2021-03-29 17:11:16 +08:00
parent beedd5bfe9
commit 0368d1ac2d
7 changed files with 81 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Scripts/AutoBuild_DiyScript.sh
+1 -13
View File
@@ -12,16 +12,8 @@ Diy_Core() {
INCLUDE_DRM_I915=true
}
Diy-Part1() {
Diy_Part1_Base
Firmware-Diy() {
Update_Makefile exfat package/kernel/exfat
}
Diy-Part2() {
Diy_Part2_Base
ExtraPackages svn other/../../feeds/packages/admin netdata https://github.com/openwrt/packages/trunk/admin
Replace_File CustomFiles/uhttpd.po feeds/luci/applications/luci-app-uhttpd/po/zh-cn
Replace_File CustomFiles/webadmin.po package/lean/luci-app-webadmin/po/zh-cn
Replace_File CustomFiles/mwan3.config package/feeds/packages/mwan3/files/etc/config mwan3
@@ -37,7 +29,3 @@ Diy-Part2() {
;;
esac
}
Diy-Part3() {
Diy_Part3_Base
}
Scripts/AutoBuild_Function.sh
+29 -23
View File
@@ -8,9 +8,9 @@ GET_TARGET_INFO() {
Home=${GITHUB_WORKSPACE}/openwrt
[ -f ${GITHUB_WORKSPACE}/Openwrt.info ] && . ${GITHUB_WORKSPACE}/Openwrt.info
Owner_Repo="$(grep "https://github.com/[a-zA-Z0-9]" ${GITHUB_WORKSPACE}/.git/config | cut -c8-100)"
AB_Firmware_Info=package/base-files/files/etc/openwrt_info
Source_Repo="$(grep "https://github.com/[a-zA-Z0-9]" ${Home}/.git/config | cut -c8-100)"
Source_Owner="$(echo "${Source_Repo}" | egrep -o "[a-z]+" | awk 'NR==4')"
AB_Firmware_Info=package/base-files/files/etc/openwrt_info
case ${Source_Owner} in
coolsnowwolf)
Version_File="package/lean/default-settings/files/zzz-default-settings"
@@ -50,45 +50,38 @@ GET_TARGET_INFO() {
TARGET_SUBTARGET="$(awk -F '[="]+' '/TARGET_SUBTARGET/{print $2}' .config)"
}
Diy_Part1_Base() {
Diy_Core
Firmware-Diy_Base() {
GET_TARGET_INFO
Auto_ExtraPackages
chmod +x -R ${GITHUB_WORKSPACE}/Scripts
chmod +x -R ${GITHUB_WORKSPACE}/CustomFiles
if [[ "${INCLUDE_AutoBuild_Tools}" == "true" ]];then
Replace_File Scripts/AutoBuild_Tools.sh package/base-files/files/bin
fi
}
Diy_Part2_Base() {
GET_TARGET_INFO
Replace_File CustomFiles/Depends/banner package/base-files/files/etc
sed -i "s?By?By ${Author}?g" package/base-files/files/etc/banner
if [[ "${INCLUDE_AutoUpdate}" == "true" ]];then
ExtraPackages git lean luci-app-autoupdate https://github.com/Hyy2001X main
Replace_File Scripts/AutoUpdate.sh package/base-files/files/bin
AutoUpdate_Version=$(awk 'NR==6' package/base-files/files/bin/AutoUpdate.sh | awk -F '[="]+' '/Version/{print $2}')
sed -i "s?Openwrt?Openwrt ${Openwrt_Version} / AutoUpdate ${AutoUpdate_Version}?g" package/base-files/files/etc/banner
else
sed -i "s?Openwrt?Openwrt ${Openwrt_Version}?g" package/base-files/files/etc/banner
fi
Replace_File CustomFiles/Depends/cpuinfo_x86 package/lean/autocore/files/x86/sbin cpuinfo
if [ -f package/base-files/files/bin/AutoUpdate.sh ];then
AutoUpdate_Version=$(awk 'NR==6' package/base-files/files/bin/AutoUpdate.sh | awk -F '[="]+' '/Version/{print $2}')
else
AutoUpdate_Version=OFF
fi
case ${Source_Owner} in
coolsnowwolf)
Replace_File CustomFiles/Depends/coremark_lede.sh package/lean/coremark coremark.sh
Replace_File CustomFiles/Depends/profile_lede package/base-files/files/etc profile
Replace_File CustomFiles/Depends/cpuinfo_x86 package/lean/autocore/files/x86/sbin cpuinfo
ExtraPackages git lean luci-theme-argon https://github.com/jerrykuku 18.06
ExtraPackages git lean helloworld https://github.com/fw876 master
Update_Makefile xray-core package/lean/helloworld/xray-core
sed -i 's/143/143,8080/' package/lean/helloworld/luci-app-ssr-plus/root/etc/init.d/shadowsocksr
Replace_File CustomFiles/Depends/coremark_lede.sh package/lean/coremark coremark.sh
Replace_File CustomFiles/Depends/profile_lede package/base-files/files/etc profile
ExtraPackages svn other/../../feeds/packages/admin netdata https://github.com/openwrt/packages/trunk/admin
sed -i "s?iptables?#iptables?g" ${Version_File} > /dev/null 2>&1
sed -i "s?${Old_Version}?${Old_Version} Compiled by ${Author} [${Display_Date}]?g" $Version_File
if [[ "${INCLUDE_DRM_I915}" == "true" ]];then
Replace_File CustomFiles/Depends/config-5.4 target/linux/x86
fi
[[ "${INCLUDE_DRM_I915}" == "true" ]] && Replace_File CustomFiles/Depends/config-5.4 target/linux/x86
;;
immortalwrt)
sed -i 's/143/143,8080/' package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr
@@ -96,10 +89,23 @@ Diy_Part2_Base() {
Replace_File CustomFiles/Depends/ImmortalWrt package/base-files/files/etc openwrt_release
sed -i "s?Template?Compiled by ${Author} [${Display_Date}]?g" $Version_File
;;
*)
openwrt)
ExtraPackages git other luci-theme-argon https://github.com/jerrykuku
;;
esac
case ${Source_Owner} in
immortalwrt)
Replace_File CustomFiles/Depends/banner package/lean/default-settings/files openwrt_banner
sed -i "s?By?By ${Author}?g" package/lean/default-settings/files/openwrt_banner
sed -i "s?Openwrt?ImmortalWrt ${Openwrt_Version} / AutoUpdate ${AutoUpdate_Version}?g" package/lean/default-settings/files/openwrt_banner
;;
*)
Replace_File CustomFiles/Depends/banner package/base-files/files/etc
sed -i "s?By?By ${Author}?g" package/base-files/files/etc/banner
sed -i "s?Openwrt?Openwrt ${Openwrt_Version} / AutoUpdate ${AutoUpdate_Version}?g" package/base-files/files/etc/banner
;;
esac
echo "${Openwrt_Version}" > ${AB_Firmware_Info}
echo "${Owner_Repo}" >> ${AB_Firmware_Info}
@@ -114,7 +120,7 @@ Diy_Part2_Base() {
echo "Source Github: ${Source_Repo}"
}
Diy_Part3_Base() {
PS_Firmware() {
GET_TARGET_INFO
case ${Source_Owner} in
immortalwrt)