mirror of
https://github.com/xopenwrt/X-OpenWrt-New.git
synced 2026-09-27 07:14:43 +00:00
Compare commits
21
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 xopenwrt
|
9bc8ff1288 | ||
|
xopenwrt
|
c3b77b9bd3 | ||
|
xopenwrt
|
2b9e22a351 | ||
|
xopenwrt
|
13e85ab847 | ||
|
xopenwrt
|
b6ca8b944c | ||
|
xopenwrt
|
61444d2c11 | ||
|
xopenwrt
|
ce4d832d49 | ||
|
xopenwrt
|
c6944feabf | ||
|
xopenwrt
|
57513cf4f8 | ||
|
xopenwrt
|
da8ae4c8ef | ||
|
xopenwrt
|
44c434d397 | ||
|
xopenwrt
|
762d1ecd06 | ||
|
xopenwrt
|
0e31ac6248 | ||
|
xopenwrt
|
856ce8b5b5 | ||
|
xopenwrt
|
dc6091db1a | ||
|
xopenwrt
|
daf9fdc776 | ||
|
xopenwrt
|
54f624a756 | ||
|
xopenwrt
|
a665e75fa7 | ||
|
xopenwrt
|
c62782c5d0 | ||
|
xopenwrt
|
8770c61074 | ||
|
xopenwrt
|
313bebb686 |
@@ -80,11 +80,11 @@ jobs:
|
||||
- name: Maximize Build Space
|
||||
uses: easimon/maximize-build-space@master
|
||||
with:
|
||||
root-reserve-mb: 3500
|
||||
swap-size-mb: 100
|
||||
root-reserve-mb: 4096
|
||||
swap-size-mb: 512
|
||||
temp-reserve-mb: 1024
|
||||
remove-dotnet: 'true'
|
||||
remove-android: 'true'
|
||||
remove-haskell: 'true'
|
||||
|
||||
- name: Checkout
|
||||
uses: actions/checkout@main
|
||||
@@ -151,7 +151,7 @@ jobs:
|
||||
DEBIAN_FRONTEND: noninteractive
|
||||
run: |
|
||||
sudo -E apt-get update
|
||||
sudo -E apt-get -y install build-essential cmake asciidoc binutils bzip2 gawk gettext git libncurses5-dev zlib1g-dev patch unzip zlib1g-dev lib32gcc-s1 libc6-dev-i386 subversion flex uglifyjs git gcc-multilib g++-multilib p7zip p7zip-full msmtp libssl-dev texinfo libreadline-dev libglib2.0-dev xmlto qemu-utils upx-ucl libelf-dev autoconf automake libtool autopoint ccache curl wget vim nano python3 python3-pip python3-ply haveged lrzsz device-tree-compiler scons antlr3 gperf intltool genisoimage rsync
|
||||
sudo -E apt-get -y install build-essential cmake binutils bzip2 gawk gettext git libncurses5-dev zlib1g-dev patch unzip zlib1g-dev lib32gcc-s1 libc6-dev-i386 subversion flex uglifyjs git gcc-multilib g++-multilib p7zip p7zip-full msmtp libssl-dev texinfo libreadline-dev libglib2.0-dev qemu-utils upx-ucl libelf-dev autoconf automake libtool autopoint ccache curl wget vim nano python3 python3-pip python3-ply haveged lrzsz device-tree-compiler scons antlr3 gperf intltool genisoimage rsync
|
||||
sudo -E apt-get -y install llvm clang
|
||||
sudo timedatectl set-timezone "Asia/Shanghai"
|
||||
sudo mkdir -p /workdir
|
||||
@@ -180,7 +180,7 @@ jobs:
|
||||
./scripts/feeds uninstall luci-theme-argon
|
||||
# Update golang to 1.22 for xray-core build
|
||||
rm -rf feeds/packages/lang/golang
|
||||
git clone https://github.com/sbwml/packages_lang_golang -b 25.x feeds/packages/lang/golang
|
||||
git clone https://github.com/sbwml/packages_lang_golang -b 26.x feeds/packages/lang/golang
|
||||
# sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' $GITHUB_WORKSPACE/openwrt/feeds/packages/utils/dockerd/Makefile
|
||||
#fix dockerd bug
|
||||
|
||||
@@ -212,8 +212,11 @@ jobs:
|
||||
- name: Build OpenWrt
|
||||
run: |
|
||||
cd openwrt
|
||||
rm -rf package/feeds/packages/net/{xray-core,v2ray-geodata,sing-box,chinadns-ng,dns2socks,hysteria,ipt2socks,microsocks,naiveproxy,shadowsocks-rust,shadowsocksr-libev,simple-obfs,tcping,v2ray-plugin,xray-plugin,geoview,shadow-tls}
|
||||
rm -rf package/feeds/luci/applications/luci-app-passwall
|
||||
rm package/feeds/packages/adguardhome -rf
|
||||
rm feeds/packages/net/adguardhome -rf
|
||||
rm feeds/luci/applications/luci-app-adguardhome -rf
|
||||
ln -s ../../../package/other/AutoBuild-Packages/adguardhome package/feeds/packages/adguardhome
|
||||
# 2024.03.03 mosdns build fail by golang 1.22
|
||||
sed -i 's/CGO_ENABLED=0/CGO_ENABLED=1/g' feeds/packages/net/mosdns/Makefile
|
||||
|
||||
@@ -65,11 +65,11 @@ jobs:
|
||||
- name: Maximize Build Space
|
||||
uses: easimon/maximize-build-space@master
|
||||
with:
|
||||
root-reserve-mb: 5120
|
||||
root-reserve-mb: 4096
|
||||
swap-size-mb: 512
|
||||
temp-reserve-mb: 1024
|
||||
remove-dotnet: 'true'
|
||||
remove-android: 'true'
|
||||
remove-haskell: 'true'
|
||||
|
||||
- name: Checkout
|
||||
uses: actions/checkout@main
|
||||
@@ -142,7 +142,7 @@ jobs:
|
||||
DEBIAN_FRONTEND: noninteractive
|
||||
run: |
|
||||
sudo -E apt-get update
|
||||
sudo -E apt-get -y install build-essential cmake asciidoc binutils bzip2 gawk gettext git libncurses5-dev zlib1g-dev patch unzip zlib1g-dev lib32gcc-s1 libc6-dev-i386 subversion flex uglifyjs git gcc-multilib g++-multilib p7zip p7zip-full msmtp libssl-dev texinfo libreadline-dev libglib2.0-dev xmlto qemu-utils upx-ucl libelf-dev autoconf automake libtool autopoint ccache curl wget vim nano python3 python3-pip python3-ply haveged lrzsz device-tree-compiler scons antlr3 gperf intltool genisoimage rsync
|
||||
sudo -E apt-get -y install build-essential cmake binutils bzip2 gawk gettext git libncurses5-dev zlib1g-dev patch unzip zlib1g-dev lib32gcc-s1 libc6-dev-i386 subversion flex uglifyjs git gcc-multilib g++-multilib p7zip p7zip-full msmtp libssl-dev texinfo libreadline-dev libglib2.0-dev qemu-utils upx-ucl libelf-dev autoconf automake libtool autopoint ccache curl wget vim nano python3 python3-pip python3-ply haveged lrzsz device-tree-compiler scons antlr3 gperf intltool genisoimage rsync
|
||||
sudo -E apt-get -y install llvm clang
|
||||
sudo timedatectl set-timezone "Asia/Shanghai"
|
||||
sudo mkdir -p /workdir
|
||||
@@ -177,7 +177,7 @@ jobs:
|
||||
./scripts/feeds uninstall luci-theme-argon
|
||||
# Update golang to 1.22 for xray-core build
|
||||
rm -rf feeds/packages/lang/golang
|
||||
git clone https://github.com/sbwml/packages_lang_golang -b 25.x feeds/packages/lang/golang
|
||||
git clone https://github.com/sbwml/packages_lang_golang -b 26.x feeds/packages/lang/golang
|
||||
# sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' $GITHUB_WORKSPACE/openwrt/feeds/packages/utils/dockerd/Makefile
|
||||
#fix dockerd bug
|
||||
|
||||
@@ -209,8 +209,11 @@ jobs:
|
||||
- name: Build OpenWrt
|
||||
run: |
|
||||
cd openwrt
|
||||
rm -rf package/feeds/packages/net/{xray-core,v2ray-geodata,sing-box,chinadns-ng,dns2socks,hysteria,ipt2socks,microsocks,naiveproxy,shadowsocks-rust,shadowsocksr-libev,simple-obfs,tcping,v2ray-plugin,xray-plugin,geoview,shadow-tls}
|
||||
rm -rf package/feeds/luci/applications/luci-app-passwall
|
||||
rm package/feeds/packages/adguardhome -rf
|
||||
rm feeds/packages/net/adguardhome -rf
|
||||
rm feeds/luci/applications/luci-app-adguardhome -rf
|
||||
ln -s ../../../package/other/AutoBuild-Packages/adguardhome package/feeds/packages/adguardhome
|
||||
# 2024.03.03 mosdns build fail by golang 1.22
|
||||
sed -i 's/CGO_ENABLED=0/CGO_ENABLED=1/g' feeds/packages/net/mosdns/Makefile
|
||||
|
||||
@@ -65,8 +65,9 @@ jobs:
|
||||
- name: Maximize Build Space
|
||||
uses: easimon/maximize-build-space@master
|
||||
with:
|
||||
root-reserve-mb: 5120
|
||||
root-reserve-mb: 4096
|
||||
swap-size-mb: 512
|
||||
temp-reserve-mb: 1024
|
||||
remove-dotnet: 'true'
|
||||
remove-android: 'true'
|
||||
|
||||
@@ -139,7 +140,7 @@ jobs:
|
||||
DEBIAN_FRONTEND: noninteractive
|
||||
run: |
|
||||
sudo -E apt-get update
|
||||
sudo -E apt-get -y install build-essential cmake asciidoc binutils bzip2 gawk gettext git libncurses5-dev zlib1g-dev patch unzip zlib1g-dev lib32gcc-s1 libc6-dev-i386 subversion flex uglifyjs git gcc-multilib g++-multilib p7zip p7zip-full msmtp libssl-dev texinfo libreadline-dev libglib2.0-dev xmlto qemu-utils upx-ucl libelf-dev autoconf automake libtool autopoint ccache curl wget vim nano python3 python3-pip python3-ply haveged lrzsz device-tree-compiler scons antlr3 gperf intltool genisoimage rsync
|
||||
sudo -E apt-get -y install build-essential cmake binutils bzip2 gawk gettext git libncurses5-dev zlib1g-dev patch unzip zlib1g-dev lib32gcc-s1 libc6-dev-i386 subversion flex uglifyjs git gcc-multilib g++-multilib p7zip p7zip-full msmtp libssl-dev texinfo libreadline-dev libglib2.0-dev qemu-utils upx-ucl libelf-dev autoconf automake libtool autopoint ccache curl wget vim nano python3 python3-pip python3-ply haveged lrzsz device-tree-compiler scons antlr3 gperf intltool genisoimage rsync
|
||||
sudo -E apt-get -y install llvm clang
|
||||
sudo timedatectl set-timezone "Asia/Shanghai"
|
||||
sudo mkdir -p /workdir
|
||||
@@ -175,7 +176,7 @@ jobs:
|
||||
./scripts/feeds uninstall luci-theme-argon
|
||||
# Update golang to 1.22 for xray-core build
|
||||
rm -rf feeds/packages/lang/golang
|
||||
git clone https://github.com/sbwml/packages_lang_golang -b 25.x feeds/packages/lang/golang
|
||||
git clone https://github.com/sbwml/packages_lang_golang -b 26.x feeds/packages/lang/golang
|
||||
# sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' $GITHUB_WORKSPACE/openwrt/feeds/packages/utils/dockerd/Makefile
|
||||
#fix dockerd bug
|
||||
|
||||
@@ -207,10 +208,13 @@ jobs:
|
||||
- name: Build OpenWrt
|
||||
run: |
|
||||
cd openwrt
|
||||
rm -rf package/feeds/packages/net/{xray-core,v2ray-geodata,sing-box,chinadns-ng,dns2socks,hysteria,ipt2socks,microsocks,naiveproxy,shadowsocks-rust,shadowsocksr-libev,simple-obfs,tcping,v2ray-plugin,xray-plugin,geoview,shadow-tls}
|
||||
rm -rf package/feeds/luci/applications/luci-app-passwall
|
||||
rm package/feeds/packages/adguardhome -rf
|
||||
rm feeds/packages/net/adguardhome -rf
|
||||
rm feeds/luci/applications/luci-app-adguardhome -rf
|
||||
ln -s ../../../package/other/AutoBuild-Packages/adguardhome package/feeds/packages/adguardhome
|
||||
make -j4 | tee ./build_log.log || make -j1 V=s
|
||||
set -o pipefail && make -j4 2>&1 | tee build_log.log || make -j1 V=s
|
||||
# 2024.03.03 mosdns build fail by golang 1.22
|
||||
sed -i 's/CGO_ENABLED=0/CGO_ENABLED=1/g' feeds/packages/net/mosdns/Makefile
|
||||
[ "$?" == 0 ] && echo "Result=true" >> $GITHUB_ENV || echo "Result=false" >> $GITHUB_ENV
|
||||
|
||||
@@ -87,6 +87,10 @@ CONFIG_TARGET_ROOTFS_PARTSIZE=800
|
||||
CONFIG_TARGET_IMAGES_GZIP=y
|
||||
CONFIG_PACKAGE_ntfs3-mount=y
|
||||
|
||||
|
||||
CONFIG_PACKAGE_xz=y
|
||||
CONFIG_PACKAGE_xz-utils=y
|
||||
|
||||
# CONFIG_SIGNATURE_CHECK is not set
|
||||
# CONFIG_SIGNED_PACKAGES is not set
|
||||
# CONFIG_PACKAGE_luci-app-unblockmusic is not set
|
||||
|
||||
@@ -60,6 +60,9 @@ CONFIG_TARGET_IMAGES_GZIP=y
|
||||
CONFIG_PACKAGE_ntfs3-mount=y
|
||||
|
||||
|
||||
CONFIG_PACKAGE_xz=y
|
||||
CONFIG_PACKAGE_xz-utils=y
|
||||
|
||||
# CONFIG_SIGNATURE_CHECK is not set
|
||||
# CONFIG_SIGNED_PACKAGES is not set
|
||||
# CONFIG_PACKAGE_luci-app-unblockmusic is not set
|
||||
|
||||
@@ -96,7 +96,7 @@ EOF
|
||||
|
||||
patch < ${CustomFiles}/Patches/fix_coremark.patch -p1 -d ${WORK}
|
||||
# patch < ${CustomFiles}/Patches/fix_aria2_auto_create_download_path.patch -p1 -d ${WORK}
|
||||
patch < ${CustomFiles}/Patches/fix_luci-app-autoreboot-generic.patch -p1 -d ${WORK}
|
||||
# patch < ${CustomFiles}/Patches/fix_luci-app-autoreboot-generic.patch -p1 -d ${WORK}
|
||||
# delete adguardhome in lede package
|
||||
# rm package/feeds/packages/net/adguardhome -rf
|
||||
|
||||
@@ -114,9 +114,9 @@ EOF
|
||||
;;
|
||||
x86_64)
|
||||
Copy ${CustomFiles}/Depends/cpuset ${BASE_FILES}/bin
|
||||
AddPackage git passwall-depends openwrt-passwall-packages xiaorouji main
|
||||
AddPackage git passwall-luci openwrt-passwall xiaorouji main
|
||||
AddPackage git passwall2-luci openwrt-passwall2 xiaorouji main
|
||||
AddPackage git passwall-packages openwrt-passwall-packages Openwrt-Passwall main
|
||||
AddPackage git passwall-luci openwrt-passwall Openwrt-Passwall main
|
||||
AddPackage git passwall2-luci openwrt-passwall2 Openwrt-Passwall main
|
||||
AddPackage git other luci-app-dockerman lisaac master
|
||||
rm -rf packages/lean/autocore # May Can Delete
|
||||
AddPackage git lean autocore-modify xopenwrt master
|
||||
|
||||
@@ -18,7 +18,7 @@ echo "------------------------------- IP Address Info --------------------------
|
||||
IP=`curl ip.115115.xyz -s`
|
||||
curl ip.115115.xyz -s
|
||||
# curl -s https://searchplugin.csdn.net/api/v1/ip/get?ip=${IP} | jq -r .data.address
|
||||
curl -s https://api.vore.top/api/IPdata?ip=${IP} | jq -r .adcode.o
|
||||
# curl -s "https://api.vore.top/api/IPdata?ip=${IP}" | jq -r .adcode.o
|
||||
}
|
||||
|
||||
Get_Release_Info() {
|
||||
|
||||
Reference in New Issue
Block a user