Skip to content

Commit aad3f83

Browse files
authored
Merge pull request #1212 from kernelkit/kernel-upgrade
2 parents 9d271eb + b5b35e7 commit aad3f83

File tree

40 files changed

+426
-87
lines changed

40 files changed

+426
-87
lines changed
Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,112 @@
1+
name: Check Kernel 6.12 Release
2+
3+
on:
4+
workflow_dispatch: # Allow manual triggering
5+
6+
jobs:
7+
check-kernel:
8+
runs-on: ubuntu-latest
9+
10+
steps:
11+
- name: Check out infix repository
12+
uses: actions/checkout@v4
13+
with:
14+
fetch-depth: 0
15+
token: ${{ secrets.KERNEL_UPDATE_TOKEN }}
16+
17+
- name: Check out linux repository
18+
uses: actions/checkout@v4
19+
with:
20+
repository: kernelkit/linux
21+
path: linux
22+
fetch-depth: 0
23+
token: ${{ secrets.KERNEL_UPDATE_TOKEN }}
24+
25+
- name: Fetch kernel.org and check for 6.12 release
26+
id: check
27+
run: |
28+
# Fetch the kernel.org frontpage and extract 6.12 version
29+
CURRENT_VERSION=$(curl -s https://www.kernel.org/ | grep -oP '6\.12\.\d+' | head -n1)
30+
31+
if [ -z "$CURRENT_VERSION" ]; then
32+
echo "Failed to fetch kernel version"
33+
exit 1
34+
fi
35+
36+
echo "current_version=$CURRENT_VERSION" >> $GITHUB_OUTPUT
37+
echo "Current 6.12 kernel version: $CURRENT_VERSION"
38+
39+
# Get the latest tag from our linux tree
40+
cd linux
41+
git fetch origin
42+
LATEST_TAG=$(git tag -l "v6.12.*" | sort -V | tail -n1 | sed 's/^v//')
43+
cd ..
44+
45+
echo "latest_tag=$LATEST_TAG" >> $GITHUB_OUTPUT
46+
echo "Latest tag in our tree: $LATEST_TAG"
47+
48+
if [ "$CURRENT_VERSION" != "$LATEST_TAG" ]; then
49+
echo "new_release=true" >> $GITHUB_OUTPUT
50+
echo "🎉 New 6.12 kernel released: $CURRENT_VERSION (our version: $LATEST_TAG)"
51+
else
52+
echo "new_release=false" >> $GITHUB_OUTPUT
53+
echo "No change - still at $CURRENT_VERSION"
54+
fi
55+
56+
- name: Set up git credentials
57+
if: steps.check.outputs.new_release == 'true'
58+
run: |
59+
git config --global user.email "[email protected]"
60+
git config --global user.name "ael-bot"
61+
62+
# Configure git to use the token for HTTPS operations
63+
git config --global url."https://ael-bot:${{ secrets.KERNEL_UPDATE_TOKEN }}@github.com/".insteadOf "[email protected]:"
64+
git config --global url."https://ael-bot:${{ secrets.KERNEL_UPDATE_TOKEN }}@github.com/".insteadOf "https://github.com/"
65+
66+
- name: Run kernel upgrade script
67+
if: steps.check.outputs.new_release == 'true'
68+
env:
69+
GIT_TERMINAL_PROMPT: 0
70+
run: |
71+
./utils/kernel-upgrade.sh linux
72+
73+
- name: Create pull request
74+
if: steps.check.outputs.new_release == 'true'
75+
uses: actions/github-script@v7
76+
with:
77+
github-token: ${{ secrets.KERNEL_UPDATE_TOKEN }}
78+
script: |
79+
// Check if PR already exists
80+
const { data: pulls } = await github.rest.pulls.list({
81+
owner: context.repo.owner,
82+
repo: context.repo.repo,
83+
head: `${context.repo.owner}:kernel-upgrade`,
84+
state: 'open'
85+
});
86+
87+
if (pulls.length === 0) {
88+
const { data: pr } = await github.rest.pulls.create({
89+
owner: context.repo.owner,
90+
repo: context.repo.repo,
91+
title: `Upgrade to kernel ${{ steps.check.outputs.current_version }}`,
92+
head: 'kernel-upgrade',
93+
base: 'main',
94+
body: `Automated kernel upgrade to version ${{ steps.check.outputs.current_version }}.\n\n**Previous version:** ${{ steps.check.outputs.latest_tag }}\n**New version:** ${{ steps.check.outputs.current_version }}\n**Source:** https://www.kernel.org/\n\nThis PR was automatically created by the kernel release monitoring workflow.`
95+
});
96+
97+
// Add label
98+
await github.rest.issues.addLabels({
99+
owner: context.repo.owner,
100+
repo: context.repo.repo,
101+
issue_number: pr.number,
102+
labels: ['ci:main']
103+
});
104+
105+
// Request reviews
106+
await github.rest.pulls.requestReviewers({
107+
owner: context.repo.owner,
108+
repo: context.repo.repo,
109+
pull_number: pr.number,
110+
reviewers: ['troglobit', 'wkz', 'mattiaswal']
111+
});
112+
}

configs/aarch64_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build
2828
BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image.sh"
2929
BR2_LINUX_KERNEL=y
3030
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
31-
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.55"
31+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.56"
3232
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
3333
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/aarch64/linux_defconfig"
3434
BR2_LINUX_KERNEL_INSTALL_TARGET=y

configs/aarch64_minimal_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-build
2727
BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image.sh"
2828
BR2_LINUX_KERNEL=y
2929
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
30-
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.55"
30+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.56"
3131
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
3232
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/aarch64/linux_defconfig"
3333
BR2_LINUX_KERNEL_INSTALL_TARGET=y

configs/r2s_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image
2929
BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BR2_EXTERNAL_INFIX_PATH)/board/aarch64/r2s/genimage.cfg"
3030
BR2_LINUX_KERNEL=y
3131
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
32-
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.55"
32+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.56"
3333
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_INFIX_PATH)/board/aarch64/r2s/rk3328-nanopi-r2s-dts.patch"
3434
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
3535
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/aarch64/r2s/linux_defconfig"

configs/x86_64_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/x86_64/post-build.sh ${BR2_EXTERNAL_INF
2727
BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image.sh"
2828
BR2_LINUX_KERNEL=y
2929
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
30-
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.55"
30+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.56"
3131
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
3232
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/x86_64/linux_defconfig"
3333
BR2_LINUX_KERNEL_INSTALL_TARGET=y

configs/x86_64_minimal_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/qemu/x86_64/post-build.sh ${BR2_EXTERNAL_INF
2727
BR2_ROOTFS_POST_IMAGE_SCRIPT="${BR2_EXTERNAL_INFIX_PATH}/board/common/post-image.sh"
2828
BR2_LINUX_KERNEL=y
2929
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
30-
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.55"
30+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.56"
3131
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
3232
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="${BR2_EXTERNAL_INFIX_PATH}/board/x86_64/linux_defconfig"
3333
BR2_LINUX_KERNEL_INSTALL_TARGET=y

doc/ChangeLog.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ All notable changes to the project are documented in this file.
99
### Changes
1010

1111
- Upgrade Buildroot to 2025.02.7 (LTS)
12-
- Upgrade Linux kernel to 6.12.55 (LTS)
12+
- Upgrade Linux kernel to 6.12.56 (LTS)
1313
- Extend NETCONF and RESTCONF scripting documentation with operational
1414
data examples, discovery patterns, and common workflow examples, issue #1156
1515
- Initial support for a zone-based firewall, based on `firewalld`, issue #448

doc/developers-guide.md

Lines changed: 3 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -349,55 +349,9 @@ kernel is available.
349349

350350
#### Repo locally cloned already
351351

352-
1. Navigate to the Linux kernel directory
353-
354-
cd linux
355-
356-
1. Get latest changes from KernelKit
357-
358-
git pull
359-
360-
1. Fetch the latest tags from upstream
361-
362-
git fetch upstream --tags
363-
364-
#### No local repo yet
365-
366-
1. Clone the KernelKit Linux kernel repository
367-
368-
git clone [email protected]:kernelkit/linux.git
369-
370-
1. Add the upstream remote
371-
372-
git remote add upstream git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
373-
374-
1. Checkout correct kernel branch
375-
376-
git checkout kkit-linux-6.12.y
377-
378-
#### Continue Here
379-
380-
1. Rebase on the upstream release
381-
382-
git rebase v6.12.29
383-
384-
1. Push changes and the tags
385-
386-
git push -f origin kkit-linux-6.12.y --tags
387-
388-
**Move to your Infix source tree**
389-
390-
> [!NOTE]
391-
> See help of `kernel-refresh.sh` script for more information.
392-
393-
1. Generate patches
394-
395-
make x86_64_defconfig
396-
cd output
397-
../utils/kernel-refresh.sh -k /path/to/linux -o 6.12.28 -t v6.12.29
398-
399-
1. Commit and push the changes. Remember to update the ChangeLog
400-
1. Create a pull request
352+
- ./utils/kernel-upgrade.sh /path/to/linux/tree
353+
- Update Changelog
354+
- push and create a pull request
401355

402356
> [!NOTE]
403357
> Remember to set the pull request label to `ci:main` to ensure full CI

patches/linux/6.12.55/0001-FIX-net-dsa-mv88e6xxx-Fix-timeout-on-waiting-for-PPU.patch renamed to patches/linux/6.12.56/0001-FIX-net-dsa-mv88e6xxx-Fix-timeout-on-waiting-for-PPU.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 98b8e71b03266a3e17b00562eea1a0e5951b0843 Mon Sep 17 00:00:00 2001
1+
From 52f290cad56b362568c210dbcb5b64362b87585c Mon Sep 17 00:00:00 2001
22
From: Tobias Waldekranz <[email protected]>
33
Date: Tue, 12 Mar 2024 10:27:24 +0100
44
Subject: [PATCH 01/30] [FIX] net: dsa: mv88e6xxx: Fix timeout on waiting for

patches/linux/6.12.55/0002-net-dsa-mv88e6xxx-Improve-indirect-register-access-p.patch renamed to patches/linux/6.12.56/0002-net-dsa-mv88e6xxx-Improve-indirect-register-access-p.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From d898868df98ef351f0dcc98f4069f333e89bc862 Mon Sep 17 00:00:00 2001
1+
From c4317d637f4cfb2905be011becf0f822c7a83b6b Mon Sep 17 00:00:00 2001
22
From: Tobias Waldekranz <[email protected]>
33
Date: Wed, 27 Mar 2024 15:52:43 +0100
44
Subject: [PATCH 02/30] net: dsa: mv88e6xxx: Improve indirect register access

0 commit comments

Comments
 (0)