Skip to content

Commit 87d2f95

Browse files
committed
Remove BuildSystemQEMU.
Reduce a number of additional abstractions required for the user mode support that should be eventually removed once the user mode is merged into the qemu-cheri branch. This change uses a hack to always pass --disabled-bsd-user to configure and later pass --enable-bsd-user to overwrite it. Pointed out by: jrtc27
1 parent 67db62c commit 87d2f95

File tree

1 file changed

+4
-12
lines changed

1 file changed

+4
-12
lines changed

pycheribuild/projects/build_qemu.py

+4-12
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,7 @@ def setup(self):
189189
"--target-list=" + self.qemu_targets,
190190
"--enable-slirp=git",
191191
"--disable-linux-user",
192+
"--disable-bsd-user",
192193
"--disable-xen",
193194
"--disable-docs",
194195
"--disable-rdma",
@@ -226,17 +227,8 @@ def update(self):
226227
super().update()
227228

228229

229-
class BuildSystemQEMU(BuildQEMUBase):
230-
do_not_add_to_targets = True
231-
232-
def setup(self):
233-
super().setup()
234-
# Don't build BSD user mode targets as we only want system mode binaries.
235-
self.configure_args.append("--disable-bsd-user")
236-
237-
238230
# noinspection PyAbstractClass
239-
class BuildUpstreamQEMU(BuildSystemQEMU):
231+
class BuildUpstreamQEMU(BuildQEMUBase):
240232
repository = GitRepository("https://github.com/qemu/qemu.git")
241233
target = "upstream-qemu"
242234
_default_install_dir_fn = ComputedDefaultValue(
@@ -247,7 +239,7 @@ class BuildUpstreamQEMU(BuildSystemQEMU):
247239
"x86_64-softmmu,aarch64-softmmu"
248240

249241

250-
class BuildQEMU(BuildSystemQEMU):
242+
class BuildQEMU(BuildQEMUBase):
251243
target = "qemu"
252244
repository = GitRepository("https://github.com/CTSRD-CHERI/qemu.git", default_branch="qemu-cheri")
253245
default_targets = "mips64-softmmu,mips64cheri128-softmmu," \
@@ -358,7 +350,7 @@ def setup(self):
358350
self.configure_args.append("--static")
359351

360352

361-
class BuildMorelloQEMU(BuildSystemQEMU):
353+
class BuildMorelloQEMU(BuildQEMUBase):
362354
repository = GitRepository("https://github.com/CTSRD-CHERI/qemu.git", default_branch="qemu-morello-merged",
363355
force_branch=True,
364356
old_urls=[

0 commit comments

Comments
 (0)