Skip to content

Commit 8c296d6

Browse files
xiangfeidexiaohuoxiangfeidexiaohuo
committed
tiny
Signed-off-by: 刀刀 <jsjson@163.com>
1 parent c53793d commit 8c296d6

File tree

5 files changed

+41
-38
lines changed

5 files changed

+41
-38
lines changed

‎.github/workflows/Build_rk35xx.yml‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@ jobs:
1515
strategy:
1616
fail-fast: false
1717
matrix:
18-
model: ["RK", "RK_NoDocker"]
18+
model: ["RK", "RK-tiny"]
1919
include:
2020
- model: "RK"
2121
config_file: "./configs/ARM/other/rk.config"
2222
file_name: "rk"
2323
type: "rk"
2424

25-
- model: "RK_NoDocker"
26-
config_file: "./configs/ARM/other/rk_non.config"
27-
file_name: "rk_non"
28-
type: "non"
25+
- model: "RK-tiny"
26+
config_file: "./configs/ARM/other/rk_tiny.config"
27+
file_name: "rk_tiny"
28+
type: "tiny"
2929

3030
steps:
3131
- name: Checkout
@@ -225,121 +225,121 @@ jobs:
225225
getmd5 $rom
226226
cp -a $rom ./ARM_Out/AE86Wrt-Radxa_E20C-6.12-$(date +%Y%m%d)_${md5}.img.gz
227227
## 不带Docker的固件
228-
elif [ "${{ matrix.type }}" = "non" ]; then
228+
elif [ "${{ matrix.type }}" = "tiny" ]; then
229229
rom=openwrt/bin/targets/rockchip/armv8/openwrt-rockchip-armv8-friendlyarm_nanopi-neo3-squashfs-sysupgrade.img.gz
230230
getmd5 $rom
231-
cp -a $rom ./ARM_Out/AE86Wrt-NanoPi-Neo3-No_Docker-6.12-$(date +%Y%m%d)_${md5}.img.gz
231+
cp -a $rom ./ARM_Out/AE86Wrt-NanoPi-Neo3-tiny-6.12-$(date +%Y%m%d)_${md5}.img.gz
232232
233233
rom=openwrt/bin/targets/rockchip/armv8/openwrt-rockchip-armv8-friendlyarm_nanopi-r2c-squashfs-sysupgrade.img.gz
234234
getmd5 $rom
235-
cp -a $rom ./ARM_Out/AE86Wrt-NanoPi-R2C-No_Docker-6.12-$(date +%Y%m%d)_${md5}.img.gz
235+
cp -a $rom ./ARM_Out/AE86Wrt-NanoPi-R2C-tiny-6.12-$(date +%Y%m%d)_${md5}.img.gz
236236
237237
rom=openwrt/bin/targets/rockchip/armv8/openwrt-rockchip-armv8-friendlyarm_nanopi-r2s-squashfs-sysupgrade.img.gz
238238
getmd5 $rom
239-
cp -a $rom ./ARM_Out/AE86Wrt-NanoPi-R2S-No_Docker-6.12-$(date +%Y%m%d)_${md5}.img.gz
239+
cp -a $rom ./ARM_Out/AE86Wrt-NanoPi-R2S-tiny-6.12-$(date +%Y%m%d)_${md5}.img.gz
240240
241241
rom=openwrt/bin/targets/rockchip/armv8/openwrt-rockchip-armv8-friendlyarm_nanopi-r2c-plus-squashfs-sysupgrade.img.gz
242242
getmd5 $rom
243-
cp -a $rom ./ARM_Out/AE86Wrt-NanoPi-R2CPlus-No_Docker-6.12-$(date +%Y%m%d)_${md5}.img.gz
243+
cp -a $rom ./ARM_Out/AE86Wrt-NanoPi-R2CPlus-tiny-6.12-$(date +%Y%m%d)_${md5}.img.gz
244244
245245
rom=openwrt/bin/targets/rockchip/armv8/openwrt-rockchip-armv8-friendlyarm_nanopi-r2s-plus-squashfs-sysupgrade.img.gz
246246
getmd5 $rom
247-
cp -a $rom ./ARM_Out/AE86Wrt-NanoPi-R2SPlus-No_Docker-6.12-$(date +%Y%m%d)_${md5}.img.gz
247+
cp -a $rom ./ARM_Out/AE86Wrt-NanoPi-R2SPlus-tiny-6.12-$(date +%Y%m%d)_${md5}.img.gz
248248
249249
250250
251251
rom=openwrt/bin/targets/rockchip/armv8/openwrt-rockchip-armv8-friendlyarm_nanopi-r3s-squashfs-sysupgrade.img.gz
252252
getmd5 $rom
253-
cp -a $rom ./ARM_Out/AE86Wrt-NanoPi-R3S-No_Docker-6.12-$(date +%Y%m%d)_${md5}.img.gz
253+
cp -a $rom ./ARM_Out/AE86Wrt-NanoPi-R3S-tiny-6.12-$(date +%Y%m%d)_${md5}.img.gz
254254
255255
rom=openwrt/bin/targets/rockchip/armv8/openwrt-rockchip-armv8-friendlyarm_nanopi-r4s-squashfs-sysupgrade.img.gz
256256
getmd5 $rom
257-
cp -a $rom ./ARM_Out/AE86Wrt-NanoPi-R4S-No_Docker-6.12-$(date +%Y%m%d)_${md5}.img.gz
257+
cp -a $rom ./ARM_Out/AE86Wrt-NanoPi-R4S-tiny-6.12-$(date +%Y%m%d)_${md5}.img.gz
258258
259259
rom=openwrt/bin/targets/rockchip/armv8/openwrt-rockchip-armv8-friendlyarm_nanopi-r4se-squashfs-sysupgrade.img.gz
260260
getmd5 $rom
261-
cp -a $rom ./ARM_Out/AE86Wrt-NanoPi-R4SE-No_Docker-6.12-$(date +%Y%m%d)_${md5}.img.gz
261+
cp -a $rom ./ARM_Out/AE86Wrt-NanoPi-R4SE-tiny-6.12-$(date +%Y%m%d)_${md5}.img.gz
262262
263263
rom=openwrt/bin/targets/rockchip/armv8/openwrt-rockchip-armv8-friendlyarm_nanopi-r5c-squashfs-sysupgrade.img.gz
264264
getmd5 $rom
265-
cp -a $rom ./ARM_Out/AE86Wrt-NanoPi-R5C-No_Docker-6.12-$(date +%Y%m%d)_${md5}.img.gz
265+
cp -a $rom ./ARM_Out/AE86Wrt-NanoPi-R5C-tiny-6.12-$(date +%Y%m%d)_${md5}.img.gz
266266
267267
rom=openwrt/bin/targets/rockchip/armv8/openwrt-rockchip-armv8-friendlyarm_nanopi-r5s-squashfs-sysupgrade.img.gz
268268
getmd5 $rom
269-
cp -a $rom ./ARM_Out/AE86Wrt-NanoPi-R5S-No_Docker-6.12-$(date +%Y%m%d)_${md5}.img.gz
269+
cp -a $rom ./ARM_Out/AE86Wrt-NanoPi-R5S-tiny-6.12-$(date +%Y%m%d)_${md5}.img.gz
270270
271271
272272
273273
rom=openwrt/bin/targets/rockchip/armv8/openwrt-rockchip-armv8-friendlyarm_nanopi-r6c-squashfs-sysupgrade.img.gz
274274
getmd5 $rom
275-
cp -a $rom ./ARM_Out/AE86Wrt-NanoPi-R6C-No_Docker-6.12-$(date +%Y%m%d)_${md5}.img.gz
275+
cp -a $rom ./ARM_Out/AE86Wrt-NanoPi-R6C-tiny-6.12-$(date +%Y%m%d)_${md5}.img.gz
276276
277277
rom=openwrt/bin/targets/rockchip/armv8/openwrt-rockchip-armv8-friendlyarm_nanopi-r6s-squashfs-sysupgrade.img.gz
278278
getmd5 $rom
279-
cp -a $rom ./ARM_Out/AE86Wrt-NanoPi-R6S-No_Docker-6.12-$(date +%Y%m%d)_${md5}.img.gz
279+
cp -a $rom ./ARM_Out/AE86Wrt-NanoPi-R6S-tiny-6.12-$(date +%Y%m%d)_${md5}.img.gz
280280
281281
rom=openwrt/bin/targets/rockchip/armv8/openwrt-rockchip-armv8-friendlyarm_nanopc-t6-squashfs-sysupgrade.img.gz
282282
getmd5 $rom
283-
cp -a $rom ./ARM_Out/AE86Wrt-NanoPC-T6-No_Docker-6.12-$(date +%Y%m%d)_${md5}.img.gz
283+
cp -a $rom ./ARM_Out/AE86Wrt-NanoPC-T6-tiny-6.12-$(date +%Y%m%d)_${md5}.img.gz
284284
285285
rom=openwrt/bin/targets/rockchip/armv8/openwrt-rockchip-armv8-friendlyarm_nanopc-t4-squashfs-sysupgrade.img.gz
286286
getmd5 $rom
287-
cp -a $rom ./ARM_Out/AE86Wrt-NanoPC-T4-No_Docker-6.12-$(date +%Y%m%d)_${md5}.img.gz
287+
cp -a $rom ./ARM_Out/AE86Wrt-NanoPC-T4-tiny-6.12-$(date +%Y%m%d)_${md5}.img.gz
288288
289289
290290
291291
rom=openwrt/bin/targets/rockchip/armv8/openwrt-rockchip-armv8-friendlyarm_nanopi-r76s-squashfs-sysupgrade.img.gz
292292
getmd5 $rom
293-
cp -a $rom ./ARM_Out/AE86Wrt-NanoPi-R76S-No_Docker-6.12-$(date +%Y%m%d)_${md5}.img.gz
293+
cp -a $rom ./ARM_Out/AE86Wrt-NanoPi-R76S-tiny-6.12-$(date +%Y%m%d)_${md5}.img.gz
294294
295295
rom=openwrt/bin/targets/rockchip/armv8/openwrt-rockchip-armv8-friendlyarm_nanopi-m5-squashfs-sysupgrade.img.gz
296296
getmd5 $rom
297-
cp -a $rom ./ARM_Out/AE86Wrt-NanoPi-M5-No_Docker-6.12-$(date +%Y%m%d)_${md5}.img.gz
297+
cp -a $rom ./ARM_Out/AE86Wrt-NanoPi-M5-tiny-6.12-$(date +%Y%m%d)_${md5}.img.gz
298298
299299
300300
301301
rom=openwrt/bin/targets/rockchip/armv8/openwrt-rockchip-armv8-fastrhino_r66s-squashfs-sysupgrade.img.gz
302302
getmd5 $rom
303-
cp -a $rom ./ARM_Out/AE86Wrt-FastRhino-R66S-No_Docker-6.12-$(date +%Y%m%d)_${md5}.img.gz
303+
cp -a $rom ./ARM_Out/AE86Wrt-FastRhino-R66S-tiny-6.12-$(date +%Y%m%d)_${md5}.img.gz
304304
305305
rom=openwrt/bin/targets/rockchip/armv8/openwrt-rockchip-armv8-fastrhino_r68s-squashfs-sysupgrade.img.gz
306306
getmd5 $rom
307-
cp -a $rom ./ARM_Out/AE86Wrt-FastRhino-R68S-No_Docker-6.12-$(date +%Y%m%d)_${md5}.img.gz
307+
cp -a $rom ./ARM_Out/AE86Wrt-FastRhino-R68S-tiny-6.12-$(date +%Y%m%d)_${md5}.img.gz
308308
309309
rom=openwrt/bin/targets/rockchip/armv8/openwrt-rockchip-armv8-lyt_t68m-squashfs-sysupgrade.img.gz
310310
getmd5 $rom
311-
cp -a $rom ./ARM_Out/AE86Wrt-LYT-T68M-No_Docker-6.12-$(date +%Y%m%d)_${md5}.img.gz
311+
cp -a $rom ./ARM_Out/AE86Wrt-LYT-T68M-tiny-6.12-$(date +%Y%m%d)_${md5}.img.gz
312312
313313
314314
315315
rom=openwrt/bin/targets/rockchip/armv8/openwrt-rockchip-armv8-hinlink_opc-h66k-squashfs-sysupgrade.img.gz
316316
getmd5 $rom
317-
cp -a $rom ./ARM_Out/AE86Wrt-Hinlink-H66K-No_Docker-6.12-$(date +%Y%m%d)_${md5}.img.gz
317+
cp -a $rom ./ARM_Out/AE86Wrt-Hinlink-H66K-tiny-6.12-$(date +%Y%m%d)_${md5}.img.gz
318318
319319
rom=openwrt/bin/targets/rockchip/armv8/openwrt-rockchip-armv8-hinlink_opc-h68k-squashfs-sysupgrade.img.gz
320320
getmd5 $rom
321-
cp -a $rom ./ARM_Out/AE86Wrt-Hinlink-H68K-No_Docker-6.12-$(date +%Y%m%d)_${md5}.img.gz
321+
cp -a $rom ./ARM_Out/AE86Wrt-Hinlink-H68K-tiny-6.12-$(date +%Y%m%d)_${md5}.img.gz
322322
323323
rom=openwrt/bin/targets/rockchip/armv8/openwrt-rockchip-armv8-hinlink_opc-h69k-squashfs-sysupgrade.img.gz
324324
getmd5 $rom
325-
cp -a $rom ./ARM_Out/AE86Wrt-Hinlink-H69K-No_Docker-6.12-$(date +%Y%m%d)_${md5}.img.gz
325+
cp -a $rom ./ARM_Out/AE86Wrt-Hinlink-H69K-tiny-6.12-$(date +%Y%m%d)_${md5}.img.gz
326326
327327
rom=openwrt/bin/targets/rockchip/armv8/openwrt-rockchip-armv8-hinlink_opc-h28k-squashfs-sysupgrade.img.gz
328328
getmd5 $rom
329-
cp -a $rom ./ARM_Out/AE86Wrt-Hinlink-H28K-No_Docker-6.12-$(date +%Y%m%d)_${md5}.img.gz
329+
cp -a $rom ./ARM_Out/AE86Wrt-Hinlink-H28K-tiny-6.12-$(date +%Y%m%d)_${md5}.img.gz
330330
331331
rom=openwrt/bin/targets/rockchip/armv8/openwrt-rockchip-armv8-hinlink_opc-h29k-squashfs-sysupgrade.img.gz
332332
getmd5 $rom
333-
cp -a $rom ./ARM_Out/AE86Wrt-Hinlink-H29K-No_Docker-6.12-$(date +%Y%m%d)_${md5}.img.gz
333+
cp -a $rom ./ARM_Out/AE86Wrt-Hinlink-H29K-tiny-6.12-$(date +%Y%m%d)_${md5}.img.gz
334334
335335
rom=openwrt/bin/targets/rockchip/armv8/openwrt-rockchip-armv8-hinlink_opc-ht2-squashfs-sysupgrade.img.gz
336336
getmd5 $rom
337-
cp -a $rom ./ARM_Out/AE86Wrt-Hinlink-HT2-No_Docker-6.12-$(date +%Y%m%d)_${md5}.img.gz
337+
cp -a $rom ./ARM_Out/AE86Wrt-Hinlink-HT2-tiny-6.12-$(date +%Y%m%d)_${md5}.img.gz
338338
339339
340340
rom=openwrt/bin/targets/rockchip/armv8/openwrt-rockchip-armv8-radxa_e20c-squashfs-sysupgrade.img.gz
341341
getmd5 $rom
342-
cp -a $rom ./ARM_Out/AE86Wrt-Radxa_E20C-No_Docker-6.12-$(date +%Y%m%d)_${md5}.img.gz
342+
cp -a $rom ./ARM_Out/AE86Wrt-Radxa_E20C-tiny-6.12-$(date +%Y%m%d)_${md5}.img.gz
343343
fi
344344
345345

‎.github/workflows/Build_x86_combined.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ jobs:
2323
diy_script: "lean"
2424
type: "lede"
2525

26-
- name: "X86-6.12-No_Docker"
26+
- name: "X86-6.12-tiny"
2727
repo_url: "https://github.com/coolsnowwolf/lede"
2828
repo_branch: "master"
2929
kernel_ver: "6.12"
30-
config_file: "./configs/X86/x86_612_non.config"
31-
file_name: "x86_612_non"
30+
config_file: "./configs/X86/x86_612_tiny.config"
31+
file_name: "x86_612_tiny"
3232
diy_script: "lean"
3333
type: "lede"
3434

‎README.md‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,16 @@
1313
***
1414

1515
* X86_64 设备固件，均为 efi 固件；基于 [Lede](https://github.com/coolsnowwolf/lede) 5.4 内核和 6.12 内核，基于 [官方 OpenWrt](https://github.com/openwrt/openwrt) 24.10 分支 6.6 内核；
16-
* 仅 X86-6.12 带 Docker 组件，其余（X86-5.4、X86-6.12-No_Docker、X86-R24.10）均不带；
17-
* X86-R24.10：移植 TurboACC，支持 SFE 转发、全锥形 NAT；
16+
* X86-5.4：经典版，适合老机器，养老固件，不带 Docker 组件；
17+
* X86-6.12：常规版，带 Docker 组件，实用插件等；
18+
* X86-6.12-tiny：常规版去除 Docker 组件；
19+
* X86-R24.10：体验版，最新的 r24.10 源码，不带 Docker 组件；移植 TurboACC，支持 SFE 转发、全锥形 NAT；
1820

1921
***
2022

2123
* Rockchip 系列固件，基于 [Lede](https://github.com/coolsnowwolf/lede) 6.12 内核；
22-
* “No_Docker”为不带 Docker 组件的固件；
24+
* 常规版：带 Docker 组件，实用插件等；
25+
* “tiny”版：常规版去除 Docker 组件；
2326
```
2427
R2S、H28K、R4S、H68K、R6S、R76S等
2528
```

configs/ARM/other/rk_non.config renamed to configs/ARM/other/rk_tiny.config

File renamed without changes.

configs/X86/x86_612_non.config renamed to configs/X86/x86_612_tiny.config

File renamed without changes.

0 commit comments

Comments
 (0)