aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <marcin.juszkiewicz@linaro.org>2020-03-17 12:11:33 +0100
committerMarcin Juszkiewicz <marcin.juszkiewicz@linaro.org>2020-03-17 13:26:01 +0000
commit98392a0c0ae24e704dc18d00cb296507ad5cc7a7 (patch)
tree9aded9dde142f60e70b2ac5b9455addbd63c8e59 /docker
parente4bb18819fc0480ecf36f98367cae48ec226bb50 (diff)
downloadkolla-98392a0c0ae24e704dc18d00cb296507ad5cc7a7.tar.gz
kolla-98392a0c0ae24e704dc18d00cb296507ad5cc7a7.zip
base: fix pinning of libvirt for aarch64
Change https://review.opendev.org/#/c/712987/ added pinning for kibana and libvirt. In some cases it fails ;( This version works properly. Change-Id: I18a29dc4144fa53d371a6c5533e35181970429b0
Diffstat (limited to 'docker')
-rw-r--r--docker/base/apt_preferences.debian20
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