diff options
| author | Zuul <zuul@review.opendev.org> | 2020-03-17 22:17:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-03-17 22:17:24 +0000 |
| commit | 2e465a16fe108e0edd7cc92893d089747ddf6807 (patch) | |
| tree | e711cdef12bcbd4b67d0daf18c828a4140519335 /docker/base | |
| parent | 0e25302faef0ce6583e6de32e87538db080a2565 (diff) | |
| parent | 98392a0c0ae24e704dc18d00cb296507ad5cc7a7 (diff) | |
| download | kolla-2e465a16fe108e0edd7cc92893d089747ddf6807.tar.gz kolla-2e465a16fe108e0edd7cc92893d089747ddf6807.zip | |
Merge "base: fix pinning of libvirt for aarch64"
Diffstat (limited to 'docker/base')
| -rw-r--r-- | docker/base/apt_preferences.debian | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/docker/base/apt_preferences.debian b/docker/base/apt_preferences.debian index 6f5c1622a..2b73f1c3e 100644 --- a/docker/base/apt_preferences.debian +++ b/docker/base/apt_preferences.debian @@ -13,11 +13,6 @@ Package: * Pin: release o=obs://private/home:marcin.juszkiewicz/debian-buster Pin-Priority: 100 -# Unless it is libvirt (on aarch64) -Package: *libvirt* -Pin: release o=obs://private/home:marcin.juszkiewicz/debian-buster,b=arm64 -Pin-Priority: 600 - # Unless it is kibana (on aarch64) Package: kibana Pin: release o=obs://private/home:marcin.juszkiewicz/debian-buster @@ -27,3 +22,18 @@ Pin-Priority: 600 Package: kibana Pin: release o=elastic,b=amd64 Pin-Priority: 700 + +# We need fixed libvirt for aarch64 +Package: *libvirt* +Pin: release o=obs://private/home:marcin.juszkiewicz/debian-buster +Pin-Priority: 600 + +# on x86-64 we want libvirt from Debian +Package: *libvirt* +Pin: release o=Debian,b=amd64 +Pin-Priority: 700 + +# on ppc64le we want libvirt from Debian +Package: *libvirt* +Pin: release o=Debian,b=ppc64le +Pin-Priority: 700 |