Skip to content

Commit 3de3fea

Browse files
committed
Debian: use QEMU 5 from buster-backports
This will allow us to make sure of all updates. 'qemu-kvm' got dropped in Debian Three changes from master are merged into one: Change Id: If09a8188030baa284dd353b1c3f830d78c5091b7 Change Id: I4371daf7b28c8a057364d17e2e47f6e22665447c Change Id: I2c82c6269b2c357b0815ea29bc6a7c322f84dac9 Change-Id: I1b3e879ec8752c63dc3f1ec3d8f62c3b43df55f3
1 parent 8a8c7bb commit 3de3fea

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

docker/base/apt_preferences.debian

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,12 @@ Package: openvswitch*
4242
Pin: release n=buster
4343
Pin-Priority: 700
4444

45-
# daxio in nova-compute depends on those
46-
# in Victoria+ we have them as QEMU 5 dependencies
47-
Package: libpmem1 libndctl6 libdaxctl1 pmdk-tools libpmemblk1 libpmemlog1 libpmemobj1 libpmempool1
45+
# we want newer QEMU
46+
Package: qemu*
47+
Pin: version 1:5.*
48+
Pin-Priority: 700
49+
50+
# daxio and QEMU depends on those
51+
Package: libpmem1 libndctl6 libdaxctl1 pmdk-tools libpmemblk1 libpmemlog1 libpmemobj1 libpmempool1 liburing1 libfdt1
4852
Pin: release n=buster-backports
4953
Pin-Priority: 700

docker/nova/nova-libvirt/Dockerfile.j2

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
5959
{% elif base_arch == "x86_64" %}
6060
{% set nova_libvirt_packages = nova_libvirt_packages + [
6161
'ovmf',
62-
'qemu-kvm'
6362
] %}
63+
# NOTE(hrw): Debian merged 'qemu-kvm' into 'qemu-system-ARCH' in 5.0-9
64+
{% if base_distro == 'ubuntu' %}
65+
{% set nova_libvirt_packages = nova_libvirt_packages + [
66+
'qemu-kvm'
67+
] %}
68+
{% endif %}
6469
{% endif %}
6570

6671
{% if base_arch in ['aarch64', 'x86_64'] %}

0 commit comments

Comments
 (0)