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

Compare commits

base: xinb:master
Branches Tags
xinb:master
xinb:dev
xinb:v2026-06-14
xinb:v2026-06-13
xinb:v2026-06-12
xinb:v2026-06-11
xinb:v2026-01-13
xinb:v2025-12-04
xinb:v2025-11-26
xinb:v2025-11-25
xinb:v2025-11-24
xinb:v2025-11-22
xinb:v2025-07-20
xinb:v2025-07-21
xinb:v2024-12-12
xinb:v2024-12-08
xinb:v2024-12-09
xinb:v2024-12-07
xinb:v2024-12-05
xinb:v2024-12-06
xinb:v2024-09-22
xinb:v2024-06-16
xinb:v2024-06-12
xinb:v2024-06-04
xinb:v2024-05-21
xinb:v2024-04-17
xinb:v2024-03-04
xinb:v2024-03-03
xinb:v2024-03-02
xinb:v2024-01-19
xinb:AutoUpdate_old
xinb:AutoUpdate
..
compare: xinb:v2026-06-11
Branches Tags
xinb:master
xinb:dev
xinb:v2026-06-14
xinb:v2026-06-13
xinb:v2026-06-12
xinb:v2026-06-11
xinb:v2026-01-13
xinb:v2025-12-04
xinb:v2025-11-26
xinb:v2025-11-25
xinb:v2025-11-24
xinb:v2025-11-22
xinb:v2025-07-20
xinb:v2025-07-21
xinb:v2024-12-12
xinb:v2024-12-08
xinb:v2024-12-09
xinb:v2024-12-07
xinb:v2024-12-05
xinb:v2024-12-06
xinb:v2024-09-22
xinb:v2024-06-16
xinb:v2024-06-12
xinb:v2024-06-04
xinb:v2024-05-21
xinb:v2024-04-17
xinb:v2024-03-04
xinb:v2024-03-03
xinb:v2024-03-02
xinb:v2024-01-19
xinb:AutoUpdate_old
xinb:AutoUpdate

No commits in common. "master" and "v2026-06-11" have entirely different histories.
master ... v2026-06-1

6 changed files with 13 additions and 27 deletions
Show Stats Expand all files Collapse all files

13
.github/workflows/X-x86_64_X.yml vendored
View File

@ -80,11 +80,11 @@ jobs:
- name: Maximize Build Space
uses: easimon/maximize-build-space@master
with:
root-reserve-mb: 4096
swap-size-mb: 512
temp-reserve-mb: 1024
root-reserve-mb: 3500
swap-size-mb: 100
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 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 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 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 26.x feeds/packages/lang/golang
git clone https://github.com/sbwml/packages_lang_golang -b 25.x feeds/packages/lang/golang
# sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' $GITHUB_WORKSPACE/openwrt/feeds/packages/utils/dockerd/Makefile
#fix dockerd bug
@ -212,11 +212,8 @@ 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

11
.github/workflows/X-x86_64_Y.yml vendored
View File

@ -65,11 +65,11 @@ jobs:
- name: Maximize Build Space
uses: easimon/maximize-build-space@master
with:
root-reserve-mb: 4096
root-reserve-mb: 5120
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 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 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 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 26.x feeds/packages/lang/golang
git clone https://github.com/sbwml/packages_lang_golang -b 25.x feeds/packages/lang/golang
# sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' $GITHUB_WORKSPACE/openwrt/feeds/packages/utils/dockerd/Makefile
#fix dockerd bug
@ -209,11 +209,8 @@ 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

7
.github/workflows/X-x86_64_Z.yml vendored
View File

@ -176,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 26.x feeds/packages/lang/golang
git clone https://github.com/sbwml/packages_lang_golang -b 25.x feeds/packages/lang/golang
# sed -i 's/^\s*$[(]call\sEnsureVendoredVersion/#&/' $GITHUB_WORKSPACE/openwrt/feeds/packages/utils/dockerd/Makefile
#fix dockerd bug
@ -208,13 +208,10 @@ 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
set -o pipefail && make -j4 2>&1 | tee build_log.log || make -j1 V=s
make -j4 | 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

4
Configs/x86_64-Y
View File

@ -87,10 +87,6 @@ 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

3
Configs/x86_64-Z
View File

@ -60,9 +60,6 @@ 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

2
Scripts/AutoBuild_DiyScript.sh
View File

@ -113,6 +113,8 @@ EOF
patch < ${CustomFiles}/d-team_newifi-d2_mt76_dualband.patch -p1 -d ${WORK}
;;
x86_64)
rm -rf ${FEEDS_PKG}/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 ${FEEDS_LUCI}/applications/luci-app-passwall
Copy ${CustomFiles}/Depends/cpuset ${BASE_FILES}/bin
AddPackage git passwall-packages openwrt-passwall-packages Openwrt-Passwall main
AddPackage git passwall-luci openwrt-passwall Openwrt-Passwall main