Skip to content

Commit 9aa8093

Browse files
author
tosaki
committed
feat: update build configurations, remove nft-qos and sing-box options, and disable 25.12 package compatibility in workflow
1 parent 12528f5 commit 9aa8093

File tree

5 files changed

+106
-225
lines changed

5 files changed

+106
-225
lines changed

.github/workflows/build-openwrt.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -89,13 +89,13 @@ jobs:
8989
echo "Using config: ${{ matrix.config }}"
9090
cp "${{ github.workspace }}/${{ matrix.config }}" immortalwrt/.config
9191
92-
# 25.12 package set compatibility: avoid file conflicts during package/install
93-
if [ "${{ matrix.branch }}" = "openwrt-25.12" ]; then
94-
sed -i '/^CONFIG_PACKAGE_luci-app-mosdns=/d' immortalwrt/.config
95-
sed -i '/^CONFIG_PACKAGE_luci-app-openvpn-server=/d' immortalwrt/.config
96-
echo '# CONFIG_PACKAGE_luci-app-mosdns is not set' >> immortalwrt/.config
97-
echo '# CONFIG_PACKAGE_luci-app-openvpn-server is not set' >> immortalwrt/.config
98-
fi
92+
# # 25.12 package set compatibility: avoid file conflicts during package/install
93+
# if [ "${{ matrix.branch }}" = "openwrt-25.12" ]; then
94+
# sed -i '/^CONFIG_PACKAGE_luci-app-mosdns=/d' immortalwrt/.config
95+
# sed -i '/^CONFIG_PACKAGE_luci-app-openvpn-server=/d' immortalwrt/.config
96+
# echo '# CONFIG_PACKAGE_luci-app-mosdns is not set' >> immortalwrt/.config
97+
# echo '# CONFIG_PACKAGE_luci-app-openvpn-server is not set' >> immortalwrt/.config
98+
# fi
9999
100100
cp "${{ github.workspace }}/build.sh" immortalwrt/build.sh || true # Allow scripts to be optional
101101
cp "${{ github.workspace }}/diy-part1.sh" immortalwrt/diy-part1.sh || true

alderlake.config

Lines changed: 34 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ CONFIG_LIBCURL_CRYPTO_AUTH=y
1010
CONFIG_LIBCURL_FILE=y
1111
CONFIG_LIBCURL_FTP=y
1212
CONFIG_LIBCURL_HTTP=y
13-
CONFIG_LIBCURL_NGHTTP2=y
13+
CONFIG_LIBCURL_HTTP2=y
14+
CONFIG_LIBCURL_HTTP_AUTH=y
1415
CONFIG_LIBCURL_OPENSSL=y
1516
CONFIG_LIBCURL_PROXY=y
1617
CONFIG_LIBCURL_TFTP=y
@@ -44,6 +45,7 @@ CONFIG_MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK_ENABLED=y
4445
CONFIG_MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK_EPHEMERAL_ENABLED=y
4546
CONFIG_MBEDTLS_THREADING_C=y
4647
CONFIG_MBEDTLS_THREADING_PTHREAD=y
48+
CONFIG_OPENVPN_openssl_ENABLE_DCO=y
4749
CONFIG_OPENVPN_openssl_ENABLE_FRAGMENT=y
4850
CONFIG_OPENVPN_openssl_ENABLE_LZ4=y
4951
CONFIG_OPENVPN_openssl_ENABLE_LZO=y
@@ -74,7 +76,10 @@ CONFIG_PACKAGE_coreutils-nohup=y
7476
CONFIG_PACKAGE_coreutils-sort=y
7577
CONFIG_PACKAGE_curl=y
7678
CONFIG_PACKAGE_dns2socks=y
79+
CONFIG_PACKAGE_dosfstools=y
7780
CONFIG_PACKAGE_etherwake=y
81+
CONFIG_PACKAGE_exfat-fsck=y
82+
CONFIG_PACKAGE_exfat-mkfs=y
7883
CONFIG_PACKAGE_frpc=y
7984
CONFIG_PACKAGE_frps=y
8085
CONFIG_PACKAGE_gawk=y
@@ -89,6 +94,7 @@ CONFIG_PACKAGE_hysteria=y
8994
CONFIG_PACKAGE_intel-microcode=y
9095
CONFIG_PACKAGE_ip-full=y
9196
CONFIG_PACKAGE_ipt2socks=y
97+
CONFIG_PACKAGE_irqbalance=y
9298
CONFIG_PACKAGE_iw=y
9399
CONFIG_PACKAGE_iwinfo=y
94100
CONFIG_PACKAGE_iwlwifi-firmware-ax101=y
@@ -104,6 +110,7 @@ CONFIG_PACKAGE_iwlwifi-firmware-iwl8260c=y
104110
CONFIG_PACKAGE_iwlwifi-firmware-iwl8265=y
105111
CONFIG_PACKAGE_iwlwifi-firmware-iwl9000=y
106112
CONFIG_PACKAGE_iwlwifi-firmware-iwl9260=y
113+
CONFIG_PACKAGE_kmod-asn1-decoder=y
107114
CONFIG_PACKAGE_kmod-cfg80211=y
108115
CONFIG_PACKAGE_kmod-crypto-acompress=y
109116
CONFIG_PACKAGE_kmod-crypto-blake2b=y
@@ -124,6 +131,7 @@ CONFIG_PACKAGE_kmod-crypto-xxhash=y
124131
CONFIG_PACKAGE_kmod-dnsresolver=y
125132
CONFIG_PACKAGE_kmod-fs-btrfs=y
126133
CONFIG_PACKAGE_kmod-fs-cifs=y
134+
CONFIG_PACKAGE_kmod-fs-msdos=y
127135
CONFIG_PACKAGE_kmod-fs-netfs=y
128136
CONFIG_PACKAGE_kmod-fs-smbfs-common=y
129137
CONFIG_PACKAGE_kmod-inet-diag=y
@@ -149,10 +157,12 @@ CONFIG_PACKAGE_kmod-nft-bridge=y
149157
CONFIG_PACKAGE_kmod-nft-netdev=y
150158
CONFIG_PACKAGE_kmod-nft-socket=y
151159
CONFIG_PACKAGE_kmod-nft-tproxy=y
160+
CONFIG_PACKAGE_kmod-nls-cp932=y
152161
CONFIG_PACKAGE_kmod-nls-cp936=y
153162
CONFIG_PACKAGE_kmod-nls-cp950=y
154163
CONFIG_PACKAGE_kmod-nls-ucs2-utils=y
155164
CONFIG_PACKAGE_kmod-oid-registry=y
165+
CONFIG_PACKAGE_kmod-tcp-bbr=y
156166
CONFIG_PACKAGE_kmod-tun=y
157167
CONFIG_PACKAGE_libatomic=y
158168
CONFIG_PACKAGE_libattr=y
@@ -168,14 +178,19 @@ CONFIG_PACKAGE_libffi=y
168178
CONFIG_PACKAGE_libgd=y
169179
CONFIG_PACKAGE_libjpeg-turbo=y
170180
CONFIG_PACKAGE_libltdl=y
181+
CONFIG_PACKAGE_liblua=y
171182
CONFIG_PACKAGE_liblua5.3=y
183+
CONFIG_PACKAGE_liblua5.4=y
184+
CONFIG_PACKAGE_liblucihttp-lua=y
172185
CONFIG_PACKAGE_liblz4=y
173186
CONFIG_PACKAGE_liblzo=y
174187
CONFIG_PACKAGE_libmbedtls=y
175188
CONFIG_PACKAGE_libminiupnpc=y
176189
CONFIG_PACKAGE_libmount=y
177190
CONFIG_PACKAGE_libnatpmp=y
178191
CONFIG_PACKAGE_libnghttp2=y
192+
CONFIG_PACKAGE_libnl-core=y
193+
CONFIG_PACKAGE_libnl-genl=y
179194
CONFIG_PACKAGE_libopenssl-conf=y
180195
CONFIG_PACKAGE_libparted=y
181196
CONFIG_PACKAGE_libpcre2=y
@@ -185,24 +200,28 @@ CONFIG_PACKAGE_librrd1=y
185200
CONFIG_PACKAGE_libruby=y
186201
CONFIG_PACKAGE_libsqlite3=y
187202
CONFIG_PACKAGE_libstdcpp=y
203+
CONFIG_PACKAGE_libubus-lua=y
188204
CONFIG_PACKAGE_libuci-lua=y
189205
CONFIG_PACKAGE_libuv=y
190206
CONFIG_PACKAGE_libwebp=y
191207
CONFIG_PACKAGE_libwebsockets-full=y
192208
CONFIG_PACKAGE_libyaml=y
193209
CONFIG_PACKAGE_lsblk=y
210+
CONFIG_PACKAGE_lua=y
194211
CONFIG_PACKAGE_luci-app-adblock=y
195212
CONFIG_PACKAGE_luci-app-argon-config=y
196213
CONFIG_PACKAGE_luci-app-autoreboot=y
197214
CONFIG_PACKAGE_luci-app-cloudflared=y
198215
CONFIG_PACKAGE_luci-app-diskman=y
216+
CONFIG_PACKAGE_luci-app-diskman_INCLUDE_btrfs_progs=y
217+
CONFIG_PACKAGE_luci-app-diskman_INCLUDE_lsblk=y
199218
CONFIG_PACKAGE_luci-app-frpc=y
200219
CONFIG_PACKAGE_luci-app-frps=y
201220
CONFIG_PACKAGE_luci-app-hd-idle=y
221+
CONFIG_PACKAGE_luci-app-irqbalance=y
202222
CONFIG_PACKAGE_luci-app-lucky=y
203223
CONFIG_PACKAGE_luci-app-mosdns=y
204224
CONFIG_PACKAGE_luci-app-netdata=y
205-
CONFIG_PACKAGE_luci-app-nft-qos=y
206225
CONFIG_PACKAGE_luci-app-openclash=y
207226
CONFIG_PACKAGE_luci-app-openvpn-server=y
208227
CONFIG_PACKAGE_luci-app-passwall=y
@@ -213,6 +232,7 @@ CONFIG_PACKAGE_luci-app-upnp=y
213232
CONFIG_PACKAGE_luci-app-vnstat2=y
214233
CONFIG_PACKAGE_luci-app-wol=y
215234
CONFIG_PACKAGE_luci-app-zerotier=y
235+
CONFIG_PACKAGE_luci-compat=y
216236
CONFIG_PACKAGE_luci-i18n-adblock-zh-cn=y
217237
CONFIG_PACKAGE_luci-i18n-argon-config-zh-cn=y
218238
CONFIG_PACKAGE_luci-i18n-autoreboot-zh-cn=y
@@ -221,10 +241,10 @@ CONFIG_PACKAGE_luci-i18n-diskman-zh-cn=y
221241
CONFIG_PACKAGE_luci-i18n-frpc-zh-cn=y
222242
CONFIG_PACKAGE_luci-i18n-frps-zh-cn=y
223243
CONFIG_PACKAGE_luci-i18n-hd-idle-zh-cn=y
244+
CONFIG_PACKAGE_luci-i18n-irqbalance-zh-cn=y
224245
CONFIG_PACKAGE_luci-i18n-lucky-zh-cn=y
225246
CONFIG_PACKAGE_luci-i18n-mosdns-zh-cn=y
226247
CONFIG_PACKAGE_luci-i18n-netdata-zh-cn=y
227-
CONFIG_PACKAGE_luci-i18n-nft-qos-zh-cn=y
228248
CONFIG_PACKAGE_luci-i18n-openvpn-server-zh-cn=y
229249
CONFIG_PACKAGE_luci-i18n-passwall-zh-cn=y
230250
CONFIG_PACKAGE_luci-i18n-statistics-zh-cn=y
@@ -233,6 +253,11 @@ CONFIG_PACKAGE_luci-i18n-upnp-zh-cn=y
233253
CONFIG_PACKAGE_luci-i18n-vnstat2-zh-cn=y
234254
CONFIG_PACKAGE_luci-i18n-wol-zh-cn=y
235255
CONFIG_PACKAGE_luci-i18n-zerotier-zh-cn=y
256+
CONFIG_PACKAGE_luci-lib-base=y
257+
CONFIG_PACKAGE_luci-lib-ip=y
258+
CONFIG_PACKAGE_luci-lib-jsonc=y
259+
CONFIG_PACKAGE_luci-lib-nixio=y
260+
CONFIG_PACKAGE_luci-lua-runtime=y
236261
CONFIG_PACKAGE_luci-theme-argon=y
237262
CONFIG_PACKAGE_lucky=y
238263
CONFIG_PACKAGE_microsocks=y
@@ -242,7 +267,6 @@ CONFIG_PACKAGE_mt7622bt-firmware=y
242267
CONFIG_PACKAGE_mt7921bt-firmware=y
243268
CONFIG_PACKAGE_mt7922bt-firmware=y
244269
CONFIG_PACKAGE_netdata=y
245-
CONFIG_PACKAGE_nft-qos=y
246270
CONFIG_PACKAGE_openssl-util=y
247271
CONFIG_PACKAGE_openvpn-easy-rsa=y
248272
CONFIG_PACKAGE_openvpn-openssl=y
@@ -268,34 +292,27 @@ CONFIG_PACKAGE_sing-box=y
268292
CONFIG_PACKAGE_smartmontools=y
269293
CONFIG_PACKAGE_tcping=y
270294
CONFIG_PACKAGE_ttyd=y
295+
CONFIG_PACKAGE_ucode-mod-digest=y
296+
CONFIG_PACKAGE_ucode-mod-lua=y
271297
CONFIG_PACKAGE_ucode-mod-nl80211=y
272298
CONFIG_PACKAGE_ucode-mod-rtnl=y
273-
CONFIG_PACKAGE_ucode-mod-uloop=y
274299
CONFIG_PACKAGE_unzip=y
275300
CONFIG_PACKAGE_v2dat=y
276301
CONFIG_PACKAGE_v2ray-geoip=y
277302
CONFIG_PACKAGE_v2ray-geosite=y
278303
CONFIG_PACKAGE_v2ray-plugin=y
279304
CONFIG_PACKAGE_vnstat2=y
280305
CONFIG_PACKAGE_vnstati2=y
306+
CONFIG_PACKAGE_wget-ssl=y
281307
CONFIG_PACKAGE_wifi-scripts=y
282308
CONFIG_PACKAGE_wireless-regdb=y
283309
CONFIG_PACKAGE_wpa-cli=y
284310
CONFIG_PACKAGE_wpad-basic-mbedtls=y
285311
CONFIG_PACKAGE_xray-core=y
286312
CONFIG_PACKAGE_zerotier=y
287-
CONFIG_PACKAGE_zlib=y
288313
CONFIG_PARTED_READLINE=y
289314
CONFIG_PCRE2_JIT_ENABLED=y
290315
CONFIG_RUBY_ENABLE_YJIT=y
291-
CONFIG_SING_BOX_BUILD_ACME=y
292-
CONFIG_SING_BOX_BUILD_CLASH_API=y
293-
CONFIG_SING_BOX_BUILD_ECH=y
294-
CONFIG_SING_BOX_BUILD_GVISOR=y
295-
CONFIG_SING_BOX_BUILD_QUIC=y
296-
CONFIG_SING_BOX_BUILD_REALITY_SERVER=y
297-
CONFIG_SING_BOX_BUILD_UTLS=y
298-
CONFIG_SING_BOX_BUILD_WIREGUARD=y
299316
CONFIG_SQLITE3_COLUMN_METADATA=y
300317
CONFIG_SQLITE3_DYNAMIC_EXTENSIONS=y
301318
CONFIG_SQLITE3_FTS3=y
@@ -306,6 +323,9 @@ CONFIG_TARGET_KERNEL_PARTSIZE=128
306323
# CONFIG_TARGET_ROOTFS_EXT4FS is not set
307324
CONFIG_TARGET_ROOTFS_PARTSIZE=2048
308325
# CONFIG_TARGET_ROOTFS_TARGZ is not set
326+
CONFIG_USE_GC_SECTIONS=y
327+
CONFIG_USE_LTO=y
328+
CONFIG_USE_MOLD=y
309329
CONFIG_WPA_MBO_SUPPORT=y
310330
CONFIG_WPA_MSG_MIN_PRIORITY=3
311331
CONFIG_DEVEL=y

0 commit comments

Comments
 (0)