diff --git a/.github/workflows/rebuild-armbian.yml b/.github/workflows/rebuild-armbian.yml index 65be129b88..e2e47cb138 100644 --- a/.github/workflows/rebuild-armbian.yml +++ b/.github/workflows/rebuild-armbian.yml @@ -25,6 +25,10 @@ on: description: "Input armbian size" required: false default: "2748" + armbian_fstype: + description: "Input rootfs type: [ ext4 / btrfs ]" + required: false + default: "ext4" env: TZ: Asia/Shanghai @@ -88,6 +92,7 @@ jobs: armbian_soc: ${{ github.event.inputs.armbian_soc }} armbian_kernel: ${{ github.event.inputs.armbian_kernel }} armbian_size: ${{ github.event.inputs.armbian_size }} + armbian_fstype: ${{ github.event.inputs.armbian_fstype }} - name: Upload Armbian image to Release id: release diff --git a/README.cn.md b/README.cn.md index 18f3b08d65..e6e100d2aa 100644 --- a/README.cn.md +++ b/README.cn.md @@ -166,6 +166,7 @@ armbian-ddbr | -k | Kernel | 指定 [kernel](https://github.com/ophub/kernel/tree/main/pub/stable) 名称,如 `-k 5.4.180` . 多个内核使用 `_` 进行连接,如 `-k 5.15.25_5.4.180` | | -a | AutoKernel | 设置是否自动采用同系列最新版本内核。当为 `true` 时,将自动在内核库中查找在 `-k` 中指定的内核如 5.4.180 的 5.4 同系列是否有更新的版本,如有 5.4.180 之后的最新版本时,将自动更换为最新版。设置为 `false` 时将编译指定版本内核。默认值:`true` | | -s | Size | 对固件的 ROOTFS 分区大小进行设置,默认大小为 2748M, 固件大小必须大于 2000M. 例如: `-s 2748` | +| -t | RootfsType | 对固件的 ROOTFS 分区的文件系统类型进行设置,默认为 `ext4` 类型,可选项为 `ext4` 或 `btrfs` 类型。例如: `-t btrfs` | - `sudo ./rebuild -d` : 使用默认配置,对全部型号的电视盒子进行打包。 - `sudo ./rebuild -d -b s905x3 -k 5.4.180` : 推荐使用. 使用默认配置进行相关内核打包。 @@ -227,6 +228,7 @@ sudo apt-get install -y $(curl -fsSL git.io/ubuntu-2004-server) | armbian_kernel | 5.15.25_5.4.180 | 设置内核 [版本](https://github.com/ophub/kernel/tree/main/pub/stable),功能参考 `-k` | | auto_kernel | true | 设置是否自动采用同系列最新版本内核,功能参考 `-a` | | armbian_size | 2748 | 设置固件 ROOTFS 分区的大小,功能参考 `-s` | +| armbian_fstype | ext4 | 设置固件 ROOTFS 分区的文件系统类型,功能参考 `-t` | - GitHub Actions 输出变量说明 diff --git a/README.md b/README.md index f01a9bddf6..2e898d2eed 100644 --- a/README.md +++ b/README.md @@ -166,6 +166,7 @@ According to the prompt, enter `b` to perform system backup, and enter `r` to pe | -k | Kernel | Specify the [kernel version](https://github.com/ophub/kernel/tree/main/pub/stable), Such as `-k 5.4.180` . Multiple kernel use `_` connection such as `-k 5.15.25_5.4.180` | | -a | AutoKernel | Set whether to automatically adopt the latest version of the kernel of the same series. When it is `true`, it will automatically find in the kernel library whether there is an updated version of the kernel specified in `-k` such as 5.4.180 version. If there is the latest version of 5.4 same series, it will automatically Replace with the latest version. When set to `false`, the specified version of the kernel will be compiled. Default value: `true` | | -s | Size | Specify the size of the ROOTFS partition in MB. The default is 2748, and the specified size must be greater than 2000. Such as `-s 2748` | +| -t | RootfsType | Set the file system type of the ROOTFS partition of the firmware, the default is `ext4` type, and the options are `ext4` or `btrfs` type. Such as `-t btrfs` | - `sudo ./rebuild -d`: Use the default configuration to pack all boxes. - `sudo ./rebuild -d -b s905x3 -k 5.4.180`: recommend. Use the default configuration, specify a kernel and a firmware for compilation. @@ -227,6 +228,7 @@ For the related settings of GitHUB RELEASES_TOKEN, please refer to: [RELEASES_TO | armbian_kernel | 5.15.25_5.4.180 | Set kernel [version](https://github.com/ophub/kernel/tree/main/pub/stable), function reference `-k` | | auto_kernel | true | Set whether to automatically use the latest version of the same series of kernels, function reference `-a` | | armbian_size | 2748 | Set the size of the firmware ROOTFS partition, function reference `-s` | +| armbian_fstype | ext4 | Set the file system type of the firmware ROOTFS partition, function reference `-t` | - GitHub Actions Output variable description diff --git a/action.yml b/action.yml index 366eb5c18c..75eb8ed60e 100644 --- a/action.yml +++ b/action.yml @@ -28,6 +28,10 @@ inputs: description: "Set armbian rootfs size." required: false default: "2748" + armbian_fstype: + description: "Set armbian rootfs type." + required: false + default: "ext4" armbian_path: description: "Set armbian original file path." required: false