diff options
| author | Christian Breunig <christian@breunig.cc> | 2026-11-09 13:18:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-11-09 13:18:29 +0100 |
| commit | 9ba01bdaad997e777d5c4ed53c5abb8c0a34b027 (patch) | |
| tree | dd60c7486cea73d94ad871080f55a890009e92e1 /scripts/package-build/linux-kernel/build.py | |
| parent | b541dd70eedd78455861af42cfd262e712a75803 (diff) | |
| parent | 1d6ec630d636067d802de522638396132989923a (diff) | |
| download | vyos-build-9ba01bdaad997e777d5c4ed53c5abb8c0a34b027.tar.gz vyos-build-9ba01bdaad997e777d5c4ed53c5abb8c0a34b027.zip | |
Merge pull request #1347 from c-po/T9591-kernel-revision
Kernel: T9591: add VyOS internal revision to the kernel release string
Diffstat (limited to 'scripts/package-build/linux-kernel/build.py')
| -rwxr-xr-x | scripts/package-build/linux-kernel/build.py | 14 |
1 files changed, 9 insertions, 5 deletions
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) |
