Skip to content

cheribsd-release: build vm images #413

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
merged 2 commits into from
Jun 2, 2025
Merged

cheribsd-release: build vm images #413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
320ae24
macos CI: Don't upgrade pip
brooksdavis May 28, 2025
6b5448e
cheribsd-release: support vm images
brooksdavis Mar 7, 2025
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
3 changes: 2 additions & 1 deletion .github/workflows/python-app.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ jobs:
run: |
# Use the system-provided python3 instead of actions/setup-python@v4
python3 --version
python3 -m pip install --break-system-packages --upgrade pip
# Don't upgrade pip. It currently fails to uninstall.
# python3 -m pip install --break-system-packages --upgrade pip
python3 -m pip install --break-system-packages --upgrade pre-commit ruff==${{ env.RUFF_VERSION }}
python3 -m pip install --break-system-packages -r requirements.txt
- name: Lint with flake8
Expand Down
13 changes: 13 additions & 0 deletions pycheribuild/projects/cross/cheribsd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2179,6 +2179,15 @@ def supported_architectures(self) -> "tuple[CrossCompileTarget, ...]":


class BuildFreeBSDReleaseMixin(ReleaseMixinBase):
@classmethod
def setup_config_options(cls, **kwargs) -> None:
super().setup_config_options(**kwargs)
cls.build_vm_images = cls.add_bool_option(
"build-vm-images",
_allow_unknown_targets=True,
help="Build VM images with releases.",
)

def check_system_dependencies(self) -> None:
super().check_system_dependencies()
self.check_required_system_tool("bsdtar", cheribuild_target="bsdtar", apt="libarchive-tools")
Expand Down Expand Up @@ -2244,6 +2253,10 @@ def process(self) -> None:
release_args.set_env(INSTALL="sh " + str(self.source_dir / "tools/install.sh"))
release_args.set_env(XZ_CMD=str(self.objdir / "tmp/legacy/usr/bin/xz -T 0"))

release_args.set_with_options(QEMU=False)
if self.build_vm_images:
release_args.set_with_options(CLOUDWARE=True)

# Need bsdtar for @file support
release_args.set_env(TAR_CMD="bsdtar")

Expand Down