[PATCH 3/3] ci: Regenerate with new lcitool

Peter Krempa pkrempa at redhat.com
Mon Feb 14 17:22:18 UTC 2022 

Regenerate with lcitool as of:

  commit f83b916d5efa4bd33fbf4b7ea41bf6d535cc63fb
  Author: Alex Bennée <alex.bennee at linaro.org>
  Date:   Fri Feb 11 09:39:30 2022 +0000

      mappings: skip multipath-tools for cross Debian

      This package is both a mix of library files, headers and native
      binaries so cannot be installed in a cross environment. For now skip
      it for cross targets.

      See: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1005323

      Signed-off-by: Alex Bennée <alex.bennee at linaro.org>

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 ci/containers/centos-stream-9.Dockerfile          | 3 +++
 ci/containers/debian-10-cross-aarch64.Dockerfile  | 3 +--
 ci/containers/debian-10-cross-armv6l.Dockerfile   | 3 +--
 ci/containers/debian-10-cross-armv7l.Dockerfile   | 3 +--
 ci/containers/debian-10-cross-i686.Dockerfile     | 3 +--
 ci/containers/debian-10-cross-mips.Dockerfile     | 3 +--
 ci/containers/debian-10-cross-mips64el.Dockerfile | 3 +--
 ci/containers/debian-10-cross-mipsel.Dockerfile   | 3 +--
 ci/containers/debian-10-cross-ppc64le.Dockerfile  | 3 +--
 ci/containers/debian-10-cross-s390x.Dockerfile    | 3 +--
 ci/containers/debian-10.Dockerfile                | 3 +--
 ci/containers/opensuse-leap-152.Dockerfile        | 3 +--
 ci/containers/ubuntu-1804.Dockerfile              | 3 +--
 ci/containers/ubuntu-2004.Dockerfile              | 3 +--
 14 files changed, 16 insertions(+), 26 deletions(-)

diff --git a/ci/containers/centos-stream-9.Dockerfile b/ci/containers/centos-stream-9.Dockerfile
index 4e2e10b078..d20602b847 100644
--- a/ci/containers/centos-stream-9.Dockerfile
+++ b/ci/containers/centos-stream-9.Dockerfile
@@ -9,6 +9,9 @@ FROM quay.io/centos/centos:stream9
 RUN dnf update -y && \
     dnf install 'dnf-command(config-manager)' -y && \
     dnf config-manager --set-enabled -y crb && \
+    dnf install -y \
+        https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm \
+        https://dl.fedoraproject.org/pub/epel/epel-next-release-latest-9.noarch.rpm && \
     dnf install -y \
         audit-libs-devel \
         augeas \
diff --git a/ci/containers/debian-10-cross-aarch64.Dockerfile b/ci/containers/debian-10-cross-aarch64.Dockerfile
index 07994c1538..ca6b36b439 100644
--- a/ci/containers/debian-10-cross-aarch64.Dockerfile
+++ b/ci/containers/debian-10-cross-aarch64.Dockerfile
@@ -55,8 +55,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
     dpkg-reconfigure locales

-RUN pip3 install \
-         meson==0.56.0
+RUN pip3 install meson==0.56.0

 ENV LANG "en_US.UTF-8"
 ENV MAKE "/usr/bin/make"
diff --git a/ci/containers/debian-10-cross-armv6l.Dockerfile b/ci/containers/debian-10-cross-armv6l.Dockerfile
index bef7bf74c2..6818d6c409 100644
--- a/ci/containers/debian-10-cross-armv6l.Dockerfile
+++ b/ci/containers/debian-10-cross-armv6l.Dockerfile
@@ -55,8 +55,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
     dpkg-reconfigure locales

-RUN pip3 install \
-         meson==0.56.0
+RUN pip3 install meson==0.56.0

 ENV LANG "en_US.UTF-8"
 ENV MAKE "/usr/bin/make"
diff --git a/ci/containers/debian-10-cross-armv7l.Dockerfile b/ci/containers/debian-10-cross-armv7l.Dockerfile
index 9b6f2716e1..726d5d5846 100644
--- a/ci/containers/debian-10-cross-armv7l.Dockerfile
+++ b/ci/containers/debian-10-cross-armv7l.Dockerfile
@@ -55,8 +55,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
     dpkg-reconfigure locales

-RUN pip3 install \
-         meson==0.56.0
+RUN pip3 install meson==0.56.0

 ENV LANG "en_US.UTF-8"
 ENV MAKE "/usr/bin/make"
diff --git a/ci/containers/debian-10-cross-i686.Dockerfile b/ci/containers/debian-10-cross-i686.Dockerfile
index 1720d968b0..16e29e00c9 100644
--- a/ci/containers/debian-10-cross-i686.Dockerfile
+++ b/ci/containers/debian-10-cross-i686.Dockerfile
@@ -55,8 +55,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
     dpkg-reconfigure locales

-RUN pip3 install \
-         meson==0.56.0
+RUN pip3 install meson==0.56.0

 ENV LANG "en_US.UTF-8"
 ENV MAKE "/usr/bin/make"
diff --git a/ci/containers/debian-10-cross-mips.Dockerfile b/ci/containers/debian-10-cross-mips.Dockerfile
index f625ed3240..d5cabb47c4 100644
--- a/ci/containers/debian-10-cross-mips.Dockerfile
+++ b/ci/containers/debian-10-cross-mips.Dockerfile
@@ -55,8 +55,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
     dpkg-reconfigure locales

-RUN pip3 install \
-         meson==0.56.0
+RUN pip3 install meson==0.56.0

 ENV LANG "en_US.UTF-8"
 ENV MAKE "/usr/bin/make"
diff --git a/ci/containers/debian-10-cross-mips64el.Dockerfile b/ci/containers/debian-10-cross-mips64el.Dockerfile
index e24aec9b6a..ff63c2b5da 100644
--- a/ci/containers/debian-10-cross-mips64el.Dockerfile
+++ b/ci/containers/debian-10-cross-mips64el.Dockerfile
@@ -55,8 +55,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
     dpkg-reconfigure locales

-RUN pip3 install \
-         meson==0.56.0
+RUN pip3 install meson==0.56.0

 ENV LANG "en_US.UTF-8"
 ENV MAKE "/usr/bin/make"
diff --git a/ci/containers/debian-10-cross-mipsel.Dockerfile b/ci/containers/debian-10-cross-mipsel.Dockerfile
index 1af05e5184..93b68bd10e 100644
--- a/ci/containers/debian-10-cross-mipsel.Dockerfile
+++ b/ci/containers/debian-10-cross-mipsel.Dockerfile
@@ -55,8 +55,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
     dpkg-reconfigure locales

-RUN pip3 install \
-         meson==0.56.0
+RUN pip3 install meson==0.56.0

 ENV LANG "en_US.UTF-8"
 ENV MAKE "/usr/bin/make"
diff --git a/ci/containers/debian-10-cross-ppc64le.Dockerfile b/ci/containers/debian-10-cross-ppc64le.Dockerfile
index bd2b921e9d..5577056754 100644
--- a/ci/containers/debian-10-cross-ppc64le.Dockerfile
+++ b/ci/containers/debian-10-cross-ppc64le.Dockerfile
@@ -55,8 +55,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
     dpkg-reconfigure locales

-RUN pip3 install \
-         meson==0.56.0
+RUN pip3 install meson==0.56.0

 ENV LANG "en_US.UTF-8"
 ENV MAKE "/usr/bin/make"
diff --git a/ci/containers/debian-10-cross-s390x.Dockerfile b/ci/containers/debian-10-cross-s390x.Dockerfile
index 8a8a3fc05b..886d532927 100644
--- a/ci/containers/debian-10-cross-s390x.Dockerfile
+++ b/ci/containers/debian-10-cross-s390x.Dockerfile
@@ -55,8 +55,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
     dpkg-reconfigure locales

-RUN pip3 install \
-         meson==0.56.0
+RUN pip3 install meson==0.56.0

 ENV LANG "en_US.UTF-8"
 ENV MAKE "/usr/bin/make"
diff --git a/ci/containers/debian-10.Dockerfile b/ci/containers/debian-10.Dockerfile
index 41284a15db..63d070cb37 100644
--- a/ci/containers/debian-10.Dockerfile
+++ b/ci/containers/debian-10.Dockerfile
@@ -97,8 +97,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc

-RUN pip3 install \
-         meson==0.56.0
+RUN pip3 install meson==0.56.0

 ENV LANG "en_US.UTF-8"
 ENV MAKE "/usr/bin/make"
diff --git a/ci/containers/opensuse-leap-152.Dockerfile b/ci/containers/opensuse-leap-152.Dockerfile
index d81bdea08e..864dfa4fa7 100644
--- a/ci/containers/opensuse-leap-152.Dockerfile
+++ b/ci/containers/opensuse-leap-152.Dockerfile
@@ -92,8 +92,7 @@ RUN zypper update -y && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc

-RUN pip3 install \
-         meson==0.56.0
+RUN pip3 install meson==0.56.0

 ENV LANG "en_US.UTF-8"
 ENV MAKE "/usr/bin/make"
diff --git a/ci/containers/ubuntu-1804.Dockerfile b/ci/containers/ubuntu-1804.Dockerfile
index 970d920310..5e9f90cdba 100644
--- a/ci/containers/ubuntu-1804.Dockerfile
+++ b/ci/containers/ubuntu-1804.Dockerfile
@@ -99,8 +99,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc

-RUN pip3 install \
-         meson==0.56.0
+RUN pip3 install meson==0.56.0

 ENV LANG "en_US.UTF-8"
 ENV MAKE "/usr/bin/make"
diff --git a/ci/containers/ubuntu-2004.Dockerfile b/ci/containers/ubuntu-2004.Dockerfile
index 5cff997255..b6b10f2cbe 100644
--- a/ci/containers/ubuntu-2004.Dockerfile
+++ b/ci/containers/ubuntu-2004.Dockerfile
@@ -98,8 +98,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc

-RUN pip3 install \
-         meson==0.56.0
+RUN pip3 install meson==0.56.0

 ENV LANG "en_US.UTF-8"
 ENV MAKE "/usr/bin/make"
-- 
2.34.1

More information about the libvir-list mailing list