From 1d6ec630d636067d802de522638396132989923a Mon Sep 17 00:00:00 2001 From: Christian Breunig Date: Sat, 7 Nov 2026 07:50:06 +0000 Subject: Kernel: T9591: add VyOS internal revision to the kernel release string Rebuilding the same upstream kernel with additional patches, e.g. urgent security fixes, produced the exact same release string and package name as the previous build. A patched image could not be told apart from an unpatched one. A new kernel_revision default is now placed between the upstream version and the flavor, so 6.18.60-vyos becomes 6.18.60-1-vyos. It ends up in uname -r, the module directory, the linux-image package name and its Debian version; out-of-tree modules follow automatically. Bump it on every patched rebuild of the same upstream version and reset it to 1 on an upstream bump. The kernel and all module packages must be rebuilt and published along with this change, otherwise the image build cannot find the new linux-image package. --- scripts/package-build/linux-kernel/build.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'scripts/package-build/linux-kernel/build.py') diff --git a/scripts/package-build/linux-kernel/build.py b/scripts/package-build/linux-kernel/build.py index 295f44b9..fa19b97d 100755 --- a/scripts/package-build/linux-kernel/build.py +++ b/scripts/package-build/linux-kernel/build.py @@ -137,7 +137,8 @@ def build_package(package: dict, dependencies: list, # Execute the build command if package['build_cmd'] == 'build_kernel': - source_dir = build_kernel(package['kernel_version'], package['kernel_flavor']) + source_dir = build_kernel(package['kernel_version'], package['kernel_revision'], + package['kernel_flavor']) if linux_kernel_tarball is not None: linux_kernel_tarball.clear() linux_kernel_tarball['package_name'] = package['name'] @@ -191,7 +192,7 @@ def merge_dicts(defaults, package): return {**defaults, **package} -def build_kernel(kernel_version, kernel_flavor) -> str: +def build_kernel(kernel_version, kernel_revision, kernel_flavor) -> str: """Build the Linux kernel""" source_dir = 'linux' # Git source repo name - preferred over TAR if not os.path.exists(source_dir): @@ -205,9 +206,12 @@ def build_kernel(kernel_version, kernel_flavor) -> str: source_dir = f'linux-{kernel_version}' os.symlink(source_dir, 'linux') - # kernel_flavor is only known here (merged from data/defaults.toml); pass it down - # via the environment so build-kernel.sh doesn't need to re-read defaults.toml itself. - run(['./build-kernel.sh'], check=True, env={**os.environ, 'KERNEL_FLAVOR': kernel_flavor}) + # kernel_revision and kernel_flavor are only known here (merged from data/defaults.toml); + # pass them down via the environment so build-kernel.sh doesn't need to re-read + # defaults.toml itself. + run(['./build-kernel.sh'], check=True, env={**os.environ, + 'KERNEL_REVISION': kernel_revision, + 'KERNEL_FLAVOR': kernel_flavor}) return(source_dir) -- cgit v1.2.3