kernel bump to 5.15

thangnd85 · Jan 21, 2022 · f16cc68 · f16cc68
1 parent ab56402
commit f16cc68
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 26 deletions.
diff --git a/.github/workflows/compile-kernel.yml b/.github/workflows/compile-kernel.yml
@@ -16,7 +16,7 @@ on:
       kernel_ver:
         description: "Kernel version: 5.4.170"
         required: false
-        default: "5.4.170_5.10.90"
+        default: "5.4.170_5.15.13"
 
 env:
   TZ: Asia/Shanghai
@@ -47,7 +47,7 @@ jobs:
           echo "KERNEL_REPO=${kernel_repo}" >> $GITHUB_ENV
 
           kernel_ver="${{ github.event.inputs.kernel_ver }}"
-          [ -z "${kernel_ver}" ] && kernel_ver="5.4.170_5.10.90"
+          [ -z "${kernel_ver}" ] && kernel_ver="5.4.170_5.15.13"
           echo "KERNEL_VER=${kernel_ver}" >> $GITHUB_ENV
 
       - name: Compile the Kernel [ -k ${{ env.KERNEL_VER }} -r ${{ env.KERNEL_REPO }} ]

diff --git a/.github/workflows/rebuild-armbian.yml b/.github/workflows/rebuild-armbian.yml
@@ -73,7 +73,7 @@ jobs:
         with:
           armbian_path: ${{ env.ARMBIAN_URL }}
           armbian_soc: s905x3_s905d
-          armbian_kernel: 5.15.13_5.10.90_5.4.170
+          armbian_kernel: 5.4.170_5.15.13
 
       - name: Upload Armbian image to Release
         id: release

diff --git a/README.cn.md b/README.cn.md
@@ -44,7 +44,7 @@ armbian-install
 armbian-update
 ```
 
-如果当前目录下有成套的内核文件，将使用当前目录的内核进行更新。如果当前目录没有内核文件，将从服务器查询并下载同系列的最新内核进行更新。你也可以查询[可选内核](https://github.com/ophub/kernel/tree/main/pub/stable)版本，进行指定版本更新：`armbian-update 5.4.170`。在设备支持的可选内核里可以自由更新，如从 5.4.170 内核更新为 5.10.90 内核。内核更新脚本会在开发中不断更新，可使用此命令同步更新本地的脚本：`wget -O /usr/sbin/armbian-update git.io/armbian-update` 。或者直接使用服务器端最新脚本进行内核更新：`bash <(curl -fsSL git.io/armbian-update) 5.4.170`
+如果当前目录下有成套的内核文件，将使用当前目录的内核进行更新。如果当前目录没有内核文件，将从服务器查询并下载同系列的最新内核进行更新。你也可以查询[可选内核](https://github.com/ophub/kernel/tree/main/pub/stable)版本，进行指定版本更新：`armbian-update 5.4.170`。在设备支持的可选内核里可以自由更新，如从 5.4.170 内核更新为 5.15.13 内核。内核更新脚本会在开发中不断更新，可使用此命令同步更新本地的脚本：`wget -O /usr/sbin/armbian-update git.io/armbian-update` 。或者直接使用服务器端最新脚本进行内核更新：`bash <(curl -fsSL git.io/armbian-update) 5.4.170`
 
 内核更新时，默认从 [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，如果选择安装，请在第 `3` 个输入参数中指定，如 `armbian-update 5.4.170 stable yes`
 
@@ -148,18 +148,18 @@ ddbr
 | -d | Defaults | 使用默认配置 |
 | -b | Build | 指定电视盒子型号，如 `-b s905x3` . 多个型号使用 `_` 进行连接，如 `-b s905x3_s905d` . 可以指定的型号有: `s905x3`, `s905x2`, `s905x`, `s905w`, `s905d`, `s905d-ki`, `s905`, `s922x`, `s922x-n2`, `s912`, `s912-t95z` 。说明：`s922x-reva` 是 `s922x-gtking-pro-rev_a`，`s922x-n2` 是 `s922x-odroid-n2` ，`s912-t95z` 是 `s912-t95z-plus` ，`s905d-ki` 是 `s912-mecool-ki-pro`，`s905x2-km3` 是 `s905x2-mecool-km3` |
 | -v | Version | 指定内核 [版本分支](https://github.com/ophub/kernel/tree/main/pub) 名称，如 `-v stable` 。指定的名称须与分支目录名称相同。默认使用 `stable` 分支版本。 |
-| -k | Kernel | 指定 [kernel](https://github.com/ophub/kernel/tree/main/pub/stable) 名称，如 `-k 5.4.170` . 多个内核使用 `_` 进行连接，如 `-k 5.10.90_5.4.170` |
+| -k | Kernel | 指定 [kernel](https://github.com/ophub/kernel/tree/main/pub/stable) 名称，如 `-k 5.4.170` . 多个内核使用 `_` 进行连接，如 `-k 5.15.13_5.4.170` |
 | -a | AutoKernel | 设置是否自动采用同系列最新版本内核。当为 `true` 时，将自动在内核库中查找在 `-k` 中指定的内核如 5.4.170 的 5.4 同系列是否有更新的版本，如有 5.4.170 之后的最新版本时，将自动更换为最新版。设置为 `false` 时将编译指定版本内核。默认值：`true` |
 | -s | Size | 对固件的 ROOTFS 分区大小进行设置，默认大小为 2748M, 固件大小必须大于 2000M. 例如： `-s 2748` |
 
 - `sudo ./rebuild -d -b s905x3 -k 5.4.170` : 推荐使用. 使用默认配置进行相关内核打包。
-- `sudo ./rebuild -d -b s905x3_s905d -k 5.10.90_5.4.170` : 使用默认配置，进行多个内核同时打包。使用 `_` 进行多内核参数连接。
+- `sudo ./rebuild -d -b s905x3_s905d -k 5.15.13_5.4.170` : 使用默认配置，进行多个内核同时打包。使用 `_` 进行多内核参数连接。
 - `sudo ./rebuild -d` : 使用默认配置，对全部型号的电视盒子进行打包。
 - `sudo ./rebuild -d -b s905x3 -k 5.4.170 -s 2748` : 使用默认配置，指定一个内核，一个型号进行打包，固件大小设定为2748M。
 - `sudo ./rebuild -d -b s905x3 -v dev -k 5.7.19` : 使用默认配置，指定型号，指定版本分支，指定内核进行打包。
 - `sudo ./rebuild -d -b s905x3_s905d`  使用默认配置，对多个型号的电视盒子进行全部内核打包, 使用 `_` 进行多型号连接。
-- `sudo ./rebuild -d -k 5.10.90_5.4.170` : 使用默认配置，指定多个内核，进行全部型号电视盒子进行打包, 内核包使用 `_` 进行连接。
-- `sudo ./rebuild -d -k 5.10.90_5.4.170 -a true` : 使用默认配置，指定多个内核，进行全部型号电视盒子进行打包, 内核包使用 `_` 进行连接。自动升级到同系列最新内核。
+- `sudo ./rebuild -d -k 5.15.13_5.4.170` : 使用默认配置，指定多个内核，进行全部型号电视盒子进行打包, 内核包使用 `_` 进行连接。
+- `sudo ./rebuild -d -k 5.15.13_5.4.170 -a true` : 使用默认配置，指定多个内核，进行全部型号电视盒子进行打包, 内核包使用 `_` 进行连接。自动升级到同系列最新内核。
 - `sudo ./rebuild -d -s 2748 -k 5.4.170` : 使用默认配置，设置固件大小为 2748M, 并指定内核为 5.4.170 ，对全部型号电视盒子进行打包。
 
 - ### 本地化打包
@@ -174,7 +174,7 @@ sudo apt-get install -y $(curl -fsSL git.io/ubuntu-2004-server)
 
 2. 克隆仓库到本地 `git clone --depth 1 https://github.com/ophub/amlogic-s9xxx-armbian.git`
 
-3. 在根目录下创建文件夹 `build/output/images` ，并上传 Armbian 镜像文件 ( 如：`Armbian_21.11.0-trunk_Lepotato_current_5.10.90.img` ) 到 `~/amlogic-s9xxx-armbian/build/output/images` 目录里。原版 Armbian 镜像文件名称中的发行版本号（如：`21.11.0`）和内核版本号（如：`5.10.90`）请保留，它将在重构后用作 Armbian 固件的名称。
+3. 在根目录下创建文件夹 `build/output/images` ，并上传 Armbian 镜像文件 ( 如：`Armbian_21.11.0-trunk_Lepotato_current_5.15.13.img` ) 到 `~/amlogic-s9xxx-armbian/build/output/images` 目录里。原版 Armbian 镜像文件名称中的发行版本号（如：`21.11.0`）和内核版本号（如：`5.15.13`）请保留，它将在重构后用作 Armbian 固件的名称。
 
 4. 进入 `~/amlogic-s9xxx-armbian` 根目录，然后运行 `sudo ./rebuild -d -b s905x3 -k 5.4.170` 命令即可生成指定 soc 的 Armbian 镜像文件。生成的文件保存在 `build/output/images` 目录里。
 
@@ -196,7 +196,7 @@ sudo apt-get install -y $(curl -fsSL git.io/ubuntu-2004-server)
   with:
     armbian_path: build/output/images/*.img
     armbian_soc: s905d_s905x3_s922x_s905x
-    armbian_kernel: 5.10.90_5.4.170
+    armbian_kernel: 5.15.13_5.4.170
 ```
 
 - GitHub Action 输入参数说明
@@ -206,7 +206,7 @@ sudo apt-get install -y $(curl -fsSL git.io/ubuntu-2004-server)
 | armbian_path         | no                     | 设置原版 Armbian 文件的路径，支持使用当前工作流中的文件路径如 `build/output/images/*.img` ，也支持使用网络下载地址如： `https://dl.armbian.com/*/Armbian_*.img.xz` |
 | armbian_soc        | s905d_s905x3           | 设置打包盒子的 `SOC` ，可指定单个盒子如 `s905x3` ，可选择多个盒子用_连接如 `s905x3_s905d` 。各盒子的SoC代码为：`s905x3`, `s905x2`, `s905x`, `s905w`, `s905d`, `s905d-ki`, `s905`, `s922x`, `s922x-n2`, `s912`, `s912-t95z` 。说明：`s922x-reva` 是 `s922x-gtking-pro-rev_a`，`s922x-n2` 是 `s922x-odroid-n2` ，`s912-t95z` 是 `s912-t95z-plus` ，`s905d-ki` 是 `s912-mecool-ki-pro`，`s905x2-km3` 是 `s905x2-mecool-km3` |
 | version_branch         | stable                 | 指定内核 [版本分支](https://github.com/ophub/kernel/tree/main/pub) 名称，如 `stable` 。指定的名称须与分支目录名称相同。默认使用 `stable` 分支版本 |
-| armbian_kernel         | 5.10.90_5.4.170        | 设置内核 [版本](https://github.com/ophub/kernel/tree/main/pub/stable) 如 `5.4.170` ，多个内核使用 `_` 进行连接，如 `5.10.90_5.4.170` |
+| armbian_kernel         | 5.15.13_5.4.170        | 设置内核 [版本](https://github.com/ophub/kernel/tree/main/pub/stable) 如 `5.4.170` ，多个内核使用 `_` 进行连接，如 `5.15.13_5.4.170` |
 | auto_kernel            | true                   | 设置是否自动采用同系列最新版本内核。当为 `true` 时，将自动在内核库中查找在 `amlogic_kernel` 中指定的内核如 5.4.170 的 5.4 同系列是否有更新的版本，如有 5.4.170 之后的最新版本时，将自动更换为最新版。设置为 `false` 时将编译指定版本内核。默认值：`true` |
 | armbian_size           | 2748                   | 设置固件 ROOTFS 分区的大小，必须大于 2000                         |
 

diff --git a/README.md b/README.md
@@ -44,7 +44,7 @@ Login in to armbian → input command:
 armbian-update
 ```
 
-If there is a set of kernel files in the current directory, it will be updated with the kernel in the current directory. If there is no kernel file in the current directory, it will query and download the latest kernel of the same series from the server for update. You can also query the [optional kernel](https://github.com/ophub/kernel/tree/main/pub/stable) version and update the specified version: `armbian-update 5.4.170`. The optional kernel supported by the device can be freely updated, such as from 5.4.170 kernel to 5.10.90 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.170`
+If there is a set of kernel files in the current directory, it will be updated with the kernel in the current directory. If there is no kernel file in the current directory, it will query and download the latest kernel of the same series from the server for update. You can also query the [optional kernel](https://github.com/ophub/kernel/tree/main/pub/stable) version and update the specified version: `armbian-update 5.4.170`. The optional kernel supported by the device can be freely updated, such as from 5.4.170 kernel to 5.15.13 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.170`
 
 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 `2` parameter, such as `armbian-update 5.7.19 dev` . The mainline u-boot is not installed by default, and individual boxes need to be installed when using kernels above 5.10. If you choose to install, specify it in the `3` input parameter, e.g. `armbian-update 5.4.170 stable yes`
 
@@ -148,18 +148,18 @@ According to the prompt, enter `b` to perform system backup, and enter `r` to pe
 | -d | Defaults | Compile all cores and all firmware types. |
 | -b | Build | Specify the Build firmware type. Write the build firmware name individually, such as `-b s905x3` . Multiple firmware use `_` connect such as `-b s905x3_s905d` . You can use these codes: `s905x3`, `s905x2`, `s905x`, `s905w`, `s905d`, `s905d-ki`, `s905`, `s922x`, `s922x-n2`, `s912`, `s912-t95z` . Note: `s922x-reva` is `s922x-gtking-pro-rev_a`, `s922x-n2` is `s922x-odroid-n2`, `s912-t95z` is `s912-t95z-plus`, `s905d-ki` is `s912-mecool-ki-pro`, `s905x2-km3` is `s905x2-mecool-km3`. |
 | -v | Version | Specify the [version branch](https://github.com/ophub/kernel/tree/main/pub), Such as `-v stable`. The specified name must be the same as the branch directory name. The `stable` branch version is used by default. |
-| -k | Kernel | Specify the [kernel version](https://github.com/ophub/kernel/tree/main/pub/stable), Such as `-k 5.4.170` . Multiple kernel use `_` connection such as `-k 5.10.90_5.4.170` |
+| -k | Kernel | Specify the [kernel version](https://github.com/ophub/kernel/tree/main/pub/stable), Such as `-k 5.4.170` . Multiple kernel use `_` connection such as `-k 5.15.13_5.4.170` |
 | -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.170 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` |
 
 - `sudo ./rebuild -d -b s905x3 -k 5.4.170`: recommend. Use the default configuration, specify a kernel and a firmware for compilation.
-- `sudo ./rebuild -d -b s905x3_s905d -k 5.10.90_5.4.170`: Use the default configuration, specify multiple cores, and multiple firmware for compilation. use `_` to connect.
+- `sudo ./rebuild -d -b s905x3_s905d -k 5.15.13_5.4.170`: 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.170 -s 2748`: Use the default configuration, specify a kernel, a firmware, and set the partition size for compilation.
 - `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.90_5.4.170`: Use the default configuration. Specify multiple cores, use `_` to connect.
-- `sudo ./rebuild -d -k 5.10.90_5.4.170 -a true`: Use the default configuration. Specify multiple cores, use `_` to connect. Auto update to the latest kernel of the same series.
+- `sudo ./rebuild -d -k 5.15.13_5.4.170`: Use the default configuration. Specify multiple cores, use `_` to connect.
+- `sudo ./rebuild -d -k 5.15.13_5.4.170 -a true`: Use the default configuration. Specify multiple cores, use `_` to connect. Auto update to the latest kernel of the same series.
 - `sudo ./rebuild -d -s 2748 -k 5.4.170`: Use the default configuration and set the partition size to 2748m, and only compile the armbian firmware with the kernel version 5.4.170.
 
 - ### Local build instructions
@@ -174,7 +174,7 @@ sudo apt-get install -y $(curl -fsSL git.io/ubuntu-2004-server)
 
 2. Clone the repository to the local. `git clone --depth 1 https://github.com/ophub/amlogic-s9xxx-armbian.git`
 
-3. Create the `build/output/images` folder, and upload the Armbian image ( Eg: `Armbian_21.11.0-trunk_Lepotato_current_5.10.90.img` ) to this `~/amlogic-s9xxx-armbian/build/output/images` directory. Please keep the release version number (e.g. `21.11.0`) and kernel version number (e.g. `5.10.90`) in the name of the original Armbian image file, It will be used as the name of the armbian firmware after rebuilding.
+3. Create the `build/output/images` folder, and upload the Armbian image ( Eg: `Armbian_21.11.0-trunk_Lepotato_current_5.15.13.img` ) to this `~/amlogic-s9xxx-armbian/build/output/images` directory. Please keep the release version number (e.g. `21.11.0`) and kernel version number (e.g. `5.15.13`) in the name of the original Armbian image file, It will be used as the name of the armbian firmware after rebuilding.
 
 4. Enter the `~/amlogic-s9xxx-armbian` root directory. And run Eg: `sudo ./rebuild -d -b s905x3 -k 5.4.170` to build armbian for `amlogic s9xxx`. The generated Armbian image is in the `build/output/images` directory under the root directory.
 
@@ -196,7 +196,7 @@ You can use other methods to build the Armbian system. Or use [Armbian](https://
   with:
     armbian_path: build/output/images/*.img
     armbian_soc: s905d_s905x3_s922x_s905x
-    armbian_kernel: 5.10.90_5.4.170
+    armbian_kernel: 5.15.13_5.4.170
 ```
 
 - GitHub Action Input parameter description
@@ -206,7 +206,7 @@ You can use other methods to build the Armbian system. Or use [Armbian](https://
 | armbian_path         | no                     | Set the path of the original Armbian file, support the file path in the current workflow such as `build/output/images/*.img`, and also support the use of the network download address such as: `https://dl.armbian.com/*/Armbian_*.img.xz` |
 | armbian_soc        | s905d_s905x3           | Set the `SoC` of the packaging box, you can specify a single box such as `s905x3`, you can choose multiple boxes to use `_` connection such as `s905x3_s905d` . SOC code of each box is: `s905x3`, `s905x2`, `s905x`, `s905w`, `s905d`, `s905d-ki`, `s905`, `s922x`, `s922x-n2`, `s912`, `s912-t95z` . Note: `s922x-reva` is `s922x-gtking-pro-rev_a`, `s922x-n2` is `s922x-odroid-n2`, `s912-t95z` is `s912-t95z-plus`, `s905d-ki` is `s912-mecool-ki-pro`, `s905x2-km3` is `s905x2-mecool-km3`. |
 | version_branch         | stable                 | Set the [version branch](https://github.com/ophub/kernel/tree/main/pub), Such as `stable`. The specified name must be the same as the branch directory name. The `stable` branch version is used by default. |
-| armbian_kernel         | 5.10.90_5.4.170        | Set the [kernel version](https://github.com/ophub/kernel/tree/main/pub/stable), Such as `5.4.170` . Multiple kernel use `_` connection such as `5.10.90_5.4.170` |
+| armbian_kernel         | 5.15.13_5.4.170        | Set the [kernel version](https://github.com/ophub/kernel/tree/main/pub/stable), Such as `5.4.170` . Multiple kernel use `_` connection such as `5.15.13_5.4.170` |
 | auto_kernel            | true                   | 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 `amlogic_kernel`. such as 5.4.170 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` |
 | armbian_size           | 2748                   | Set the size of the firmware ROOTFS partition, and the specified size must be greater than 2000. |
 

diff --git a/action.yml b/action.yml
@@ -13,7 +13,7 @@ inputs:
   armbian_kernel:
     description: "Set kernel."
     required: false
-    default: "5.10.90_5.4.170"
+    default: "5.15.13_5.4.170"
   version_branch:
     description: "Set kernel."
     required: false