[Libguestfs] [libnbd PATCH 11/20] ci: Remove cross-compilation targets
Martin Kletzander
mkletzan at redhat.com
Tue Jun 8 07:53:52 UTC 2021
Signed-off-by: Martin Kletzander <mkletzan at redhat.com>
---
.gitlab-ci.yml | 203 ------------------
.../debian-10-cross-aarch64.Dockerfile | 86 --------
.../debian-10-cross-armv6l.Dockerfile | 86 --------
.../debian-10-cross-armv7l.Dockerfile | 86 --------
ci/containers/debian-10-cross-i686.Dockerfile | 86 --------
ci/containers/debian-10-cross-mips.Dockerfile | 86 --------
.../debian-10-cross-mips64el.Dockerfile | 86 --------
.../debian-10-cross-mipsel.Dockerfile | 86 --------
.../debian-10-cross-ppc64le.Dockerfile | 86 --------
.../debian-10-cross-s390x.Dockerfile | 86 --------
.../debian-sid-cross-aarch64.Dockerfile | 86 --------
.../debian-sid-cross-armv6l.Dockerfile | 86 --------
.../debian-sid-cross-armv7l.Dockerfile | 86 --------
.../debian-sid-cross-i686.Dockerfile | 86 --------
.../debian-sid-cross-mips64el.Dockerfile | 86 --------
.../debian-sid-cross-mipsel.Dockerfile | 86 --------
.../debian-sid-cross-ppc64le.Dockerfile | 86 --------
.../debian-sid-cross-s390x.Dockerfile | 86 --------
.../fedora-rawhide-cross-mingw32.Dockerfile | 71 ------
.../fedora-rawhide-cross-mingw64.Dockerfile | 71 ------
ci/containers/refresh | 20 --
21 files changed, 1827 deletions(-)
delete mode 100644 ci/containers/debian-10-cross-aarch64.Dockerfile
delete mode 100644 ci/containers/debian-10-cross-armv6l.Dockerfile
delete mode 100644 ci/containers/debian-10-cross-armv7l.Dockerfile
delete mode 100644 ci/containers/debian-10-cross-i686.Dockerfile
delete mode 100644 ci/containers/debian-10-cross-mips.Dockerfile
delete mode 100644 ci/containers/debian-10-cross-mips64el.Dockerfile
delete mode 100644 ci/containers/debian-10-cross-mipsel.Dockerfile
delete mode 100644 ci/containers/debian-10-cross-ppc64le.Dockerfile
delete mode 100644 ci/containers/debian-10-cross-s390x.Dockerfile
delete mode 100644 ci/containers/debian-sid-cross-aarch64.Dockerfile
delete mode 100644 ci/containers/debian-sid-cross-armv6l.Dockerfile
delete mode 100644 ci/containers/debian-sid-cross-armv7l.Dockerfile
delete mode 100644 ci/containers/debian-sid-cross-i686.Dockerfile
delete mode 100644 ci/containers/debian-sid-cross-mips64el.Dockerfile
delete mode 100644 ci/containers/debian-sid-cross-mipsel.Dockerfile
delete mode 100644 ci/containers/debian-sid-cross-ppc64le.Dockerfile
delete mode 100644 ci/containers/debian-sid-cross-s390x.Dockerfile
delete mode 100644 ci/containers/fedora-rawhide-cross-mingw32.Dockerfile
delete mode 100644 ci/containers/fedora-rawhide-cross-mingw64.Dockerfile
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 74807381b8ee..cd2167c52ab8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -54,10 +54,6 @@ stages:
extends: .base_build_job
image: $CI_REGISTRY_IMAGE/$NAME:latest
-.cross_build_job:
- extends: .base_build_job
- image: $CI_REGISTRY_IMAGE/$NAME-cross-$CROSS:latest
-
# Jobs that we delegate to Cirrus CI because they require an operating
# system other than Linux. These jobs will only run if the required
# setup has been performed on the GitLab account (see ci/README.rst).
@@ -154,112 +150,6 @@ x64-ubuntu-2004-container:
variables:
NAME: ubuntu-2004
-
-# Cross-build containers build jobs
-
-aarch64-debian-10-container:
- extends: .container_job
- allow_failure: true
- variables:
- NAME: debian-10-cross-aarch64
-
-armv6l-debian-10-container:
- extends: .container_job
- variables:
- NAME: debian-10-cross-armv6l
-
-armv7l-debian-10-container:
- extends: .container_job
- variables:
- NAME: debian-10-cross-armv7l
-
-i686-debian-10-container:
- extends: .container_job
- allow_failure: true
- variables:
- NAME: debian-10-cross-i686
-
-mips-debian-10-container:
- extends: .container_job
- variables:
- NAME: debian-10-cross-mips
-
-mips64el-debian-10-container:
- extends: .container_job
- allow_failure: true
- variables:
- NAME: debian-10-cross-mips64el
-
-mipsel-debian-10-container:
- extends: .container_job
- variables:
- NAME: debian-10-cross-mipsel
-
-ppc64le-debian-10-container:
- extends: .container_job
- variables:
- NAME: debian-10-cross-ppc64le
-
-s390x-debian-10-container:
- extends: .container_job
- allow_failure: true
- variables:
- NAME: debian-10-cross-s390x
-
-aarch64-debian-sid-container:
- extends: .container_job
- variables:
- NAME: debian-sid-cross-aarch64
-
-armv6l-debian-sid-container:
- extends: .container_job
- allow_failure: true
- variables:
- NAME: debian-sid-cross-armv6l
-
-armv7l-debian-sid-container:
- extends: .container_job
- allow_failure: true
- variables:
- NAME: debian-sid-cross-armv7l
-
-i686-debian-sid-container:
- extends: .container_job
- variables:
- NAME: debian-sid-cross-i686
-
-mips64el-debian-sid-container:
- extends: .container_job
- variables:
- NAME: debian-sid-cross-mips64el
-
-mipsel-debian-sid-container:
- extends: .container_job
- allow_failure: true
- variables:
- NAME: debian-sid-cross-mipsel
-
-ppc64le-debian-sid-container:
- extends: .container_job
- allow_failure: true
- variables:
- NAME: debian-sid-cross-ppc64le
-
-s390x-debian-sid-container:
- extends: .container_job
- variables:
- NAME: debian-sid-cross-s390x
-
-mingw32-fedora-rawhide-container:
- extends: .container_job
- variables:
- NAME: fedora-rawhide-cross-mingw32
-
-mingw64-fedora-rawhide-container:
- extends: .container_job
- variables:
- NAME: fedora-rawhide-cross-mingw64
-
# Native architecture build + test jobs
x64-debian-10:
@@ -386,96 +276,3 @@ x64-macos-11-build:
INSTALL_COMMAND: brew install
PATH_EXTRA: /usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin:/usr/local/opt/libpcap/bin:/usr/local/opt/libxslt/bin:/usr/local/opt/rpcgen/bin
PKG_CONFIG_PATH: /usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/libpcap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig
-
-
-# Cross compiled build jobs
-
-aarch64-debian-sid:
- extends: .cross_build_job
- needs:
- - aarch64-debian-sid-container
- variables:
- NAME: debian-sid
- CROSS: aarch64
-
-armv6l-debian-10:
- extends: .cross_build_job
- needs:
- - armv6l-debian-10-container
- variables:
- NAME: debian-10
- CROSS: armv6l
-
-armv7l-debian-10:
- extends: .cross_build_job
- needs:
- - armv7l-debian-10-container
- variables:
- NAME: debian-10
- CROSS: armv7l
-
-i686-debian-sid:
- extends: .cross_build_job
- needs:
- - i686-debian-sid-container
- variables:
- NAME: debian-sid
- CROSS: i686
-
-mips-debian-10:
- extends: .cross_build_job
- needs:
- - mips-debian-10-container
- variables:
- NAME: debian-10
- CROSS: mips
-
-mips64el-debian-sid:
- extends: .cross_build_job
- needs:
- - mips64el-debian-sid-container
- variables:
- NAME: debian-sid
- CROSS: mips64el
-
-mipsel-debian-10:
- extends: .cross_build_job
- needs:
- - mipsel-debian-10-container
- variables:
- NAME: debian-10
- CROSS: mipsel
-
-ppc64le-debian-10:
- extends: .cross_build_job
- needs:
- - ppc64le-debian-10-container
- variables:
- NAME: debian-10
- CROSS: ppc64le
-
-s390x-debian-sid:
- extends: .cross_build_job
- needs:
- - s390x-debian-sid-container
- variables:
- NAME: debian-sid
- CROSS: s390x
-
-mingw32-fedora-rawhide:
- extends: .cross_build_job
- allow_failure: true
- needs:
- - mingw32-fedora-rawhide-container
- variables:
- NAME: fedora-rawhide
- CROSS: mingw32
-
-mingw64-fedora-rawhide:
- extends: .cross_build_job
- allow_failure: true
- needs:
- - mingw64-fedora-rawhide-container
- variables:
- NAME: fedora-rawhide
- CROSS: mingw64
diff --git a/ci/containers/debian-10-cross-aarch64.Dockerfile b/ci/containers/debian-10-cross-aarch64.Dockerfile
deleted file mode 100644
index 5c19904dc45f..000000000000
--- a/ci/containers/debian-10-cross-aarch64.Dockerfile
+++ /dev/null
@@ -1,86 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-# $ lcitool dockerfile --cross aarch64 debian-10 libnbd
-#
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/5fd2cdeb8958df86a81b639fd096f626d0f5dbd0
-
-FROM docker.io/library/debian:10-slim
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
- apt-get update && \
- apt-get install -y eatmydata && \
- eatmydata apt-get dist-upgrade -y && \
- eatmydata apt-get install --no-install-recommends -y \
- autoconf \
- automake \
- bash-completion \
- ca-certificates \
- ccache \
- coreutils \
- diffutils \
- flake8 \
- git \
- gnutls-bin \
- golang \
- iproute2 \
- jq \
- libtool-bin \
- locales \
- make \
- nbd-client \
- nbd-server \
- nbdkit \
- ocaml \
- ocaml-findlib \
- perl-base \
- pkgconf \
- python3-dev \
- qemu-kvm \
- qemu-utils \
- sed && \
- eatmydata apt-get autoremove -y && \
- eatmydata apt-get autoclean -y && \
- sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
- dpkg-reconfigure locales && \
- dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \
- mkdir -p /usr/libexec/ccache-wrappers && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-c++ && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-cc && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-g++ && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-gcc
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
- dpkg --add-architecture arm64 && \
- eatmydata apt-get update && \
- eatmydata apt-get dist-upgrade -y && \
- eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
- eatmydata apt-get install --no-install-recommends -y \
- g++-aarch64-linux-gnu \
- gcc-aarch64-linux-gnu \
- libc6-dev:arm64 \
- libev-dev:arm64 \
- libfuse3-dev:arm64 \
- libglib2.0-dev:arm64 \
- libgnutls28-dev:arm64 \
- libxml2-dev:arm64 && \
- eatmydata apt-get autoremove -y && \
- eatmydata apt-get autoclean -y && \
- mkdir -p /usr/local/share/meson/cross && \
- echo "[binaries]\n\
-c = '/usr/bin/aarch64-linux-gnu-gcc'\n\
-ar = '/usr/bin/aarch64-linux-gnu-gcc-ar'\n\
-strip = '/usr/bin/aarch64-linux-gnu-strip'\n\
-pkgconfig = '/usr/bin/aarch64-linux-gnu-pkg-config'\n\
-\n\
-[host_machine]\n\
-system = 'linux'\n\
-cpu_family = 'aarch64'\n\
-cpu = 'aarch64'\n\
-endian = 'little'" > /usr/local/share/meson/cross/aarch64-linux-gnu
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
-
-ENV ABI "aarch64-linux-gnu"
-ENV CONFIGURE_OPTS "--host=aarch64-linux-gnu"
diff --git a/ci/containers/debian-10-cross-armv6l.Dockerfile b/ci/containers/debian-10-cross-armv6l.Dockerfile
deleted file mode 100644
index cfba6456170f..000000000000
--- a/ci/containers/debian-10-cross-armv6l.Dockerfile
+++ /dev/null
@@ -1,86 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-# $ lcitool dockerfile --cross armv6l debian-10 libnbd
-#
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/5fd2cdeb8958df86a81b639fd096f626d0f5dbd0
-
-FROM docker.io/library/debian:10-slim
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
- apt-get update && \
- apt-get install -y eatmydata && \
- eatmydata apt-get dist-upgrade -y && \
- eatmydata apt-get install --no-install-recommends -y \
- autoconf \
- automake \
- bash-completion \
- ca-certificates \
- ccache \
- coreutils \
- diffutils \
- flake8 \
- git \
- gnutls-bin \
- golang \
- iproute2 \
- jq \
- libtool-bin \
- locales \
- make \
- nbd-client \
- nbd-server \
- nbdkit \
- ocaml \
- ocaml-findlib \
- perl-base \
- pkgconf \
- python3-dev \
- qemu-kvm \
- qemu-utils \
- sed && \
- eatmydata apt-get autoremove -y && \
- eatmydata apt-get autoclean -y && \
- sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
- dpkg-reconfigure locales && \
- dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \
- mkdir -p /usr/libexec/ccache-wrappers && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-c++ && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-cc && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-g++ && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-gcc
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
- dpkg --add-architecture armel && \
- eatmydata apt-get update && \
- eatmydata apt-get dist-upgrade -y && \
- eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
- eatmydata apt-get install --no-install-recommends -y \
- g++-arm-linux-gnueabi \
- gcc-arm-linux-gnueabi \
- libc6-dev:armel \
- libev-dev:armel \
- libfuse3-dev:armel \
- libglib2.0-dev:armel \
- libgnutls28-dev:armel \
- libxml2-dev:armel && \
- eatmydata apt-get autoremove -y && \
- eatmydata apt-get autoclean -y && \
- mkdir -p /usr/local/share/meson/cross && \
- echo "[binaries]\n\
-c = '/usr/bin/arm-linux-gnueabi-gcc'\n\
-ar = '/usr/bin/arm-linux-gnueabi-gcc-ar'\n\
-strip = '/usr/bin/arm-linux-gnueabi-strip'\n\
-pkgconfig = '/usr/bin/arm-linux-gnueabi-pkg-config'\n\
-\n\
-[host_machine]\n\
-system = 'linux'\n\
-cpu_family = 'arm'\n\
-cpu = 'arm'\n\
-endian = 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabi
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
-
-ENV ABI "arm-linux-gnueabi"
-ENV CONFIGURE_OPTS "--host=arm-linux-gnueabi"
diff --git a/ci/containers/debian-10-cross-armv7l.Dockerfile b/ci/containers/debian-10-cross-armv7l.Dockerfile
deleted file mode 100644
index 693ca11a0d5e..000000000000
--- a/ci/containers/debian-10-cross-armv7l.Dockerfile
+++ /dev/null
@@ -1,86 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-# $ lcitool dockerfile --cross armv7l debian-10 libnbd
-#
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/5fd2cdeb8958df86a81b639fd096f626d0f5dbd0
-
-FROM docker.io/library/debian:10-slim
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
- apt-get update && \
- apt-get install -y eatmydata && \
- eatmydata apt-get dist-upgrade -y && \
- eatmydata apt-get install --no-install-recommends -y \
- autoconf \
- automake \
- bash-completion \
- ca-certificates \
- ccache \
- coreutils \
- diffutils \
- flake8 \
- git \
- gnutls-bin \
- golang \
- iproute2 \
- jq \
- libtool-bin \
- locales \
- make \
- nbd-client \
- nbd-server \
- nbdkit \
- ocaml \
- ocaml-findlib \
- perl-base \
- pkgconf \
- python3-dev \
- qemu-kvm \
- qemu-utils \
- sed && \
- eatmydata apt-get autoremove -y && \
- eatmydata apt-get autoclean -y && \
- sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
- dpkg-reconfigure locales && \
- dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \
- mkdir -p /usr/libexec/ccache-wrappers && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-c++ && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-cc && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-g++ && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-gcc
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
- dpkg --add-architecture armhf && \
- eatmydata apt-get update && \
- eatmydata apt-get dist-upgrade -y && \
- eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
- eatmydata apt-get install --no-install-recommends -y \
- g++-arm-linux-gnueabihf \
- gcc-arm-linux-gnueabihf \
- libc6-dev:armhf \
- libev-dev:armhf \
- libfuse3-dev:armhf \
- libglib2.0-dev:armhf \
- libgnutls28-dev:armhf \
- libxml2-dev:armhf && \
- eatmydata apt-get autoremove -y && \
- eatmydata apt-get autoclean -y && \
- mkdir -p /usr/local/share/meson/cross && \
- echo "[binaries]\n\
-c = '/usr/bin/arm-linux-gnueabihf-gcc'\n\
-ar = '/usr/bin/arm-linux-gnueabihf-gcc-ar'\n\
-strip = '/usr/bin/arm-linux-gnueabihf-strip'\n\
-pkgconfig = '/usr/bin/arm-linux-gnueabihf-pkg-config'\n\
-\n\
-[host_machine]\n\
-system = 'linux'\n\
-cpu_family = 'arm'\n\
-cpu = 'armhf'\n\
-endian = 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabihf
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
-
-ENV ABI "arm-linux-gnueabihf"
-ENV CONFIGURE_OPTS "--host=arm-linux-gnueabihf"
diff --git a/ci/containers/debian-10-cross-i686.Dockerfile b/ci/containers/debian-10-cross-i686.Dockerfile
deleted file mode 100644
index 5e3688f51766..000000000000
--- a/ci/containers/debian-10-cross-i686.Dockerfile
+++ /dev/null
@@ -1,86 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-# $ lcitool dockerfile --cross i686 debian-10 libnbd
-#
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/5fd2cdeb8958df86a81b639fd096f626d0f5dbd0
-
-FROM docker.io/library/debian:10-slim
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
- apt-get update && \
- apt-get install -y eatmydata && \
- eatmydata apt-get dist-upgrade -y && \
- eatmydata apt-get install --no-install-recommends -y \
- autoconf \
- automake \
- bash-completion \
- ca-certificates \
- ccache \
- coreutils \
- diffutils \
- flake8 \
- git \
- gnutls-bin \
- golang \
- iproute2 \
- jq \
- libtool-bin \
- locales \
- make \
- nbd-client \
- nbd-server \
- nbdkit \
- ocaml \
- ocaml-findlib \
- perl-base \
- pkgconf \
- python3-dev \
- qemu-kvm \
- qemu-utils \
- sed && \
- eatmydata apt-get autoremove -y && \
- eatmydata apt-get autoclean -y && \
- sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
- dpkg-reconfigure locales && \
- dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \
- mkdir -p /usr/libexec/ccache-wrappers && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-c++ && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-cc && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-g++ && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-gcc
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
- dpkg --add-architecture i386 && \
- eatmydata apt-get update && \
- eatmydata apt-get dist-upgrade -y && \
- eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
- eatmydata apt-get install --no-install-recommends -y \
- g++-i686-linux-gnu \
- gcc-i686-linux-gnu \
- libc6-dev:i386 \
- libev-dev:i386 \
- libfuse3-dev:i386 \
- libglib2.0-dev:i386 \
- libgnutls28-dev:i386 \
- libxml2-dev:i386 && \
- eatmydata apt-get autoremove -y && \
- eatmydata apt-get autoclean -y && \
- mkdir -p /usr/local/share/meson/cross && \
- echo "[binaries]\n\
-c = '/usr/bin/i686-linux-gnu-gcc'\n\
-ar = '/usr/bin/i686-linux-gnu-gcc-ar'\n\
-strip = '/usr/bin/i686-linux-gnu-strip'\n\
-pkgconfig = '/usr/bin/i686-linux-gnu-pkg-config'\n\
-\n\
-[host_machine]\n\
-system = 'linux'\n\
-cpu_family = 'x86'\n\
-cpu = 'i686'\n\
-endian = 'little'" > /usr/local/share/meson/cross/i686-linux-gnu
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
-
-ENV ABI "i686-linux-gnu"
-ENV CONFIGURE_OPTS "--host=i686-linux-gnu"
diff --git a/ci/containers/debian-10-cross-mips.Dockerfile b/ci/containers/debian-10-cross-mips.Dockerfile
deleted file mode 100644
index a5c3a91ab97d..000000000000
--- a/ci/containers/debian-10-cross-mips.Dockerfile
+++ /dev/null
@@ -1,86 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-# $ lcitool dockerfile --cross mips debian-10 libnbd
-#
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/5fd2cdeb8958df86a81b639fd096f626d0f5dbd0
-
-FROM docker.io/library/debian:10-slim
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
- apt-get update && \
- apt-get install -y eatmydata && \
- eatmydata apt-get dist-upgrade -y && \
- eatmydata apt-get install --no-install-recommends -y \
- autoconf \
- automake \
- bash-completion \
- ca-certificates \
- ccache \
- coreutils \
- diffutils \
- flake8 \
- git \
- gnutls-bin \
- golang \
- iproute2 \
- jq \
- libtool-bin \
- locales \
- make \
- nbd-client \
- nbd-server \
- nbdkit \
- ocaml \
- ocaml-findlib \
- perl-base \
- pkgconf \
- python3-dev \
- qemu-kvm \
- qemu-utils \
- sed && \
- eatmydata apt-get autoremove -y && \
- eatmydata apt-get autoclean -y && \
- sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
- dpkg-reconfigure locales && \
- dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \
- mkdir -p /usr/libexec/ccache-wrappers && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips-linux-gnu-c++ && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips-linux-gnu-cc && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips-linux-gnu-g++ && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips-linux-gnu-gcc
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
- dpkg --add-architecture mips && \
- eatmydata apt-get update && \
- eatmydata apt-get dist-upgrade -y && \
- eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
- eatmydata apt-get install --no-install-recommends -y \
- g++-mips-linux-gnu \
- gcc-mips-linux-gnu \
- libc6-dev:mips \
- libev-dev:mips \
- libfuse3-dev:mips \
- libglib2.0-dev:mips \
- libgnutls28-dev:mips \
- libxml2-dev:mips && \
- eatmydata apt-get autoremove -y && \
- eatmydata apt-get autoclean -y && \
- mkdir -p /usr/local/share/meson/cross && \
- echo "[binaries]\n\
-c = '/usr/bin/mips-linux-gnu-gcc'\n\
-ar = '/usr/bin/mips-linux-gnu-gcc-ar'\n\
-strip = '/usr/bin/mips-linux-gnu-strip'\n\
-pkgconfig = '/usr/bin/mips-linux-gnu-pkg-config'\n\
-\n\
-[host_machine]\n\
-system = 'linux'\n\
-cpu_family = 'mips'\n\
-cpu = 'mips'\n\
-endian = 'big'" > /usr/local/share/meson/cross/mips-linux-gnu
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
-
-ENV ABI "mips-linux-gnu"
-ENV CONFIGURE_OPTS "--host=mips-linux-gnu"
diff --git a/ci/containers/debian-10-cross-mips64el.Dockerfile b/ci/containers/debian-10-cross-mips64el.Dockerfile
deleted file mode 100644
index 3fc65ad6c47f..000000000000
--- a/ci/containers/debian-10-cross-mips64el.Dockerfile
+++ /dev/null
@@ -1,86 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-# $ lcitool dockerfile --cross mips64el debian-10 libnbd
-#
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/5fd2cdeb8958df86a81b639fd096f626d0f5dbd0
-
-FROM docker.io/library/debian:10-slim
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
- apt-get update && \
- apt-get install -y eatmydata && \
- eatmydata apt-get dist-upgrade -y && \
- eatmydata apt-get install --no-install-recommends -y \
- autoconf \
- automake \
- bash-completion \
- ca-certificates \
- ccache \
- coreutils \
- diffutils \
- flake8 \
- git \
- gnutls-bin \
- golang \
- iproute2 \
- jq \
- libtool-bin \
- locales \
- make \
- nbd-client \
- nbd-server \
- nbdkit \
- ocaml \
- ocaml-findlib \
- perl-base \
- pkgconf \
- python3-dev \
- qemu-kvm \
- qemu-utils \
- sed && \
- eatmydata apt-get autoremove -y && \
- eatmydata apt-get autoclean -y && \
- sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
- dpkg-reconfigure locales && \
- dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \
- mkdir -p /usr/libexec/ccache-wrappers && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-c++ && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-cc && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-g++ && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-gcc
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
- dpkg --add-architecture mips64el && \
- eatmydata apt-get update && \
- eatmydata apt-get dist-upgrade -y && \
- eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
- eatmydata apt-get install --no-install-recommends -y \
- g++-mips64el-linux-gnuabi64 \
- gcc-mips64el-linux-gnuabi64 \
- libc6-dev:mips64el \
- libev-dev:mips64el \
- libfuse3-dev:mips64el \
- libglib2.0-dev:mips64el \
- libgnutls28-dev:mips64el \
- libxml2-dev:mips64el && \
- eatmydata apt-get autoremove -y && \
- eatmydata apt-get autoclean -y && \
- mkdir -p /usr/local/share/meson/cross && \
- echo "[binaries]\n\
-c = '/usr/bin/mips64el-linux-gnuabi64-gcc'\n\
-ar = '/usr/bin/mips64el-linux-gnuabi64-gcc-ar'\n\
-strip = '/usr/bin/mips64el-linux-gnuabi64-strip'\n\
-pkgconfig = '/usr/bin/mips64el-linux-gnuabi64-pkg-config'\n\
-\n\
-[host_machine]\n\
-system = 'linux'\n\
-cpu_family = 'mips64'\n\
-cpu = 'mips64el'\n\
-endian = 'little'" > /usr/local/share/meson/cross/mips64el-linux-gnuabi64
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
-
-ENV ABI "mips64el-linux-gnuabi64"
-ENV CONFIGURE_OPTS "--host=mips64el-linux-gnuabi64"
diff --git a/ci/containers/debian-10-cross-mipsel.Dockerfile b/ci/containers/debian-10-cross-mipsel.Dockerfile
deleted file mode 100644
index f9a0aff68896..000000000000
--- a/ci/containers/debian-10-cross-mipsel.Dockerfile
+++ /dev/null
@@ -1,86 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-# $ lcitool dockerfile --cross mipsel debian-10 libnbd
-#
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/5fd2cdeb8958df86a81b639fd096f626d0f5dbd0
-
-FROM docker.io/library/debian:10-slim
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
- apt-get update && \
- apt-get install -y eatmydata && \
- eatmydata apt-get dist-upgrade -y && \
- eatmydata apt-get install --no-install-recommends -y \
- autoconf \
- automake \
- bash-completion \
- ca-certificates \
- ccache \
- coreutils \
- diffutils \
- flake8 \
- git \
- gnutls-bin \
- golang \
- iproute2 \
- jq \
- libtool-bin \
- locales \
- make \
- nbd-client \
- nbd-server \
- nbdkit \
- ocaml \
- ocaml-findlib \
- perl-base \
- pkgconf \
- python3-dev \
- qemu-kvm \
- qemu-utils \
- sed && \
- eatmydata apt-get autoremove -y && \
- eatmydata apt-get autoclean -y && \
- sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
- dpkg-reconfigure locales && \
- dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \
- mkdir -p /usr/libexec/ccache-wrappers && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-c++ && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-cc && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-g++ && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-gcc
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
- dpkg --add-architecture mipsel && \
- eatmydata apt-get update && \
- eatmydata apt-get dist-upgrade -y && \
- eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
- eatmydata apt-get install --no-install-recommends -y \
- g++-mipsel-linux-gnu \
- gcc-mipsel-linux-gnu \
- libc6-dev:mipsel \
- libev-dev:mipsel \
- libfuse3-dev:mipsel \
- libglib2.0-dev:mipsel \
- libgnutls28-dev:mipsel \
- libxml2-dev:mipsel && \
- eatmydata apt-get autoremove -y && \
- eatmydata apt-get autoclean -y && \
- mkdir -p /usr/local/share/meson/cross && \
- echo "[binaries]\n\
-c = '/usr/bin/mipsel-linux-gnu-gcc'\n\
-ar = '/usr/bin/mipsel-linux-gnu-gcc-ar'\n\
-strip = '/usr/bin/mipsel-linux-gnu-strip'\n\
-pkgconfig = '/usr/bin/mipsel-linux-gnu-pkg-config'\n\
-\n\
-[host_machine]\n\
-system = 'linux'\n\
-cpu_family = 'mips'\n\
-cpu = 'mipsel'\n\
-endian = 'little'" > /usr/local/share/meson/cross/mipsel-linux-gnu
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
-
-ENV ABI "mipsel-linux-gnu"
-ENV CONFIGURE_OPTS "--host=mipsel-linux-gnu"
diff --git a/ci/containers/debian-10-cross-ppc64le.Dockerfile b/ci/containers/debian-10-cross-ppc64le.Dockerfile
deleted file mode 100644
index 5cb602985c2a..000000000000
--- a/ci/containers/debian-10-cross-ppc64le.Dockerfile
+++ /dev/null
@@ -1,86 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-# $ lcitool dockerfile --cross ppc64le debian-10 libnbd
-#
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/5fd2cdeb8958df86a81b639fd096f626d0f5dbd0
-
-FROM docker.io/library/debian:10-slim
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
- apt-get update && \
- apt-get install -y eatmydata && \
- eatmydata apt-get dist-upgrade -y && \
- eatmydata apt-get install --no-install-recommends -y \
- autoconf \
- automake \
- bash-completion \
- ca-certificates \
- ccache \
- coreutils \
- diffutils \
- flake8 \
- git \
- gnutls-bin \
- golang \
- iproute2 \
- jq \
- libtool-bin \
- locales \
- make \
- nbd-client \
- nbd-server \
- nbdkit \
- ocaml \
- ocaml-findlib \
- perl-base \
- pkgconf \
- python3-dev \
- qemu-kvm \
- qemu-utils \
- sed && \
- eatmydata apt-get autoremove -y && \
- eatmydata apt-get autoclean -y && \
- sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
- dpkg-reconfigure locales && \
- dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \
- mkdir -p /usr/libexec/ccache-wrappers && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-c++ && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-cc && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-g++ && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-gcc
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
- dpkg --add-architecture ppc64el && \
- eatmydata apt-get update && \
- eatmydata apt-get dist-upgrade -y && \
- eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
- eatmydata apt-get install --no-install-recommends -y \
- g++-powerpc64le-linux-gnu \
- gcc-powerpc64le-linux-gnu \
- libc6-dev:ppc64el \
- libev-dev:ppc64el \
- libfuse3-dev:ppc64el \
- libglib2.0-dev:ppc64el \
- libgnutls28-dev:ppc64el \
- libxml2-dev:ppc64el && \
- eatmydata apt-get autoremove -y && \
- eatmydata apt-get autoclean -y && \
- mkdir -p /usr/local/share/meson/cross && \
- echo "[binaries]\n\
-c = '/usr/bin/powerpc64le-linux-gnu-gcc'\n\
-ar = '/usr/bin/powerpc64le-linux-gnu-gcc-ar'\n\
-strip = '/usr/bin/powerpc64le-linux-gnu-strip'\n\
-pkgconfig = '/usr/bin/powerpc64le-linux-gnu-pkg-config'\n\
-\n\
-[host_machine]\n\
-system = 'linux'\n\
-cpu_family = 'ppc64'\n\
-cpu = 'powerpc64le'\n\
-endian = 'little'" > /usr/local/share/meson/cross/powerpc64le-linux-gnu
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
-
-ENV ABI "powerpc64le-linux-gnu"
-ENV CONFIGURE_OPTS "--host=powerpc64le-linux-gnu"
diff --git a/ci/containers/debian-10-cross-s390x.Dockerfile b/ci/containers/debian-10-cross-s390x.Dockerfile
deleted file mode 100644
index 8280822e5e62..000000000000
--- a/ci/containers/debian-10-cross-s390x.Dockerfile
+++ /dev/null
@@ -1,86 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-# $ lcitool dockerfile --cross s390x debian-10 libnbd
-#
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/5fd2cdeb8958df86a81b639fd096f626d0f5dbd0
-
-FROM docker.io/library/debian:10-slim
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
- apt-get update && \
- apt-get install -y eatmydata && \
- eatmydata apt-get dist-upgrade -y && \
- eatmydata apt-get install --no-install-recommends -y \
- autoconf \
- automake \
- bash-completion \
- ca-certificates \
- ccache \
- coreutils \
- diffutils \
- flake8 \
- git \
- gnutls-bin \
- golang \
- iproute2 \
- jq \
- libtool-bin \
- locales \
- make \
- nbd-client \
- nbd-server \
- nbdkit \
- ocaml \
- ocaml-findlib \
- perl-base \
- pkgconf \
- python3-dev \
- qemu-kvm \
- qemu-utils \
- sed && \
- eatmydata apt-get autoremove -y && \
- eatmydata apt-get autoclean -y && \
- sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
- dpkg-reconfigure locales && \
- dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \
- mkdir -p /usr/libexec/ccache-wrappers && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-c++ && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-cc && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-g++ && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-gcc
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
- dpkg --add-architecture s390x && \
- eatmydata apt-get update && \
- eatmydata apt-get dist-upgrade -y && \
- eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
- eatmydata apt-get install --no-install-recommends -y \
- g++-s390x-linux-gnu \
- gcc-s390x-linux-gnu \
- libc6-dev:s390x \
- libev-dev:s390x \
- libfuse3-dev:s390x \
- libglib2.0-dev:s390x \
- libgnutls28-dev:s390x \
- libxml2-dev:s390x && \
- eatmydata apt-get autoremove -y && \
- eatmydata apt-get autoclean -y && \
- mkdir -p /usr/local/share/meson/cross && \
- echo "[binaries]\n\
-c = '/usr/bin/s390x-linux-gnu-gcc'\n\
-ar = '/usr/bin/s390x-linux-gnu-gcc-ar'\n\
-strip = '/usr/bin/s390x-linux-gnu-strip'\n\
-pkgconfig = '/usr/bin/s390x-linux-gnu-pkg-config'\n\
-\n\
-[host_machine]\n\
-system = 'linux'\n\
-cpu_family = 's390x'\n\
-cpu = 's390x'\n\
-endian = 'big'" > /usr/local/share/meson/cross/s390x-linux-gnu
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
-
-ENV ABI "s390x-linux-gnu"
-ENV CONFIGURE_OPTS "--host=s390x-linux-gnu"
diff --git a/ci/containers/debian-sid-cross-aarch64.Dockerfile b/ci/containers/debian-sid-cross-aarch64.Dockerfile
deleted file mode 100644
index c158d3d03ab5..000000000000
--- a/ci/containers/debian-sid-cross-aarch64.Dockerfile
+++ /dev/null
@@ -1,86 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-# $ lcitool dockerfile --cross aarch64 debian-sid libnbd
-#
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/5fd2cdeb8958df86a81b639fd096f626d0f5dbd0
-
-FROM docker.io/library/debian:sid-slim
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
- apt-get update && \
- apt-get install -y eatmydata && \
- eatmydata apt-get dist-upgrade -y && \
- eatmydata apt-get install --no-install-recommends -y \
- autoconf \
- automake \
- bash-completion \
- ca-certificates \
- ccache \
- coreutils \
- diffutils \
- flake8 \
- git \
- gnutls-bin \
- golang \
- iproute2 \
- jq \
- libtool-bin \
- locales \
- make \
- nbd-client \
- nbd-server \
- nbdkit \
- ocaml \
- ocaml-findlib \
- perl-base \
- pkgconf \
- python3-dev \
- qemu-kvm \
- qemu-utils \
- sed && \
- eatmydata apt-get autoremove -y && \
- eatmydata apt-get autoclean -y && \
- sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
- dpkg-reconfigure locales && \
- dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \
- mkdir -p /usr/libexec/ccache-wrappers && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-c++ && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-cc && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-g++ && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-gcc
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
- dpkg --add-architecture arm64 && \
- eatmydata apt-get update && \
- eatmydata apt-get dist-upgrade -y && \
- eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
- eatmydata apt-get install --no-install-recommends -y \
- g++-aarch64-linux-gnu \
- gcc-aarch64-linux-gnu \
- libc6-dev:arm64 \
- libev-dev:arm64 \
- libfuse3-dev:arm64 \
- libglib2.0-dev:arm64 \
- libgnutls28-dev:arm64 \
- libxml2-dev:arm64 && \
- eatmydata apt-get autoremove -y && \
- eatmydata apt-get autoclean -y && \
- mkdir -p /usr/local/share/meson/cross && \
- echo "[binaries]\n\
-c = '/usr/bin/aarch64-linux-gnu-gcc'\n\
-ar = '/usr/bin/aarch64-linux-gnu-gcc-ar'\n\
-strip = '/usr/bin/aarch64-linux-gnu-strip'\n\
-pkgconfig = '/usr/bin/aarch64-linux-gnu-pkg-config'\n\
-\n\
-[host_machine]\n\
-system = 'linux'\n\
-cpu_family = 'aarch64'\n\
-cpu = 'aarch64'\n\
-endian = 'little'" > /usr/local/share/meson/cross/aarch64-linux-gnu
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
-
-ENV ABI "aarch64-linux-gnu"
-ENV CONFIGURE_OPTS "--host=aarch64-linux-gnu"
diff --git a/ci/containers/debian-sid-cross-armv6l.Dockerfile b/ci/containers/debian-sid-cross-armv6l.Dockerfile
deleted file mode 100644
index a68338db9c91..000000000000
--- a/ci/containers/debian-sid-cross-armv6l.Dockerfile
+++ /dev/null
@@ -1,86 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-# $ lcitool dockerfile --cross armv6l debian-sid libnbd
-#
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/5fd2cdeb8958df86a81b639fd096f626d0f5dbd0
-
-FROM docker.io/library/debian:sid-slim
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
- apt-get update && \
- apt-get install -y eatmydata && \
- eatmydata apt-get dist-upgrade -y && \
- eatmydata apt-get install --no-install-recommends -y \
- autoconf \
- automake \
- bash-completion \
- ca-certificates \
- ccache \
- coreutils \
- diffutils \
- flake8 \
- git \
- gnutls-bin \
- golang \
- iproute2 \
- jq \
- libtool-bin \
- locales \
- make \
- nbd-client \
- nbd-server \
- nbdkit \
- ocaml \
- ocaml-findlib \
- perl-base \
- pkgconf \
- python3-dev \
- qemu-kvm \
- qemu-utils \
- sed && \
- eatmydata apt-get autoremove -y && \
- eatmydata apt-get autoclean -y && \
- sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
- dpkg-reconfigure locales && \
- dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \
- mkdir -p /usr/libexec/ccache-wrappers && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-c++ && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-cc && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-g++ && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-gcc
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
- dpkg --add-architecture armel && \
- eatmydata apt-get update && \
- eatmydata apt-get dist-upgrade -y && \
- eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
- eatmydata apt-get install --no-install-recommends -y \
- g++-arm-linux-gnueabi \
- gcc-arm-linux-gnueabi \
- libc6-dev:armel \
- libev-dev:armel \
- libfuse3-dev:armel \
- libglib2.0-dev:armel \
- libgnutls28-dev:armel \
- libxml2-dev:armel && \
- eatmydata apt-get autoremove -y && \
- eatmydata apt-get autoclean -y && \
- mkdir -p /usr/local/share/meson/cross && \
- echo "[binaries]\n\
-c = '/usr/bin/arm-linux-gnueabi-gcc'\n\
-ar = '/usr/bin/arm-linux-gnueabi-gcc-ar'\n\
-strip = '/usr/bin/arm-linux-gnueabi-strip'\n\
-pkgconfig = '/usr/bin/arm-linux-gnueabi-pkg-config'\n\
-\n\
-[host_machine]\n\
-system = 'linux'\n\
-cpu_family = 'arm'\n\
-cpu = 'arm'\n\
-endian = 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabi
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
-
-ENV ABI "arm-linux-gnueabi"
-ENV CONFIGURE_OPTS "--host=arm-linux-gnueabi"
diff --git a/ci/containers/debian-sid-cross-armv7l.Dockerfile b/ci/containers/debian-sid-cross-armv7l.Dockerfile
deleted file mode 100644
index 1f9085bd7e1e..000000000000
--- a/ci/containers/debian-sid-cross-armv7l.Dockerfile
+++ /dev/null
@@ -1,86 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-# $ lcitool dockerfile --cross armv7l debian-sid libnbd
-#
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/5fd2cdeb8958df86a81b639fd096f626d0f5dbd0
-
-FROM docker.io/library/debian:sid-slim
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
- apt-get update && \
- apt-get install -y eatmydata && \
- eatmydata apt-get dist-upgrade -y && \
- eatmydata apt-get install --no-install-recommends -y \
- autoconf \
- automake \
- bash-completion \
- ca-certificates \
- ccache \
- coreutils \
- diffutils \
- flake8 \
- git \
- gnutls-bin \
- golang \
- iproute2 \
- jq \
- libtool-bin \
- locales \
- make \
- nbd-client \
- nbd-server \
- nbdkit \
- ocaml \
- ocaml-findlib \
- perl-base \
- pkgconf \
- python3-dev \
- qemu-kvm \
- qemu-utils \
- sed && \
- eatmydata apt-get autoremove -y && \
- eatmydata apt-get autoclean -y && \
- sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
- dpkg-reconfigure locales && \
- dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \
- mkdir -p /usr/libexec/ccache-wrappers && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-c++ && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-cc && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-g++ && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-gcc
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
- dpkg --add-architecture armhf && \
- eatmydata apt-get update && \
- eatmydata apt-get dist-upgrade -y && \
- eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
- eatmydata apt-get install --no-install-recommends -y \
- g++-arm-linux-gnueabihf \
- gcc-arm-linux-gnueabihf \
- libc6-dev:armhf \
- libev-dev:armhf \
- libfuse3-dev:armhf \
- libglib2.0-dev:armhf \
- libgnutls28-dev:armhf \
- libxml2-dev:armhf && \
- eatmydata apt-get autoremove -y && \
- eatmydata apt-get autoclean -y && \
- mkdir -p /usr/local/share/meson/cross && \
- echo "[binaries]\n\
-c = '/usr/bin/arm-linux-gnueabihf-gcc'\n\
-ar = '/usr/bin/arm-linux-gnueabihf-gcc-ar'\n\
-strip = '/usr/bin/arm-linux-gnueabihf-strip'\n\
-pkgconfig = '/usr/bin/arm-linux-gnueabihf-pkg-config'\n\
-\n\
-[host_machine]\n\
-system = 'linux'\n\
-cpu_family = 'arm'\n\
-cpu = 'armhf'\n\
-endian = 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabihf
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
-
-ENV ABI "arm-linux-gnueabihf"
-ENV CONFIGURE_OPTS "--host=arm-linux-gnueabihf"
diff --git a/ci/containers/debian-sid-cross-i686.Dockerfile b/ci/containers/debian-sid-cross-i686.Dockerfile
deleted file mode 100644
index 37b28a612adf..000000000000
--- a/ci/containers/debian-sid-cross-i686.Dockerfile
+++ /dev/null
@@ -1,86 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-# $ lcitool dockerfile --cross i686 debian-sid libnbd
-#
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/5fd2cdeb8958df86a81b639fd096f626d0f5dbd0
-
-FROM docker.io/library/debian:sid-slim
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
- apt-get update && \
- apt-get install -y eatmydata && \
- eatmydata apt-get dist-upgrade -y && \
- eatmydata apt-get install --no-install-recommends -y \
- autoconf \
- automake \
- bash-completion \
- ca-certificates \
- ccache \
- coreutils \
- diffutils \
- flake8 \
- git \
- gnutls-bin \
- golang \
- iproute2 \
- jq \
- libtool-bin \
- locales \
- make \
- nbd-client \
- nbd-server \
- nbdkit \
- ocaml \
- ocaml-findlib \
- perl-base \
- pkgconf \
- python3-dev \
- qemu-kvm \
- qemu-utils \
- sed && \
- eatmydata apt-get autoremove -y && \
- eatmydata apt-get autoclean -y && \
- sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
- dpkg-reconfigure locales && \
- dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \
- mkdir -p /usr/libexec/ccache-wrappers && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-c++ && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-cc && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-g++ && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-gcc
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
- dpkg --add-architecture i386 && \
- eatmydata apt-get update && \
- eatmydata apt-get dist-upgrade -y && \
- eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
- eatmydata apt-get install --no-install-recommends -y \
- g++-i686-linux-gnu \
- gcc-i686-linux-gnu \
- libc6-dev:i386 \
- libev-dev:i386 \
- libfuse3-dev:i386 \
- libglib2.0-dev:i386 \
- libgnutls28-dev:i386 \
- libxml2-dev:i386 && \
- eatmydata apt-get autoremove -y && \
- eatmydata apt-get autoclean -y && \
- mkdir -p /usr/local/share/meson/cross && \
- echo "[binaries]\n\
-c = '/usr/bin/i686-linux-gnu-gcc'\n\
-ar = '/usr/bin/i686-linux-gnu-gcc-ar'\n\
-strip = '/usr/bin/i686-linux-gnu-strip'\n\
-pkgconfig = '/usr/bin/i686-linux-gnu-pkg-config'\n\
-\n\
-[host_machine]\n\
-system = 'linux'\n\
-cpu_family = 'x86'\n\
-cpu = 'i686'\n\
-endian = 'little'" > /usr/local/share/meson/cross/i686-linux-gnu
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
-
-ENV ABI "i686-linux-gnu"
-ENV CONFIGURE_OPTS "--host=i686-linux-gnu"
diff --git a/ci/containers/debian-sid-cross-mips64el.Dockerfile b/ci/containers/debian-sid-cross-mips64el.Dockerfile
deleted file mode 100644
index dee0fd013d2f..000000000000
--- a/ci/containers/debian-sid-cross-mips64el.Dockerfile
+++ /dev/null
@@ -1,86 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-# $ lcitool dockerfile --cross mips64el debian-sid libnbd
-#
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/5fd2cdeb8958df86a81b639fd096f626d0f5dbd0
-
-FROM docker.io/library/debian:sid-slim
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
- apt-get update && \
- apt-get install -y eatmydata && \
- eatmydata apt-get dist-upgrade -y && \
- eatmydata apt-get install --no-install-recommends -y \
- autoconf \
- automake \
- bash-completion \
- ca-certificates \
- ccache \
- coreutils \
- diffutils \
- flake8 \
- git \
- gnutls-bin \
- golang \
- iproute2 \
- jq \
- libtool-bin \
- locales \
- make \
- nbd-client \
- nbd-server \
- nbdkit \
- ocaml \
- ocaml-findlib \
- perl-base \
- pkgconf \
- python3-dev \
- qemu-kvm \
- qemu-utils \
- sed && \
- eatmydata apt-get autoremove -y && \
- eatmydata apt-get autoclean -y && \
- sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
- dpkg-reconfigure locales && \
- dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \
- mkdir -p /usr/libexec/ccache-wrappers && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-c++ && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-cc && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-g++ && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-gcc
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
- dpkg --add-architecture mips64el && \
- eatmydata apt-get update && \
- eatmydata apt-get dist-upgrade -y && \
- eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
- eatmydata apt-get install --no-install-recommends -y \
- g++-mips64el-linux-gnuabi64 \
- gcc-mips64el-linux-gnuabi64 \
- libc6-dev:mips64el \
- libev-dev:mips64el \
- libfuse3-dev:mips64el \
- libglib2.0-dev:mips64el \
- libgnutls28-dev:mips64el \
- libxml2-dev:mips64el && \
- eatmydata apt-get autoremove -y && \
- eatmydata apt-get autoclean -y && \
- mkdir -p /usr/local/share/meson/cross && \
- echo "[binaries]\n\
-c = '/usr/bin/mips64el-linux-gnuabi64-gcc'\n\
-ar = '/usr/bin/mips64el-linux-gnuabi64-gcc-ar'\n\
-strip = '/usr/bin/mips64el-linux-gnuabi64-strip'\n\
-pkgconfig = '/usr/bin/mips64el-linux-gnuabi64-pkg-config'\n\
-\n\
-[host_machine]\n\
-system = 'linux'\n\
-cpu_family = 'mips64'\n\
-cpu = 'mips64el'\n\
-endian = 'little'" > /usr/local/share/meson/cross/mips64el-linux-gnuabi64
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
-
-ENV ABI "mips64el-linux-gnuabi64"
-ENV CONFIGURE_OPTS "--host=mips64el-linux-gnuabi64"
diff --git a/ci/containers/debian-sid-cross-mipsel.Dockerfile b/ci/containers/debian-sid-cross-mipsel.Dockerfile
deleted file mode 100644
index 67feb7dede2c..000000000000
--- a/ci/containers/debian-sid-cross-mipsel.Dockerfile
+++ /dev/null
@@ -1,86 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-# $ lcitool dockerfile --cross mipsel debian-sid libnbd
-#
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/5fd2cdeb8958df86a81b639fd096f626d0f5dbd0
-
-FROM docker.io/library/debian:sid-slim
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
- apt-get update && \
- apt-get install -y eatmydata && \
- eatmydata apt-get dist-upgrade -y && \
- eatmydata apt-get install --no-install-recommends -y \
- autoconf \
- automake \
- bash-completion \
- ca-certificates \
- ccache \
- coreutils \
- diffutils \
- flake8 \
- git \
- gnutls-bin \
- golang \
- iproute2 \
- jq \
- libtool-bin \
- locales \
- make \
- nbd-client \
- nbd-server \
- nbdkit \
- ocaml \
- ocaml-findlib \
- perl-base \
- pkgconf \
- python3-dev \
- qemu-kvm \
- qemu-utils \
- sed && \
- eatmydata apt-get autoremove -y && \
- eatmydata apt-get autoclean -y && \
- sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
- dpkg-reconfigure locales && \
- dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \
- mkdir -p /usr/libexec/ccache-wrappers && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-c++ && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-cc && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-g++ && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-gcc
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
- dpkg --add-architecture mipsel && \
- eatmydata apt-get update && \
- eatmydata apt-get dist-upgrade -y && \
- eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
- eatmydata apt-get install --no-install-recommends -y \
- g++-mipsel-linux-gnu \
- gcc-mipsel-linux-gnu \
- libc6-dev:mipsel \
- libev-dev:mipsel \
- libfuse3-dev:mipsel \
- libglib2.0-dev:mipsel \
- libgnutls28-dev:mipsel \
- libxml2-dev:mipsel && \
- eatmydata apt-get autoremove -y && \
- eatmydata apt-get autoclean -y && \
- mkdir -p /usr/local/share/meson/cross && \
- echo "[binaries]\n\
-c = '/usr/bin/mipsel-linux-gnu-gcc'\n\
-ar = '/usr/bin/mipsel-linux-gnu-gcc-ar'\n\
-strip = '/usr/bin/mipsel-linux-gnu-strip'\n\
-pkgconfig = '/usr/bin/mipsel-linux-gnu-pkg-config'\n\
-\n\
-[host_machine]\n\
-system = 'linux'\n\
-cpu_family = 'mips'\n\
-cpu = 'mipsel'\n\
-endian = 'little'" > /usr/local/share/meson/cross/mipsel-linux-gnu
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
-
-ENV ABI "mipsel-linux-gnu"
-ENV CONFIGURE_OPTS "--host=mipsel-linux-gnu"
diff --git a/ci/containers/debian-sid-cross-ppc64le.Dockerfile b/ci/containers/debian-sid-cross-ppc64le.Dockerfile
deleted file mode 100644
index 9914e4c2cfeb..000000000000
--- a/ci/containers/debian-sid-cross-ppc64le.Dockerfile
+++ /dev/null
@@ -1,86 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-# $ lcitool dockerfile --cross ppc64le debian-sid libnbd
-#
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/5fd2cdeb8958df86a81b639fd096f626d0f5dbd0
-
-FROM docker.io/library/debian:sid-slim
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
- apt-get update && \
- apt-get install -y eatmydata && \
- eatmydata apt-get dist-upgrade -y && \
- eatmydata apt-get install --no-install-recommends -y \
- autoconf \
- automake \
- bash-completion \
- ca-certificates \
- ccache \
- coreutils \
- diffutils \
- flake8 \
- git \
- gnutls-bin \
- golang \
- iproute2 \
- jq \
- libtool-bin \
- locales \
- make \
- nbd-client \
- nbd-server \
- nbdkit \
- ocaml \
- ocaml-findlib \
- perl-base \
- pkgconf \
- python3-dev \
- qemu-kvm \
- qemu-utils \
- sed && \
- eatmydata apt-get autoremove -y && \
- eatmydata apt-get autoclean -y && \
- sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
- dpkg-reconfigure locales && \
- dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \
- mkdir -p /usr/libexec/ccache-wrappers && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-c++ && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-cc && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-g++ && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-gcc
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
- dpkg --add-architecture ppc64el && \
- eatmydata apt-get update && \
- eatmydata apt-get dist-upgrade -y && \
- eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
- eatmydata apt-get install --no-install-recommends -y \
- g++-powerpc64le-linux-gnu \
- gcc-powerpc64le-linux-gnu \
- libc6-dev:ppc64el \
- libev-dev:ppc64el \
- libfuse3-dev:ppc64el \
- libglib2.0-dev:ppc64el \
- libgnutls28-dev:ppc64el \
- libxml2-dev:ppc64el && \
- eatmydata apt-get autoremove -y && \
- eatmydata apt-get autoclean -y && \
- mkdir -p /usr/local/share/meson/cross && \
- echo "[binaries]\n\
-c = '/usr/bin/powerpc64le-linux-gnu-gcc'\n\
-ar = '/usr/bin/powerpc64le-linux-gnu-gcc-ar'\n\
-strip = '/usr/bin/powerpc64le-linux-gnu-strip'\n\
-pkgconfig = '/usr/bin/powerpc64le-linux-gnu-pkg-config'\n\
-\n\
-[host_machine]\n\
-system = 'linux'\n\
-cpu_family = 'ppc64'\n\
-cpu = 'powerpc64le'\n\
-endian = 'little'" > /usr/local/share/meson/cross/powerpc64le-linux-gnu
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
-
-ENV ABI "powerpc64le-linux-gnu"
-ENV CONFIGURE_OPTS "--host=powerpc64le-linux-gnu"
diff --git a/ci/containers/debian-sid-cross-s390x.Dockerfile b/ci/containers/debian-sid-cross-s390x.Dockerfile
deleted file mode 100644
index 84d82fd3ecc9..000000000000
--- a/ci/containers/debian-sid-cross-s390x.Dockerfile
+++ /dev/null
@@ -1,86 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-# $ lcitool dockerfile --cross s390x debian-sid libnbd
-#
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/5fd2cdeb8958df86a81b639fd096f626d0f5dbd0
-
-FROM docker.io/library/debian:sid-slim
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
- apt-get update && \
- apt-get install -y eatmydata && \
- eatmydata apt-get dist-upgrade -y && \
- eatmydata apt-get install --no-install-recommends -y \
- autoconf \
- automake \
- bash-completion \
- ca-certificates \
- ccache \
- coreutils \
- diffutils \
- flake8 \
- git \
- gnutls-bin \
- golang \
- iproute2 \
- jq \
- libtool-bin \
- locales \
- make \
- nbd-client \
- nbd-server \
- nbdkit \
- ocaml \
- ocaml-findlib \
- perl-base \
- pkgconf \
- python3-dev \
- qemu-kvm \
- qemu-utils \
- sed && \
- eatmydata apt-get autoremove -y && \
- eatmydata apt-get autoclean -y && \
- sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
- dpkg-reconfigure locales && \
- dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \
- mkdir -p /usr/libexec/ccache-wrappers && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-c++ && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-cc && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-g++ && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-gcc
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
- dpkg --add-architecture s390x && \
- eatmydata apt-get update && \
- eatmydata apt-get dist-upgrade -y && \
- eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
- eatmydata apt-get install --no-install-recommends -y \
- g++-s390x-linux-gnu \
- gcc-s390x-linux-gnu \
- libc6-dev:s390x \
- libev-dev:s390x \
- libfuse3-dev:s390x \
- libglib2.0-dev:s390x \
- libgnutls28-dev:s390x \
- libxml2-dev:s390x && \
- eatmydata apt-get autoremove -y && \
- eatmydata apt-get autoclean -y && \
- mkdir -p /usr/local/share/meson/cross && \
- echo "[binaries]\n\
-c = '/usr/bin/s390x-linux-gnu-gcc'\n\
-ar = '/usr/bin/s390x-linux-gnu-gcc-ar'\n\
-strip = '/usr/bin/s390x-linux-gnu-strip'\n\
-pkgconfig = '/usr/bin/s390x-linux-gnu-pkg-config'\n\
-\n\
-[host_machine]\n\
-system = 'linux'\n\
-cpu_family = 's390x'\n\
-cpu = 's390x'\n\
-endian = 'big'" > /usr/local/share/meson/cross/s390x-linux-gnu
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
-
-ENV ABI "s390x-linux-gnu"
-ENV CONFIGURE_OPTS "--host=s390x-linux-gnu"
diff --git a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile
deleted file mode 100644
index 08af4c68b0f9..000000000000
--- a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile
+++ /dev/null
@@ -1,71 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-# $ lcitool dockerfile --cross mingw32 fedora-rawhide libnbd
-#
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/5fd2cdeb8958df86a81b639fd096f626d0f5dbd0
-
-FROM registry.fedoraproject.org/fedora:rawhide
-
-RUN dnf update -y --nogpgcheck fedora-gpg-keys && \
- dnf install -y nosync && \
- echo -e '#!/bin/sh\n\
-if test -d /usr/lib64\n\
-then\n\
- export LD_PRELOAD=/usr/lib64/nosync/nosync.so\n\
-else\n\
- export LD_PRELOAD=/usr/lib/nosync/nosync.so\n\
-fi\n\
-exec "$@"' > /usr/bin/nosync && \
- chmod +x /usr/bin/nosync && \
- nosync dnf update -y && \
- nosync dnf install -y \
- autoconf \
- automake \
- bash-completion \
- ca-certificates \
- ccache \
- coreutils \
- diffutils \
- git \
- glibc-langpack-en \
- gnutls \
- golang \
- iproute \
- jq \
- libtool \
- make \
- nbd \
- nbdkit \
- ocaml \
- ocaml-findlib \
- perl-base \
- python3-devel \
- python3-flake8 \
- qemu-img \
- qemu-kvm \
- sed && \
- nosync dnf autoremove -y && \
- nosync dnf clean all -y && \
- rpm -qa | sort > /packages.txt && \
- mkdir -p /usr/libexec/ccache-wrappers && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-c++ && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-cc && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-g++ && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-gcc
-
-RUN nosync dnf install -y \
- mingw32-gcc \
- mingw32-gcc-c++ \
- mingw32-glib2 \
- mingw32-gnutls \
- mingw32-headers \
- mingw32-libxml2 \
- mingw32-pkg-config && \
- nosync dnf clean all -y
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
-
-ENV ABI "i686-w64-mingw32"
-ENV CONFIGURE_OPTS "--host=i686-w64-mingw32"
diff --git a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile
deleted file mode 100644
index 67e5305ce1c5..000000000000
--- a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile
+++ /dev/null
@@ -1,71 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-# $ lcitool dockerfile --cross mingw64 fedora-rawhide libnbd
-#
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/5fd2cdeb8958df86a81b639fd096f626d0f5dbd0
-
-FROM registry.fedoraproject.org/fedora:rawhide
-
-RUN dnf update -y --nogpgcheck fedora-gpg-keys && \
- dnf install -y nosync && \
- echo -e '#!/bin/sh\n\
-if test -d /usr/lib64\n\
-then\n\
- export LD_PRELOAD=/usr/lib64/nosync/nosync.so\n\
-else\n\
- export LD_PRELOAD=/usr/lib/nosync/nosync.so\n\
-fi\n\
-exec "$@"' > /usr/bin/nosync && \
- chmod +x /usr/bin/nosync && \
- nosync dnf update -y && \
- nosync dnf install -y \
- autoconf \
- automake \
- bash-completion \
- ca-certificates \
- ccache \
- coreutils \
- diffutils \
- git \
- glibc-langpack-en \
- gnutls \
- golang \
- iproute \
- jq \
- libtool \
- make \
- nbd \
- nbdkit \
- ocaml \
- ocaml-findlib \
- perl-base \
- python3-devel \
- python3-flake8 \
- qemu-img \
- qemu-kvm \
- sed && \
- nosync dnf autoremove -y && \
- nosync dnf clean all -y && \
- rpm -qa | sort > /packages.txt && \
- mkdir -p /usr/libexec/ccache-wrappers && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-c++ && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-cc && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-g++ && \
- ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-gcc
-
-RUN nosync dnf install -y \
- mingw64-gcc \
- mingw64-gcc-c++ \
- mingw64-glib2 \
- mingw64-gnutls \
- mingw64-headers \
- mingw64-libxml2 \
- mingw64-pkg-config && \
- nosync dnf clean all -y
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
-
-ENV ABI "x86_64-w64-mingw32"
-ENV CONFIGURE_OPTS "--host=x86_64-w64-mingw32"
diff --git a/ci/containers/refresh b/ci/containers/refresh
index 327f642ed2ec..7ce5332b940a 100755
--- a/ci/containers/refresh
+++ b/ci/containers/refresh
@@ -18,25 +18,5 @@ HOSTS=$($LCITOOL hosts | grep -Ev 'freebsd|macos')
for host in $HOSTS
do
- case "$host" in
- fedora-rawhide)
- for cross in mingw32 mingw64
- do
- $LCITOOL dockerfile $host libnbd --cross $cross > $host-cross-$cross.Dockerfile
- done
- ;;
- debian-*)
- for cross in aarch64 armv6l armv7l i686 mips mips64el mipsel ppc64le s390x
- do
- if test "$host-cross-$cross" = "debian-9-cross-i686" ||
- test "$host-cross-$cross" = "debian-sid-cross-mips"
- then
- continue
- fi
- $LCITOOL dockerfile $host libnbd --cross $cross > $host-cross-$cross.Dockerfile
- done
- ;;
- esac
-
$LCITOOL dockerfile $host libnbd > $host.Dockerfile
done
--
2.31.1
More information about the Libguestfs
mailing list