Skip to content

Commit

Permalink
Adjust the kernel branch name beta to dev
Browse files Browse the repository at this point in the history
  • Loading branch information
ophub committed Dec 30, 2021
1 parent 9068519 commit f980db3
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions README.cn.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ armbian-update 5.4.160

如果当前目录下有成套的内核文件,可以运行 `armbian-update` 命令安装此内核。内核更新脚本会在开发中不断更新,可使用此命令同步更新本地的脚本:`wget -O /usr/sbin/armbian-update git.io/armbian-update` 。或者直接使用服务器端最新脚本进行内核更新:`bash <(curl -fsSL git.io/armbian-update) 5.4.160`

内核更新时,默认从 [stable](https://github.com/ophub/kernel/tree/main/pub/stable) 内核版本分支下载,如果下载其他 [版本分支](https://github.com/ophub/kernel/tree/main/pub) 的内核,请在第 `2` 个参数中根据分支文件夹名称指定,如 `armbian-update 5.7.19 beta` 。默认自动安装主线 u-boot,可以更好的支持 5.10 及以上内核系列的使用。如果选择不安装,请在第 `3` 个输入参数中指定,如 `armbian-update 5.4.160 stable no`
内核更新时,默认从 [stable](https://github.com/ophub/kernel/tree/main/pub/stable) 内核版本分支下载,如果下载其他 [版本分支](https://github.com/ophub/kernel/tree/main/pub) 的内核,请在第 `2` 个参数中根据分支文件夹名称指定,如 `armbian-update 5.7.19 dev` 。默认自动安装主线 u-boot,可以更好的支持 5.10 及以上内核系列的使用。如果选择不安装,请在第 `3` 个输入参数中指定,如 `armbian-update 5.4.160 stable no`

内核中的 `headers` 文件默认安装在 `/use/local/include` 目录下。在编译应用程序的时候,在 `GCC``CFLAG` 参数中添加 `-I /usr/local/include` 即可找到头文件。

Expand Down Expand Up @@ -154,7 +154,7 @@ ddbr
- `sudo ./rebuild -d -b s905x3_s905d -k 5.10.80_5.4.160` : 使用默认配置,进行多个内核同时打包。使用 `_` 进行多内核参数连接。
- `sudo ./rebuild -d` : 使用默认配置,对全部型号的电视盒子进行打包。
- `sudo ./rebuild -d -b s905x3 -k 5.4.160 -s 2748` : 使用默认配置,指定一个内核,一个型号进行打包,固件大小设定为2748M。
- `sudo ./rebuild -d -b s905x3 -v beta -k 5.7.19` : 使用默认配置,指定型号,指定版本分支,指定内核进行打包。
- `sudo ./rebuild -d -b s905x3 -v dev -k 5.7.19` : 使用默认配置,指定型号,指定版本分支,指定内核进行打包。
- `sudo ./rebuild -d -b s905x3_s905d` 使用默认配置,对多个型号的电视盒子进行全部内核打包, 使用 `_` 进行多型号连接。
- `sudo ./rebuild -d -k 5.10.80_5.4.160` : 使用默认配置,指定多个内核,进行全部型号电视盒子进行打包, 内核包使用 `_` 进行连接。
- `sudo ./rebuild -d -k 5.10.80_5.4.160 -a true` : 使用默认配置,指定多个内核,进行全部型号电视盒子进行打包, 内核包使用 `_` 进行连接。自动升级到同系列最新内核。
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ armbian-update 5.4.160

If there is a complete set of kernel files in the current directory, you can run the `armbian-update` command to install this kernel. The kernel update script will be continuously updated during development. You can use this command to update the local script synchronously: `wget -O /usr/sbin/armbian-update git.io/armbian-update` . Or directly use the latest script on the server side to update the kernel: `bash <(curl -fsSL git.io/armbian-update) 5.4.160`

When the kernel is updated, By default, download from [stable](https://github.com/ophub/kernel/tree/main/pub/stable) kernel version branch, if you download other [version branch](https://github.com/ophub/kernel/tree/main/pub), please specify according to the branch folder name in the `second` parameter, such as `armbian-update 5.7.19 beta` . The mainline u-boot is automatically installed by default, which can better support the use of kernel series 5.10 and above. If you choose not to install, please specify in the `third` input parameter, such as `armbian-update 5.4.160 stable no`
When the kernel is updated, By default, download from [stable](https://github.com/ophub/kernel/tree/main/pub/stable) kernel version branch, if you download other [version branch](https://github.com/ophub/kernel/tree/main/pub), please specify according to the branch folder name in the `second` parameter, such as `armbian-update 5.7.19 dev` . The mainline u-boot is automatically installed by default, which can better support the use of kernel series 5.10 and above. If you choose not to install, please specify in the `third` input parameter, such as `armbian-update 5.4.160 stable no`

The `headers` files in the kernel is installed in the `/use/local/include` directory. When compiling the application, add `-I /usr/local/include` to the `CFLAG` parameter of `GCC` to find the headers files.

Expand Down Expand Up @@ -154,7 +154,7 @@ According to the prompt, enter `b` to perform system backup, and enter `r` to pe
- `sudo ./rebuild -d -b s905x3_s905d -k 5.10.80_5.4.160`: Use the default configuration, specify multiple cores, and multiple firmware for compilation. use `_` to connect.
- `sudo ./rebuild -d`: Use the default configuration to pack all boxes.
- `sudo ./rebuild -d -b s905x3 -k 5.4.160 -s 2748`: Use the default configuration, specify a kernel, a firmware, and set the partition size for compilation.
- `sudo ./rebuild -d -b s905x3 -v beta -k 5.7.19`: Use the default configuration, specify the model, specify the version branch, and specify the kernel for packaging.
- `sudo ./rebuild -d -b s905x3 -v dev -k 5.7.19`: Use the default configuration, specify the model, specify the version branch, and specify the kernel for packaging.
- `sudo ./rebuild -d -b s905x3_s905d`: Use the default configuration, specify multiple firmware, use `_` to connect. compile all kernels.
- `sudo ./rebuild -d -k 5.10.80_5.4.160`: Use the default configuration. Specify multiple cores, use `_` to connect.
- `sudo ./rebuild -d -k 5.10.80_5.4.160 -a true`: Use the default configuration. Specify multiple cores, use `_` to connect. Auto update to the latest kernel of the same series.
Expand Down
4 changes: 2 additions & 2 deletions compile-kernel/README.cn.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
| -d | Defaults | 使用默认配置 |
| -k | Kernel | 指定 [kernel](https://cdn.kernel.org/pub/linux/kernel/v5.x/) 名称,如 `-k 5.4.160` . 多个内核使用 `_` 进行连接,如 `-k 5.10.80_5.4.160` |
| -a | AutoKernel | 设置是否自动采用同系列最新版本内核。当为 `true` 时,将自动查找在 `-k` 中指定的内核如 `5.4.160``5.4` 同系列是否有更新的版本,如有 `5.4.160` 之后的最新版本时,将自动更换为最新版。设置为 `false` 时将编译指定版本内核。默认值:`true` |
| -n | CustomName | 设置内核自定义签名。默认值为 `-meson64-beta` ,生成的内核名称为 `5.4.160-meson64-beta` 。设置自定义签名时请勿包含空格。 |
| -n | CustomName | 设置内核自定义签名。默认值为 `-meson64-dev` ,生成的内核名称为 `5.4.160-meson64-dev` 。设置自定义签名时请勿包含空格。 |
| -r | Repo | 指定内核编译源码的下载站。可选项为 [kernel.org](https://www.kernel.org/)[flippy](https://github.com/unifreq) ,默认为 `flippy` |

- `sudo ./recompile -d -k 5.4.160` : 使用默认配置,并通过 -k 进行指定需要编译的内核版本,多个版本同时编译时使用 `_` 进行连接。
Expand Down Expand Up @@ -52,7 +52,7 @@ sudo apt-get install -y $(curl -fsSL git.io/armbian-kernel-server)

3. 目前在 `Armbian` 系统下编译内核是最好的选择,强烈推荐。在 `x86_64` 环境下编译内核时,会自动下载 Armbian 系统,并通过 chroot 实现 `uInitrd` 文件的生成。内核编译完成后,将会按照 flippy 分享的内核文件的组织方式自动打包成 6 个内核文件,并存放在 `compile-kernel/output` 目录下。这些内核文件会自动从当前内核编译的系统中自动清除。如果你想在当前 Armbian 系统安装,可进入对应的内核目录如 `compile-kernel/output/5.4.160` 下,执行 `armbian-update` 命令进行内核安装。内核中的 `headers` 文件默认安装在 `/use/local/include` 目录下。

4. 如果当前 `Armbian` 系统中已经安装了相同名称的内核如 `5.4.160-meson64-beta` ,将会自动停止编译,因为打包时会删除本地相同名称的内核文件,这么做会造成系统瘫痪。
4. 如果当前 `Armbian` 系统中已经安装了相同名称的内核如 `5.4.160-meson64-dev` ,将会自动停止编译,因为打包时会删除本地相同名称的内核文件,这么做会造成系统瘫痪。

5. 在内核测试时,请在 `USB/TF` 设备上进行测试,请不要贸然写入 `EMMC` 分区,避免成砖;在没有熟练地掌握救砖方法之前,请不要进行自定义内核测试;请不要在正式生产环境中测试自定义内核。

4 changes: 2 additions & 2 deletions compile-kernel/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Compile a custom kernel as needed. This kernel can be used in [Armbian](https://
| -d | Defaults | Compile all kernels with default configuration. |
| -k | Kernel | Specify [kernel](https://cdn.kernel.org/pub/linux/kernel/v5.x/) name, such as `-k 5.4.160`. Multiple kernels use `_` to connect, such as `- k 5.10.80_5.4.160` |
| -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 whether there is a newer version of the kernel specified in `-k` such as `5.4.160` of the `5.4` series. If there is the latest version after `5.4.160`, it will be automatically replaced with the latest version . When set to `false`, the specified version of the kernel will be compiled. Default value: `true` |
| -n | CustomName | Set the kernel custom signature. The default value is `-meson64-beta` and the generated kernel is `5.4.160-meson64-beta`. Do not include spaces when setting a custom signature. |
| -n | CustomName | Set the kernel custom signature. The default value is `-meson64-dev` and the generated kernel is `5.4.160-meson64-dev`. Do not include spaces when setting a custom signature. |
| -r | Repo | Specify the download site of the kernel compilation source code. The available options are [kernel.org](https://www.kernel.org/) and [flippy](https://github.com/unifreq), the default is `flippy` |

- `sudo ./recompile -d -k 5.4.160`: Use the default configuration, and use the `-k` parameter to specify the kernel version to be compiled, and use `_` to link when multiple versions are compiled at the same time.
Expand Down Expand Up @@ -52,7 +52,7 @@ sudo apt-get install -y $(curl -fsSL git.io/armbian-kernel-server)

3. Currently, compiling the kernel under the `Armbian` system is the best choice, and it is highly recommended. When compiling the kernel under the `x86_64` environment, the Armbian system will be automatically downloaded, and the `uInitrd` file will be generated through chroot. After the kernel is compiled, it will be automatically packaged into 6 kernel files according to the organization of the kernel files shared by flippy and stored in the `compile-kernel/output` directory. These kernel files will be automatically cleared from the system compiled with the current kernel. If you want to install on the current Armbian system, you can enter the corresponding kernel directory such as `compile-kernel/output/5.4.160` and execute the `armbian-update` command to install the kernel. The `headers` files in the kernel is installed in the `/use/local/include` directory.

4. If a kernel with the same name such as `5.4.160-meson64-beta` is already installed in the current `Armbian` system, the compilation will automatically stop, because the local kernel file with the same name will be deleted during packaging, which will cause the system to crash.
4. If a kernel with the same name such as `5.4.160-meson64-dev` is already installed in the current `Armbian` system, the compilation will automatically stop, because the local kernel file with the same name will be deleted during packaging, which will cause the system to crash.

5. During the kernel test, please test on the `USB/TF` device, and don't write to the `EMMC` partition rashly to avoid bricking; Please do not perform a custom kernel test before you have mastered the method of system recovery proficiently; Please do not test the custom kernel in a formal production environment.

2 changes: 1 addition & 1 deletion recompile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ auto_kernel="true"

# Kernel download address and custom name
build_kernel=("5.4.160" "5.10.80")
custom_name="-meson64-beta"
custom_name="-meson64-dev"
kernel_org_repo="https://cdn.kernel.org/pub/linux/kernel/v5.x/"
kernel_flippy_repo="unifreq"
kernel_flippy_branch="main"
Expand Down

0 comments on commit f980db3

Please sign in to comment.