Skip to content

Fix kernel upgrade #1360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattiaswal merged 1 commit into from
Jan 20, 2026
+9 −8
Merged

Fix kernel upgrade #1360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/check-kernel-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ jobs:
BRANCH_NAME: ${{ steps.branch.outputs.name }}
run: |
set -e -o pipefail
./utils/kernel-upgrade.sh linux "$BRANCH_NAME"
./utils/kernel-upgrade.sh linux 6.18 "$BRANCH_NAME"

- name: Create pull request
if: steps.check.outputs.new_release == 'true'
Expand Down
15 changes: 8 additions & 7 deletions utils/kernel-upgrade.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
#
# Automated kernel upgrade test script for LTS 6.12.x
# Automated kernel upgrade test script for stable kernels
# Run from the infix directory and specify the path to the linux kernel tree
#
# Usage: ./utils/kernel-upgrade.sh <path-to-linux-dir>
Expand All @@ -9,17 +9,18 @@
set -e -o pipefail

# Parse arguments
if [ $# -lt 1 ] || [ $# -gt 2 ]; then
echo "Usage: $0 <path-to-linux-dir> [branch-name]"
if [ $# -lt 2 ] || [ $# -gt 3 ]; then
echo "Usage: $0 <path-to-linux-dir> <MAJOR> [branch-name]"
exit 1
fi

LINUX_DIR="$1"
INFIX_BRANCH="${2:-kernel-upgrade}"
MAJOR="$2"
INFIX_BRANCH="${3:-kernel-upgrade}"

# Configuration
INFIX_DIR="$(dirname "$(dirname "$(readlink -f "$0")")")"
LINUX_BRANCH="kkit-linux-6.12.y"
LINUX_BRANCH="kkit-linux-$MAJOR.y"
UPSTREAM_REMOTE="upstream"
UPSTREAM_URL="https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git"
KKIT_REMOTE="origin"
Expand All @@ -31,7 +32,7 @@ else
KKIT_URL="git@github.com:kernelkit/linux.git"
fi

KERNEL_VERSION_PATTERN="6.12"
KERNEL_VERSION_PATTERN="$MAJOR"

# Colors for output
RED='\033[0;31m'
Expand Down Expand Up @@ -138,7 +139,7 @@ update_linux_kernel() {
rebase_kernel() {
log_info "Rebasing on new kernel release..."

# Find the latest v6.12.x tag from upstream
# Find the latest tag from upstream matching requested major
LATEST_TAG=$(git -C "$LINUX_DIR" tag -l "v${KERNEL_VERSION_PATTERN}.*" | sort -V | tail -n1)

if [ -z "$LATEST_TAG" ]; then
Expand Down