Skip to content

Commit fe76367

Browse files
committed
refactor(bin): ipset 归入 bin/IPSET-LKM/ 并移除重复二进制
- 移除无用的 199KB 重复,将真正使用的 ipset 归入 bin/IPSET-LKM/, 与 ko-loader、netfilter 同组管理 - customize.sh:软链源、拷贝源、两处存在性检查改为 bin/IPSET-LKM/ipset - .gitattributes:二进制标记路径更新为 bin/IPSET-LKM/ipset - ci(action):lite/mini 去掉已被 bin/IPSET-LKM/* 覆盖的冗余 -x!"bin/ipset"
1 parent 3cc60b2 commit fe76367

5 files changed

Lines changed: 7 additions & 7 deletions

File tree

.gitattributes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ CNAME text eol=lf
2222
.nojekyll text eol=lf
2323

2424
# Native binaries and packed assets
25-
src/module/bin/ipset -text
25+
src/module/bin/IPSET-LKM/ipset -text
2626
src/module/bin/proxylink -text
2727
src/module/bin/sing-box -text
2828
*.db -text

.github/actions/build-module/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,6 @@ runs:
6262
# 完整包(全部组件)
6363
7z a -tzip -mx=9 "../../$FULL_NAME" .
6464
# 精简包(排除 IPSET 驱动,适用于内核已内置 IPSET 的设备)
65-
7z a -tzip -mx=9 "../../$LITE_NAME" . -x!"bin/IPSET-LKM/*" -x!"bin/ipset"
65+
7z a -tzip -mx=9 "../../$LITE_NAME" . -x!"bin/IPSET-LKM/*"
6666
# 纯脚本包(排除所有二进制文件)
67-
7z a -tzip -mx=9 "../../$MINI_NAME" . -x!"bin/sing-box" -x!"bin/proxylink" -x!"bin/ipset" -x!"bin/IPSET-LKM/*" -x!"bin/zashboard/*"
67+
7z a -tzip -mx=9 "../../$MINI_NAME" . -x!"bin/sing-box" -x!"bin/proxylink" -x!"bin/IPSET-LKM/*" -x!"bin/zashboard/*"

src/module/bin/IPSET-LKM/ipset

-70.4 KB
Binary file not shown.

src/module/bin/ipset

-124 KB
Binary file not shown.

src/module/customize.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ install_ipset_lkm() {
417417
print_title "集成 IPSET 驱动安装"
418418

419419
# 安装包未包含 IPSET 组件则整体跳过
420-
if [ ! -d "$MODPATH/bin/IPSET-LKM" ] && [ ! -f "$MODPATH/bin/ipset" ]; then
420+
if [ ! -d "$MODPATH/bin/IPSET-LKM" ] && [ ! -f "$MODPATH/bin/IPSET-LKM/ipset" ]; then
421421
print_ok "安装包未包含 IPSET 组件,跳过"
422422
return 0
423423
fi
@@ -490,7 +490,7 @@ install_ipset_lkm() {
490490
fi
491491

492492
# 3. 配置 ipset 二进制工具的运行环境
493-
if [ -f "$MODPATH/bin/ipset" ]; then
493+
if [ -f "$MODPATH/bin/IPSET-LKM/ipset" ]; then
494494
print_step "配置 IPSET 二进制工具环境..."
495495

496496
# KernelSU / APatch:在其 bin 目录创建软链接
@@ -501,14 +501,14 @@ install_ipset_lkm() {
501501

502502
mkdir -p "$ksu_bin"
503503
rm -f "$ksu_bin/ipset"
504-
ln -s "/data/adb/modules/netproxy/bin/ipset" "$ksu_bin/ipset"
504+
ln -s "/data/adb/modules/netproxy/bin/IPSET-LKM/ipset" "$ksu_bin/ipset"
505505
print_ok "已创建符号链接: $ksu_bin/ipset"
506506

507507
# Magisk:挂载到模块的 system/bin
508508
elif [ "$MAGISK_VER_CODE" ]; then
509509
print_ok "检测到 Magisk 环境"
510510
mkdir -p "$MODPATH/system/bin"
511-
cp -f "$MODPATH/bin/ipset" "$MODPATH/system/bin/ipset"
511+
cp -f "$MODPATH/bin/IPSET-LKM/ipset" "$MODPATH/system/bin/ipset"
512512
set_perm "$MODPATH/system/bin/ipset" 0 0 0755
513513
print_ok "ipset 已挂载至 /system/bin"
514514
fi

0 commit comments

Comments
 (0)