Merged
Conversation
Multi-version kernel builds need config files namespaced by kernel
branch. Rename config/defconfig.{arch} to kernel.configs/{major}.{minor}.y.{arch}
and add 6.19.y configs.
Signed-off-by: Jacob Weinstock <jakobweinstock@gmail.com>
jacobweinstock
force-pushed
the
multi-kernel-support
branch
from
74df033 to
3d18a65
Compare
There was a problem hiding this comment.
Pull request overview
Adds multi-kernel support to the CaptainOS build pipeline by selecting per-branch defconfigs from kernel.configs/, version-scoping build outputs/artifact names by kernel_version, and updating CI/docs accordingly.
Changes:
- Introduces
kernel.configs/{major}.{minor}.y.{arch}defconfig selection and adds new 6.19.y configs. - Versions mkosi outputs and
out/artifacts (vmlinuz/initramfs/iso/checksums) bykernel_version, updating QEMU/OCI/release/clean flows. - Updates CI to detect the default kernel version from
captain/config.pyand adjusts cache paths/artifact paths.
Reviewed changes
Copilot reviewed 15 out of 16 changed files in this pull request and generated 9 comments.
Show a summary per file
| File | Description |
|---|---|
| kernel.configs/6.19.y.arm64 | Adds new arm64 defconfig for 6.19.y stable branch. |
| kernel.configs/6.19.y.amd64 | Adds new amd64 defconfig for 6.19.y stable branch. |
| kernel.configs/6.18.y.arm64 | Updates header/comments for the existing 6.18.y arm64 defconfig. |
| kernel.configs/6.18.y.amd64 | Updates header/comments for the existing 6.18.y amd64 defconfig. |
| docs/kernel-build.md | Documents the kernel build pipeline and (intended) multi-version defconfig layout. |
| captain/qemu.py | Makes QEMU test boot pick versioned out/ artifacts. |
| captain/oci.py | Includes kernel_version in collected artifact naming/paths for OCI publishing. |
| captain/kernel.py | Auto-selects defconfigs based on kernel stable branch; stores resolved configs under kernel.configs/. |
| captain/iso.py | Versions ISO output filename by kernel_version. |
| captain/docker.py | Forwards KERNEL_CONFIG override into the builder container. |
| captain/config.py | Introduces DEFAULT_KERNEL_VERSION; versions mkosi output directories by kernel version. |
| captain/cli.py | Plumbs kernel flags into more subcommands; versions mkosi initramfs paths; adds per-version clean behavior. |
| captain/artifacts.py | Versions out/ artifact filenames by kernel_version. |
| README.md | Updates build description/default kernel version and defconfig location. |
| .gitignore | Ignores resolved configs under kernel.configs/. |
| .github/workflows/ci.yml | Detects default kernel version dynamically; updates cache paths and artifact paths. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
A single build tree can now build and manage multiple kernel versions.
Key changes:
- DEFAULT_KERNEL_VERSION constant as single source of truth in config.py
- --kernel-version / KERNEL_VERSION on all subcommands (build, kernel,
initramfs, iso, checksums, release, summary, qemu-test, clean)
- --kernel-config / KERNEL_CONFIG to override defconfig auto-detection
- Versioned output paths: mkosi.output/{stage}/{version}/{arch}/
- Versioned artifact names: vmlinuz-{ver}-{arch}, initramfs-{ver}-{arch}
- clean defaults to per-version cleanup; --all for full cleanup
- Improved qemu-test error messages showing missing files and version
- CI workflow updated to extract and propagate kernel version
- Resolved kernel config filename includes branch for no conflicts
Signed-off-by: Jacob Weinstock <jakobweinstock@gmail.com>
jacobweinstock
force-pushed
the
multi-kernel-support
branch
from
3d18a65 to
e0cfa64
Compare
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 17 out of 18 changed files in this pull request and generated 4 comments.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
jacobweinstock
force-pushed
the
multi-kernel-support
branch
from
e0cfa64 to
331657c
Compare
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 17 out of 18 changed files in this pull request and generated 2 comments.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
jacobweinstock
force-pushed
the
multi-kernel-support
branch
from
331657c to
6fe7ee9
Compare
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 17 out of 18 changed files in this pull request and generated 1 comment.
Comments suppressed due to low confidence (1)
captain/cli.py:1366
- mkosi passthrough (unknown command safety-net) only passes the tools extra-tree. This will produce an initramfs without kernel modules (and differs from the initramfs/summary stages which pass both tools and modules). Add the modules extra-tree here as well for both docker and native paths.
mlog = for_stage("mkosi")
tools_tree = str(cfg.tools_output)
output_dir = str(cfg.initramfs_output)
match cfg.mkosi_mode:
case "docker":
docker.build_builder(cfg, logger=mlog)
container_tree = f"/work/mkosi.output/tools/{cfg.arch}"
container_outdir = f"/work/mkosi.output/initramfs/{cfg.kernel_version}/{cfg.arch}"
docker.run_mkosi(
cfg,
f"--extra-tree={container_tree}",
f"--output-dir={container_outdir}",
command,
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
jacobweinstock
force-pushed
the
multi-kernel-support
branch
from
6fe7ee9 to
5d63907
Compare
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 17 out of 18 changed files in this pull request and generated 3 comments.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Reorganise the mkosi.output directory so kernel artifacts (vmlinuz and
modules) and userspace tools (containerd, runc, nerdctl, CNI plugins)
live in cleanly separated, versioned paths.
Before:
mkosi.output/
extra-tree/{arch}/ # mixed: kernel modules + tools
vmlinuz/{version}/{arch}/ # kernel image only
After:
mkosi.output/
tools/{arch}/ # tools only
kernel/{version}/{arch}/ # kernel image + modules
vmlinuz-{kver}
modules/usr/lib/modules/{kver}/
Key changes:
- Rename vmlinuz/ → kernel/ and store both vmlinuz and modules under
kernel/{version}/{arch}/. The modules/ subtree mirrors a root
filesystem layout (usr/lib/modules/{kver}/) so mkosi can consume it
directly as --extra-tree.
- Rename extra-tree/ → tools/. Now that kernel modules are stored
separately, the directory only contains userspace tools, so the name
should describe its content rather than leak mkosi implementation
jargon.
- Pass two --extra-tree= flags to mkosi (tools + modules) instead of
one combined tree.
- kernel.build() no longer wipes the tools directory on rebuild — it
only cleans its own kernel/{version}/{arch}/ output.
- Remove the .kernel-{arch}-version marker file — the kernel version is
now encoded in the directory path itself.
- Update CI workflow cache/artifact paths to match the new layout.
Config property renames:
vmlinuz_output → kernel_output
extra_tree_output → tools_output
(new) modules_output
Signed-off-by: Jacob Weinstock <jakobweinstock@gmail.com>
jacobweinstock
force-pushed
the
multi-kernel-support
branch
from
5d63907 to
17d412e
Compare
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 17 out of 18 changed files in this pull request and generated 1 comment.
Comments suppressed due to low confidence (2)
captain/artifacts.py:50
- The docstring still mentions
mkosi.output/initramfs/{arch}/, butcfg.initramfs_outputis now versioned (mkosi.output/initramfs/{kernel_version}/{arch}). Update the docstring to reflect the actual output layout.
def collect_initramfs(cfg: Config, logger: StageLogger | None = None) -> None:
"""Copy the initramfs CPIO from mkosi.output/initramfs/{arch}/ to out/."""
captain/artifacts.py:65
collect_iso()'s docstring still refers tomkosi.output/iso/{arch}/, butcfg.iso_outputis now versioned (mkosi.output/iso/{kernel_version}/{arch}). Adjust the docstring to avoid sending readers to the wrong path.
def collect_iso(cfg: Config, logger: StageLogger | None = None) -> None:
"""Copy the ISO image from mkosi.output/iso/{arch}/ to out/."""
_log = logger or _default_log
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
97 tasks
Contributor
Merge Queue StatusRule:
This pull request spent 11 minutes 51 seconds in the queue, including 11 minutes 42 seconds running CI. Required conditions to merge
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Fixes: #
How Has This Been Tested?
How are existing users impacted? What migration steps/scripts do we need?
Checklist:
I have: