Skip to content

Commit 5688006

Browse files
committed
cheribsd-release: support vm images
With the addition of the flag: --cheribsd-morello-purecap/build-vm-images and the changes in CTSRD-CHERI/cheribsd#2360 this produces ciimages/FreeBSD-15.0-CURRENT-arm64-aarch64c-BASIC-CI-ufs.raw.xz in the output directory for cheribsd-release-morello-purecap. I've put support behind a flag as older CheriBSD trees will break without patchs.
1 parent b529760 commit 5688006

File tree

1 file changed

+16
-0
lines changed

1 file changed

+16
-0
lines changed

pycheribuild/projects/cross/cheribsd.py

+16
Original file line numberDiff line numberDiff line change
@@ -2179,6 +2179,18 @@ def supported_architectures(self) -> "tuple[CrossCompileTarget, ...]":
21792179

21802180

21812181
class BuildFreeBSDReleaseMixin(ReleaseMixinBase):
2182+
@classmethod
2183+
def setup_config_options(cls, kernel_only_target=False, install_directory_help=None, **kwargs) -> None:
2184+
super().setup_config_options(
2185+
use_upstream_llvm=False,
2186+
kernel_only_target=kernel_only_target,
2187+
)
2188+
cls.build_vm_images = cls.add_bool_option(
2189+
"build-vm-images",
2190+
_allow_unknown_targets=True,
2191+
help="Build vm images with releases.",
2192+
)
2193+
21822194
def check_system_dependencies(self) -> None:
21832195
super().check_system_dependencies()
21842196
self.check_required_system_tool("bsdtar", cheribuild_target="bsdtar", apt="libarchive-tools")
@@ -2244,6 +2256,10 @@ def process(self) -> None:
22442256
release_args.set_env(INSTALL="sh " + str(self.source_dir / "tools/install.sh"))
22452257
release_args.set_env(XZ_CMD=str(self.objdir / "tmp/legacy/usr/bin/xz -T 0"))
22462258

2259+
if self.build_vm_images:
2260+
release_args.set_env(WITH_CLOUDWARE="yes")
2261+
release_args.set_env(WITHOUT_QEMU="yes")
2262+
22472263
# Need bsdtar for @file support
22482264
release_args.set_env(TAR_CMD="bsdtar")
22492265

0 commit comments

Comments
 (0)