From 6a4f012bf91a417a97d6e30c79bdcf925cdb446e Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Sat, 2 Jan 2021 11:19:03 +0100 Subject: [PATCH] pmb.run.qemu.install_depends: fix with v20.05 (MR 2009) Don't try to install the recently split up packages if the pmaports branch is based on Alpine 3.12. Fixes: 61845c93 ("pmb.run.qemu.install_depends: add new depends (MR 2007)") --- pmb/qemu/run.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pmb/qemu/run.py b/pmb/qemu/run.py index ae6b50d3..1cd76d28 100644 --- a/pmb/qemu/run.py +++ b/pmb/qemu/run.py @@ -246,6 +246,15 @@ def install_depends(args, arch): "qemu-ui-opengl", "qemu-ui-sdl", ] + + # QEMU packaging isn't split up as much in 3.12 + channel_cfg = pmb.config.pmaports.read_config_channel(args) + if channel_cfg["branch_aports"] == "3.12-stable": + depends.remove("qemu-hw-display-virtio-gpu") + depends.remove("qemu-hw-display-virtio-gpu-pci") + depends.remove("qemu-hw-display-virtio-vga") + depends.remove("qemu-ui-opengl") + pmb.chroot.apk.install(args, depends)