Skip to content

Commit d23fa8f

Browse files
committed
Update README, kernel version update script and Review comments
1 parent 1eecd70 commit d23fa8f

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
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: 3 additions & 2 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

config/defines.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ name = 'x86'
1313
name = 'none'
1414

1515
[build]
16-
c_compiler = 'gcc-15'
16+
c_compiler = 'gcc'
1717
rust_build_depends = [
18-
'rustc:native (>= 1.78.0)',
19-
'bindgen:native (>= 0.65.1)',
20-
'rust-src (>= 1.78.0)',
18+
'rustc:native',
19+
'bindgen:native',
20+
'rust-src',
2121
]
2222

2323
[relations.image]
@@ -34,4 +34,4 @@ breaks = [
3434

3535
[[debianrelease]]
3636
name_regex = 'gardenlinux'
37-
revision_regex = '\dexperimental'
37+
revision_regex = '\d+gl(\d+)?(~bp\d+)?(~dev)?'

prepare_source

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
pkg=linux
22
version_orig=6.18.3
33
version="$version_orig-1"
4-
version_suffix="experimental"
54

65
(
76
debian_repo=https://salsa.debian.org/kernel-team/linux.git

update-kernel.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Script to automate the process of selecting the latest patch version of linux
66

77
# Update this when we base our kernel build on a newer lts branch
8-
current_lts = "6.12"
8+
current_lts = "6.18"
99

1010

1111
def get_latest_kernel_version():
@@ -15,7 +15,7 @@ def get_latest_kernel_version():
1515
r["version"]
1616
for r in releases
1717
if r["version"].startswith(current_lts)
18-
and r["moniker"] == "longterm"
18+
# (not officially lts yet ) and r["moniker"] == "longterm"
1919
and r["iseol"] == False
2020
]
2121
assert len(latest_current_lts) == 1

0 commit comments

Comments
 (0)