Skip to content

Commit cf15165

Browse files
authored
Update Kernel to 6.18 version (#207)
Updates kernel version to 6.18 for the nightly builds 6.18 is 'stable' as of now, but documented as the next LTS version [here](https://www.kernel.org/category/releases.html) Fixes gardenlinux/gardenlinux#3974
1 parent 26af51b commit cf15165

File tree

11 files changed

+21
-32
lines changed

11 files changed

+21
-32
lines changed

.github/workflows/pr-if-new-kernel.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
# Matrix build for maintenance of multiple kernels
1010
strategy:
1111
matrix:
12-
branch: ['main', 'maint-6.6']
12+
branch: ['main', 'maint-6.12', 'maint-6.6']
1313
permissions:
1414
pull-requests: write
1515
contents: write

README.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,10 @@ In some cases, we need to make changes to those to get a working build.
2727

2828
| branch | description |
2929
| ------------- | -------------- |
30-
| `main` | latest lts kernel we maintain (6.12 as of December 2025) |
30+
| `main` | latest lts kernel we maintain (6.18) |
31+
| `maint-6.12` | maintenance of source code for kernel 6.12 |
3132
| `maint-6.6` | maintenance of source code for kernel 6.6 |
32-
| `rel-1877` | backport for 1877, merge code from `main` |
33+
| `rel-1877` | backport for 1877, merge code from `maint-6.12` |
3334
| `rel-1592` | backport for 1592, merge code from `maint-6.6` |
3435

3536

@@ -55,10 +56,10 @@ git push
5556
```
5657

5758
> [!Tip]
58-
> You can find out the correct `.container` file by copying it from the corresponding tag of the https://github.com/gardenlinux/repo branch, for example [1443.0](https://github.com/gardenlinux/repo/blob/1443.0/.container)
59+
> You can find out the correct `.container` file by copying it from the corresponding tag of the https://github.com/gardenlinux/repo branch, for example [1877.0](https://github.com/gardenlinux/repo/blob/1877.0/.container)
5960
6061
> [!Note]
61-
> We must create rel- branches to include the respective `.container` file, and not use maint for backports. This is required because multiple releases can use the same kernel version (e.g. rel-1443 and rel-1592 both use maint-6.6)
62+
> We must create `rel-*` branches to include the respective `.container` file, and not use `maint-*` for backports. This is required because multiple releases can use the same kernel version (e.g. `rel-1443` and `rel-1592` both use `maint-6.6`)
6263
6364
## Automated kernel patch level upgrades
6465

config/amd64/defines.toml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ config = [
2424
'amd64/config.cloud-amd64',
2525
'config.gardenlinux'
2626
]
27-
[flavour.defs]
28-
is_quick = true
2927
[flavour.description]
3028
hardware = 'x86-64 cloud'
3129
hardware_long = 'cloud platforms including Amazon EC2, Microsoft Azure, and Google Compute Engine'
@@ -34,8 +32,8 @@ hardware_long = 'cloud platforms including Amazon EC2, Microsoft Azure, and Goog
3432
name = 'none'
3533

3634
[build]
35+
enable_rust = true
3736
enable_signed = false
38-
enable_vdso = true
3937
kernel_file = 'arch/x86/boot/bzImage'
4038
kernel_stem = 'vmlinuz'
4139

config/arm64/defines.toml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ config = [
2525
'arm64/config.cloud-arm64',
2626
'config.gardenlinux'
2727
]
28-
[flavour.defs]
29-
is_quick = true
3028
[flavour.description]
3129
hardware = 'arm64 cloud'
3230
hardware_long = 'cloud platforms supporting arm64 virtual machines'
@@ -36,8 +34,8 @@ name = 'none'
3634

3735
[build]
3836
compiler_gnutype_compat = 'arm-linux-gnueabihf'
37+
enable_rust = true
3938
enable_signed = false
40-
enable_vdso = true
4139
kernel_file = 'arch/arm64/boot/Image'
4240
kernel_stem = 'vmlinuz'
4341

config/defines.toml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,12 @@ name = 'x86'
1313
name = 'none'
1414

1515
[build]
16-
compiler = 'gcc'
16+
c_compiler = 'gcc'
17+
rust_build_depends = [
18+
'rustc:native',
19+
'bindgen:native',
20+
'rust-src',
21+
]
1722

1823
[relations.image]
1924
depends = [

config/riscv64/defines.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ installer = true
1111
name = 'none'
1212

1313
[build]
14-
enable_vdso = true
14+
enable_rust = true
1515
kernel_file = 'arch/riscv/boot/Image'
1616
kernel_stem = 'vmlinux'

finalize_source

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
(
22
apt-get install --no-install-recommends -y kernel-wedge python3-jinja2 python3-dacite
33
cd "$dir/src"
4-
{ PYTHONDONTWRITEBYTECODE=1 make -f debian/rules debian/control-real || true; } | grep 'generated SUCCESSFULLY'
4+
PYTHONDONTWRITEBYTECODE=1 make -f debian/rules debian/control-real && echo "PASS" || echo "FAIL"
55
)

fixes_debian/series

Lines changed: 0 additions & 1 deletion
This file was deleted.

fixes_debian/series.patch

Lines changed: 0 additions & 12 deletions
This file was deleted.

prepare_source

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
pkg=linux
2-
version_orig=6.12.63
3-
version="$version_orig-3"
2+
version_orig=6.18.3
3+
version="$version_orig-1"
44

55
(
66
debian_repo=https://salsa.debian.org/kernel-team/linux.git
7-
debian_ref="debian/6.12.43-1"
7+
debian_ref="debian/6.18.3-1"
88

99
tmp_dir="$(mktemp -d)"
1010
trap 'cd / && rm -rf "$tmp_dir"' EXIT

0 commit comments

Comments
 (0)