From 4352096783654cecd341e3c453f652e47bd06508 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Sun, 26 Jan 2020 20:41:01 +0100 Subject: [PATCH] pmb.qemu.run.install_depends: adjust to mesa pkgs (!1865) Adjust the mesa related packages installed for running in qemu, after the mesa APKBUILD in Alpine was changed. Install mesa-va-gallium instead of: * mesa-dri-freedreno * mesa-dri-swrast * mesa-dri-virtio * mesa-dri-vmwgfx Fix error in pmbootstrap-qemu CI test: ERROR: Could not find dependency 'mesa-dri-freedreno' in any aports folder or APKINDEX. Related: https://gitlab.alpinelinux.org/alpine/aports/commit/298e20d04fdbc33fc32a0388f645ca02e1fa3961 --- pmb/qemu/run.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pmb/qemu/run.py b/pmb/qemu/run.py index 0c48faed..5ff999b0 100644 --- a/pmb/qemu/run.py +++ b/pmb/qemu/run.py @@ -1,5 +1,5 @@ """ -Copyright 2020 Pablo Castellano +Copyright 2020 Pablo Castellano, Oliver Smith This file is part of pmbootstrap. @@ -271,9 +271,8 @@ def install_depends(args, arch): Install any necessary qemu dependencies in native chroot """ depends = ["qemu", "qemu-system-" + arch, "qemu-ui-sdl", "qemu-ui-gtk", - "mesa-gl", "mesa-egl", "mesa-dri-ati", "mesa-dri-freedreno", - "mesa-dri-intel", "mesa-dri-nouveau", "mesa-dri-swrast", - "mesa-dri-virtio", "mesa-dri-vmwgfx", "qemu-audio-alsa", + "mesa-gl", "mesa-egl", "mesa-dri-ati", "mesa-dri-intel", + "mesa-dri-nouveau", "mesa-va-gallium", "qemu-audio-alsa", "qemu-audio-pa", "qemu-audio-sdl"] if args.spice_port: depends += ["virt-viewer", "font-noto"]