Skip to content

Commit

Permalink
Adjust kernel version
Browse files Browse the repository at this point in the history
  • Loading branch information
ophub committed Jan 20, 2024
1 parent 907003b commit d082284
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 28 deletions.
22 changes: 11 additions & 11 deletions README.cn.md
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ armbian-ddbr

```shell
armbian-kernel -u
armbian-kernel -k 5.10.125
armbian-kernel -k 6.6.12
```

- ### 更多使用说明
Expand Down Expand Up @@ -172,7 +172,7 @@ sudo apt-get install -y $(cat compile-kernel/tools/script/ubuntu2204-build-armbi

3. 进入 `~/amlogic-s9xxx-armbian` 根目录,在根目录下创建文件夹 `build/output/images` ,并上传 Armbian 镜像文件 ( 如:`Armbian_21.11.0-trunk_Odroidn2_current_5.15.50.img` ) 到 `~/amlogic-s9xxx-armbian/build/output/images` 目录里。原版 Armbian 镜像文件名称中的发行版本号(如:`21.11.0`)和内核版本号(如:`5.15.50`)请保留,它将在重构后用作 Armbian 系统的名称。

4. 进入 `~/amlogic-s9xxx-armbian` 根目录,然后运行 `sudo ./rebuild -b s905x3 -k 5.10.125` 命令即可生成指定 board 的 Armbian 镜像文件。生成的文件保存在 `build/output/images` 目录里。
4. 进入 `~/amlogic-s9xxx-armbian` 根目录,然后运行 `sudo ./rebuild -b s905x3 -k 6.6.12` 命令即可生成指定 board 的 Armbian 镜像文件。生成的文件保存在 `build/output/images` 目录里。

- ### 本地化打包参数说明

Expand All @@ -181,20 +181,20 @@ sudo apt-get install -y $(cat compile-kernel/tools/script/ubuntu2204-build-armbi
| -b | Board | 指定电视盒子型号,如 `-b s905x3` . 多个型号使用 `_` 进行连接,如 `-b s905x3_s905d` . 使用 `all` 表示全部型号。型号代码详见 [model_database.conf](build-armbian/armbian-files/common-files/etc/model_database.conf) 中的 `BOARD` 设置。默认值:`all` |
| -r | KernelRepo | 指定 github.com 内核仓库的 `<owner>/<repo>`。默认值:`ophub/kernel` |
| -u | kernelUsage | 设置使用的内核的 `tags 后缀`,如 [stable](https://github.com/ophub/kernel/releases/tag/kernel_stable), [flippy](https://github.com/ophub/kernel/releases/tag/kernel_flippy), [dev](https://github.com/ophub/kernel/releases/tag/kernel_dev), [beta](https://github.com/ophub/kernel/releases/tag/kernel_beta)。默认值:`stable` |
| -k | Kernel | 指定 [kernel](https://github.com/ophub/kernel/releases/tag/kernel_stable) 名称,如 `-k 5.10.125` . 多个内核使用 `_` 进行连接,如 `-k 5.10.125_5.15.50` 。通过 `-k` 参数自由指定的内核版本只对使用 `stable/flippy/dev/beta` 的内核有效。其他内核系列例如 [rk3588](https://github.com/ophub/kernel/releases/tag/kernel_rk3588) / [rk35xx](https://github.com/ophub/kernel/releases/tag/kernel_rk35xx) / [h6](https://github.com/ophub/kernel/releases/tag/kernel_h6) 等只能使用特定内核。 |
| -a | AutoKernel | 设置是否自动采用同系列最新版本内核。当为 `true` 时,将自动在内核库中查找在 `-k` 中指定的内核如 5.10.125 的同系列是否有更新的版本,如有 5.10.125 之后的最新版本时,将自动更换为最新版。设置为 `false` 时将编译指定版本内核。默认值:`true` |
| -k | Kernel | 指定 [kernel](https://github.com/ophub/kernel/releases/tag/kernel_stable) 名称,如 `-k 6.6.12` . 多个内核使用 `_` 进行连接,如 `-k 6.6.12_5.15.50` 。通过 `-k` 参数自由指定的内核版本只对使用 `stable/flippy/dev/beta` 的内核有效。其他内核系列例如 [rk3588](https://github.com/ophub/kernel/releases/tag/kernel_rk3588) / [rk35xx](https://github.com/ophub/kernel/releases/tag/kernel_rk35xx) / [h6](https://github.com/ophub/kernel/releases/tag/kernel_h6) 等只能使用特定内核。 |
| -a | AutoKernel | 设置是否自动采用同系列最新版本内核。当为 `true` 时,将自动在内核库中查找在 `-k` 中指定的内核如 6.6.12 的同系列是否有更新的版本,如有 6.6.12 之后的最新版本时,将自动更换为最新版。设置为 `false` 时将编译指定版本内核。默认值:`true` |
| -t | RootfsType | 对系统的 ROOTFS 分区的文件系统类型进行设置,可选项为 `ext4``btrfs` 类型。例如: `-t btrfs`。默认值:`ext4` |
| -s | Size | 对系统的 ROOTFS 分区大小进行设置,系统大小必须大于 2048MiB. 例如: `-s 2560`。默认值:`2560` |
| -n | BuilderName | 设置 Armbian 系统构建者签名。设置签名时请勿包含空格。默认值:`` |

- `sudo ./rebuild` : 使用默认配置,对全部型号的电视盒子进行打包。
- `sudo ./rebuild -b s905x3 -k 5.10.125` : 推荐使用. 使用默认配置进行相关内核打包。
- `sudo ./rebuild -b s905x3_s905d -k 5.10.125_5.15.50` : 使用默认配置,进行多个内核同时打包。使用 `_` 进行多内核参数连接。
- `sudo ./rebuild -b s905x3 -k 5.10.125 -s 2560` : 使用默认配置,指定一个内核,一个型号进行打包,系统大小设定为2560MiB。
- `sudo ./rebuild -b s905x3 -k 6.6.12` : 推荐使用. 使用默认配置进行相关内核打包。
- `sudo ./rebuild -b s905x3_s905d -k 6.6.12_5.15.50` : 使用默认配置,进行多个内核同时打包。使用 `_` 进行多内核参数连接。
- `sudo ./rebuild -b s905x3 -k 6.6.12 -s 2560` : 使用默认配置,指定一个内核,一个型号进行打包,系统大小设定为2560MiB。
- `sudo ./rebuild -b s905x3_s905d` 使用默认配置,对多个型号的电视盒子进行全部内核打包, 使用 `_` 进行多型号连接。
- `sudo ./rebuild -k 5.10.125_5.15.50` : 使用默认配置,指定多个内核,进行全部型号电视盒子进行打包, 内核包使用 `_` 进行连接。
- `sudo ./rebuild -k 5.10.125_5.15.50 -a true` : 使用默认配置,指定多个内核,进行全部型号电视盒子进行打包, 内核包使用 `_` 进行连接。自动升级到同系列最新内核。
- `sudo ./rebuild -t btrfs -s 2560 -k 5.10.125` : 使用默认配置,设置文件系统为 btrfs 格式,分区大小为 2560MiB, 并指定内核为 5.10.125 ,对全部型号电视盒子进行打包。
- `sudo ./rebuild -k 6.6.12_5.15.50` : 使用默认配置,指定多个内核,进行全部型号电视盒子进行打包, 内核包使用 `_` 进行连接。
- `sudo ./rebuild -k 6.6.12_5.15.50 -a true` : 使用默认配置,指定多个内核,进行全部型号电视盒子进行打包, 内核包使用 `_` 进行连接。自动升级到同系列最新内核。
- `sudo ./rebuild -t btrfs -s 2560 -k 6.6.12` : 使用默认配置,设置文件系统为 btrfs 格式,分区大小为 2560MiB, 并指定内核为 6.6.12 ,对全部型号电视盒子进行打包。

## 使用 GitHub Actions 进行编译

Expand All @@ -213,7 +213,7 @@ sudo apt-get install -y $(cat compile-kernel/tools/script/ubuntu2204-build-armbi
build_target: armbian
armbian_path: build/output/images/*.img
armbian_board: s905d_s905x3_s922x_s905x
armbian_kernel: 5.10.125_5.15.50
armbian_kernel: 6.6.12_5.15.50
```

- ### GitHub Actions 输入参数说明
Expand Down
22 changes: 11 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ For the usage of compiling the kernel in Armbian, please refer to the [Compile K

```shell
armbian-kernel -u
armbian-kernel -k 5.10.125
armbian-kernel -k 6.6.12
```

- ### More Usage Instructions
Expand Down Expand Up @@ -172,7 +172,7 @@ sudo apt-get install -y $(cat compile-kernel/tools/script/ubuntu2204-build-armbi

3. Enter the `~/amlogic-s9xxx-armbian` root directory, create a `build/output/images` folder in the root directory, and upload the Armbian image file (such as `Armbian_21.11.0-trunk_Odroidn2_current_5.15.50.img`) to `~/amlogic-s9xxx-armbian/build/output/images` directory. Please keep the release version number (such as `21.11.0`) and the kernel version number (such as `5.15.50`) in the original Armbian image file name. It will be used as the name of the Armbian system after restructuring.

4. Enter the `~/amlogic-s9xxx-armbian` root directory, and then run the `sudo ./rebuild -b s905x3 -k 5.10.125` command to generate the Armbian image file for the specified board. The generated file is saved in the `build/output/images` directory.
4. Enter the `~/amlogic-s9xxx-armbian` root directory, and then run the `sudo ./rebuild -b s905x3 -k 6.6.12` command to generate the Armbian image file for the specified board. The generated file is saved in the `build/output/images` directory.

- ### Local Packaging Parameter Description

Expand All @@ -181,20 +181,20 @@ sudo apt-get install -y $(cat compile-kernel/tools/script/ubuntu2204-build-armbi
| -b | Board | Specify the TV box model, such as `-b s905x3`. Connect multiple models with `_`, such as `-b s905x3_s905d`. Use `all` to represent all models. The model code can be found in the `BOARD` setting in [model_database.conf](build-armbian/armbian-files/common-files/etc/model_database.conf). Default value: `all` |
| -r | KernelRepo | Specify the `<owner>/<repo>` of the github.com kernel repository. Default value: `ophub/kernel` |
| -u | kernelUsage | Set the `tags suffix` of the kernel used, such as [stable](https://github.com/ophub/kernel/releases/tag/kernel_stable), [flippy](https://github.com/ophub/kernel/releases/tag/kernel_flippy), [dev](https://github.com/ophub/kernel/releases/tag/kernel_dev), [beta](https://github.com/ophub/kernel/releases/tag/kernel_beta). Default value: `stable` |
| -k | Kernel | Specify [kernel](https://github.com/ophub/kernel/releases/tag/kernel_stable) name, such as `-k 5.10.125`. Connect multiple kernels with `_`, such as `-k 5.10.125_5.15.50`. The kernel version freely specified by the `-k` parameter is only valid for kernels using `stable/flippy/dev/beta`. Other kernel series such as [rk3588](https://github.com/ophub/kernel/releases/tag/kernel_rk3588) / [rk35xx](https://github.com/ophub/kernel/releases/tag/kernel_rk35xx) / [h6](https://github.com/ophub/kernel/releases/tag/kernel_h6) can only use specific kernels. |
| -a | AutoKernel | Set whether to automatically adopt the latest version of the same series of kernels. When it is `true`, it will automatically look for whether there is a newer version of the same series in the kernel library in the kernel specified in `-k`, such as 5.10.125. If there is a latest version after 5.10.125, it will be automatically changed to the latest version. When set to `false`, it will compile the specified version of the kernel. Default value: `true` |
| -k | Kernel | Specify [kernel](https://github.com/ophub/kernel/releases/tag/kernel_stable) name, such as `-k 6.6.12`. Connect multiple kernels with `_`, such as `-k 6.6.12_5.15.50`. The kernel version freely specified by the `-k` parameter is only valid for kernels using `stable/flippy/dev/beta`. Other kernel series such as [rk3588](https://github.com/ophub/kernel/releases/tag/kernel_rk3588) / [rk35xx](https://github.com/ophub/kernel/releases/tag/kernel_rk35xx) / [h6](https://github.com/ophub/kernel/releases/tag/kernel_h6) can only use specific kernels. |
| -a | AutoKernel | Set whether to automatically adopt the latest version of the same series of kernels. When it is `true`, it will automatically look for whether there is a newer version of the same series in the kernel library in the kernel specified in `-k`, such as 6.6.12. If there is a latest version after 6.6.12, it will be automatically changed to the latest version. When set to `false`, it will compile the specified version of the kernel. Default value: `true` |
| -t | RootfsType | Set the file system type of the system's ROOTFS partition, the options are `ext4` or `btrfs` type. For example: `-t btrfs`. Default value: `ext4` |
| -s | Size | Set the size of the system's ROOTFS partition, the system size must be greater than 2048MiB. For example: `-s 2560`. Default value: `2560` |
| -n | BuilderName | Set the Armbian system builder signature. Do not include spaces when setting the signature. Default value: `None` |

- `sudo ./rebuild`: Use the default configuration to package all models of TV boxes.
- `sudo ./rebuild -b s905x3 -k 5.10.125`: Recommended. Use the default configuration to package related kernels.
- `sudo ./rebuild -b s905x3_s905d -k 5.10.125_5.15.50`: Use the default configuration, package multiple kernels at the same time. Use `_` to connect multiple kernel parameters.
- `sudo ./rebuild -b s905x3 -k 5.10.125 -s 2560`: Use the default configuration, specify a kernel, a model for packaging, the system size is set to 2560MiB.
- `sudo ./rebuild -b s905x3 -k 6.6.12`: Recommended. Use the default configuration to package related kernels.
- `sudo ./rebuild -b s905x3_s905d -k 6.6.12_5.15.50`: Use the default configuration, package multiple kernels at the same time. Use `_` to connect multiple kernel parameters.
- `sudo ./rebuild -b s905x3 -k 6.6.12 -s 2560`: Use the default configuration, specify a kernel, a model for packaging, the system size is set to 2560MiB.
- `sudo ./rebuild -b s905x3_s905d` Use the default configuration, package all kernels for multiple models of TV boxes, use `_` to connect multiple models.
- `sudo ./rebuild -k 5.10.125_5.15.50`: Use the default configuration, specify multiple kernels, and package all models of TV boxes, the kernel package uses `_` for connection.
- `sudo ./rebuild -k 5.10.125_5.15.50 -a true`: Use the default configuration, specify multiple kernels, and package all models of TV boxes, the kernel package uses `_` for connection. Automatically upgrade to the latest kernel of the same series.
- `sudo ./rebuild -t btrfs -s 2560 -k 5.10.125`: Use the default configuration, set the file system to btrfs format, the partition size is 2560MiB, and specify the kernel as 5.10.125, package for all models of TV boxes.
- `sudo ./rebuild -k 6.6.12_5.15.50`: Use the default configuration, specify multiple kernels, and package all models of TV boxes, the kernel package uses `_` for connection.
- `sudo ./rebuild -k 6.6.12_5.15.50 -a true`: Use the default configuration, specify multiple kernels, and package all models of TV boxes, the kernel package uses `_` for connection. Automatically upgrade to the latest kernel of the same series.
- `sudo ./rebuild -t btrfs -s 2560 -k 6.6.12`: Use the default configuration, set the file system to btrfs format, the partition size is 2560MiB, and specify the kernel as 6.6.12, package for all models of TV boxes.

## Use GitHub Actions for Compilation

Expand All @@ -213,7 +213,7 @@ sudo apt-get install -y $(cat compile-kernel/tools/script/ubuntu2204-build-armbi
build_target: armbian
armbian_path: build/output/images/*.img
armbian_board: s905d_s905x3_s922x_s905x
armbian_kernel: 5.10.125_5.15.50
armbian_kernel: 6.6.12_5.15.50
```

- ### GitHub Actions Input Parameter Description
Expand Down
6 changes: 3 additions & 3 deletions documents/README.cn.md
Original file line number Diff line number Diff line change
Expand Up @@ -408,8 +408,8 @@ armbian-update

更新内核时会自动备份当前系统使用的内核,存储路径在 `/ddbr/backup` 目录里,保留最近使用过的 3 个版本的内核,如果新安装的内核不稳定,可以随时恢复回备份的内核:
```shell
# 进入备份的内核目录,如 5.10.125
cd /ddbr/backup/5.10.125
# 进入备份的内核目录,如 6.6.12
cd /ddbr/backup/6.6.12
# 执行更新内核命令,会自动安装当前目录下的内核
armbian-update
```
Expand All @@ -429,7 +429,7 @@ armbian-update -s /dev/sda
armbian-update -s
```

如果你访问 github.com 的网络不通畅,无法在线下载更新时,可以手动下载内核,上传至 Armbian 系统的任意目录,并进入内核目录,执行 `armbian-update` 进行本地安装。如果当前目录下有成套的内核文件,将使用当前目录的内核进行更新(更新需要的 4 个内核文件是 `header-xxx.tar.gz`, `boot-xxx.tar.gz`, `dtb-xxx.tar.gz`, `modules-xxx.tar.gz`。其他内核文件不需要,如果同时存在也不影响更新,系统可以准确识别需要的内核文件)。在设备支持的可选内核里可以自由更新,如从 5.10.125 内核更新为 5.15.50 内核。
如果你访问 github.com 的网络不通畅,无法在线下载更新时,可以手动下载内核,上传至 Armbian 系统的任意目录,并进入内核目录,执行 `armbian-update` 进行本地安装。如果当前目录下有成套的内核文件,将使用当前目录的内核进行更新(更新需要的 4 个内核文件是 `header-xxx.tar.gz`, `boot-xxx.tar.gz`, `dtb-xxx.tar.gz`, `modules-xxx.tar.gz`。其他内核文件不需要,如果同时存在也不影响更新,系统可以准确识别需要的内核文件)。在设备支持的可选内核里可以自由更新,如从 6.6.12 内核更新为 5.15.50 内核。

通过 `-r`/`-u`/`-b` 等参数设置的自定义选项,可以固定填写到个性化配置文件 `/etc/ophub-release` 的相关参数里,避免每次输入。对应设置为:

Expand Down
6 changes: 3 additions & 3 deletions documents/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -408,8 +408,8 @@ When specifying the kernel version number through the `-k` parameter, you can ac

When updating the kernel, the currently used system kernel will be automatically backed up, stored in the `/ddbr/backup` directory, retaining the three most recently used kernel versions. If the newly installed kernel is unstable, you can restore to the backed-up kernel at any time:
```shell
# Enter the backup kernel directory, such as 5.10.125
cd /ddbr/backup/5.10.125
# Enter the backup kernel directory, such as 6.6.12
cd /ddbr/backup/6.6.12
# Execute the kernel update command, which will automatically install the kernel in the current directory
armbian-update
```
Expand All @@ -429,7 +429,7 @@ armbian-update -s /dev/sda
armbian-update -s
```

If your network access to github.com is poor and you can't update online, you can manually download the kernel, upload it to any directory of the Armbian system, and enter the kernel directory to execute `armbian-update` for local installation. If there's a complete set of kernel files in the current directory, it will use the kernel from the current directory for the update (the four kernel files needed for the update are `header-xxx.tar.gz`, `boot-xxx.tar.gz`, `dtb-xxx.tar.gz`, `modules-xxx.tar.gz`. Other kernel files are not necessary and their presence does not affect the update. The system can accurately identify needed kernel files). You can freely update among the optional kernels supported by the device, such as updating from kernel 5.10.125 to kernel 5.15.50.
If your network access to github.com is poor and you can't update online, you can manually download the kernel, upload it to any directory of the Armbian system, and enter the kernel directory to execute `armbian-update` for local installation. If there's a complete set of kernel files in the current directory, it will use the kernel from the current directory for the update (the four kernel files needed for the update are `header-xxx.tar.gz`, `boot-xxx.tar.gz`, `dtb-xxx.tar.gz`, `modules-xxx.tar.gz`. Other kernel files are not necessary and their presence does not affect the update. The system can accurately identify needed kernel files). You can freely update among the optional kernels supported by the device, such as updating from kernel 6.6.12 to kernel 5.15.50.

Custom options set by `-r`/`-u`/`-b` parameters can be permanently written into the relevant parameters in the individual configuration file `/etc/ophub-release`, to avoid entering it each time. The corresponding settings are:

Expand Down

0 comments on commit d082284

Please sign in to comment.