ci: Update generated files

Gain native gettext on MinGW, lose glusterfs on 32-bit architectures and rpcgen everywhere. Signed-off-by: Andrea Bolognani <abologna@redhat.com> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
2024-12-22 17:34:18 +03:00 · 2023-11-06 11:32:44 +01:00 · 2023-11-06 11:32:44 +01:00 · 2fd2385d9d
commit 2fd2385d9d
parent ccfda7052d
85 changed files with 9 additions and 91 deletions
--- a/ci/buildenv/almalinux-8.sh
+++ b/ci/buildenv/almalinux-8.sh
@ -75,7 +75,6 @@ function install_buildenv() {
        python3-flake8 \
        qemu-img \
        readline-devel \
-        rpcgen \
        rpm-build \
        sanlock-devel \
        scrub \
--- a/ci/buildenv/alpine-317.sh
+++ b/ci/buildenv/alpine-317.sh
@ -60,7 +60,6 @@ function install_buildenv() {
        python3 \
        qemu-img \
        readline-dev \
-        rpcgen \
        samurai \
        sed \
        util-linux-dev \
--- a/ci/buildenv/alpine-edge.sh
+++ b/ci/buildenv/alpine-edge.sh
@ -60,7 +60,6 @@ function install_buildenv() {
        python3 \
        qemu-img \
        readline-dev \
-        rpcgen \
        samurai \
        sed \
        util-linux-dev \
--- a/ci/buildenv/centos-stream-8.sh
+++ b/ci/buildenv/centos-stream-8.sh
@ -76,7 +76,6 @@ function install_buildenv() {
        python3-flake8 \
        qemu-img \
        readline-devel \
-        rpcgen \
        rpm-build \
        sanlock-devel \
        scrub \
--- a/ci/buildenv/centos-stream-9.sh
+++ b/ci/buildenv/centos-stream-9.sh
@ -72,7 +72,6 @@ function install_buildenv() {
        python3-flake8 \
        qemu-img \
        readline-devel \
-        rpcgen \
        rpm-build \
        sanlock-devel \
        scrub \
--- a/ci/buildenv/debian-11-cross-aarch64.sh
+++ b/ci/buildenv/debian-11-cross-aarch64.sh
@ -26,7 +26,6 @@ function install_buildenv() {
            iproute2 \
            iptables \
            kmod \
-            libc-dev-bin \
            libxml2-utils \
            locales \
            lvm2 \
--- a/ci/buildenv/debian-11-cross-armv6l.sh
+++ b/ci/buildenv/debian-11-cross-armv6l.sh
@ -26,7 +26,6 @@ function install_buildenv() {
            iproute2 \
            iptables \
            kmod \
-            libc-dev-bin \
            libxml2-utils \
            locales \
            lvm2 \
--- a/ci/buildenv/debian-11-cross-armv7l.sh
+++ b/ci/buildenv/debian-11-cross-armv7l.sh
@ -26,7 +26,6 @@ function install_buildenv() {
            iproute2 \
            iptables \
            kmod \
-            libc-dev-bin \
            libxml2-utils \
            locales \
            lvm2 \
--- a/ci/buildenv/debian-11-cross-i686.sh
+++ b/ci/buildenv/debian-11-cross-i686.sh
@ -26,7 +26,6 @@ function install_buildenv() {
            iproute2 \
            iptables \
            kmod \
-            libc-dev-bin \
            libxml2-utils \
            locales \
            lvm2 \
--- a/ci/buildenv/debian-11-cross-mips64el.sh
+++ b/ci/buildenv/debian-11-cross-mips64el.sh
@ -26,7 +26,6 @@ function install_buildenv() {
            iproute2 \
            iptables \
            kmod \
-            libc-dev-bin \
            libxml2-utils \
            locales \
            lvm2 \
--- a/ci/buildenv/debian-11-cross-mipsel.sh
+++ b/ci/buildenv/debian-11-cross-mipsel.sh
@ -26,7 +26,6 @@ function install_buildenv() {
            iproute2 \
            iptables \
            kmod \
-            libc-dev-bin \
            libxml2-utils \
            locales \
            lvm2 \
--- a/ci/buildenv/debian-11-cross-ppc64le.sh
+++ b/ci/buildenv/debian-11-cross-ppc64le.sh
@ -26,7 +26,6 @@ function install_buildenv() {
            iproute2 \
            iptables \
            kmod \
-            libc-dev-bin \
            libxml2-utils \
            locales \
            lvm2 \
--- a/ci/buildenv/debian-11-cross-s390x.sh
+++ b/ci/buildenv/debian-11-cross-s390x.sh
@ -26,7 +26,6 @@ function install_buildenv() {
            iproute2 \
            iptables \
            kmod \
-            libc-dev-bin \
            libxml2-utils \
            locales \
            lvm2 \
--- a/ci/buildenv/debian-11.sh
+++ b/ci/buildenv/debian-11.sh
@ -33,7 +33,6 @@ function install_buildenv() {
            libattr1-dev \
            libaudit-dev \
            libblkid-dev \
-            libc-dev-bin \
            libc6-dev \
            libcap-ng-dev \
            libcurl4-gnutls-dev \
--- a/ci/buildenv/debian-12-cross-aarch64.sh
+++ b/ci/buildenv/debian-12-cross-aarch64.sh
@ -26,7 +26,6 @@ function install_buildenv() {
            iproute2 \
            iptables \
            kmod \
-            libc-dev-bin \
            libnbd-dev \
            libxml2-utils \
            locales \
--- a/ci/buildenv/debian-12-cross-armv6l.sh
+++ b/ci/buildenv/debian-12-cross-armv6l.sh
@ -26,7 +26,6 @@ function install_buildenv() {
            iproute2 \
            iptables \
            kmod \
-            libc-dev-bin \
            libnbd-dev \
            libxml2-utils \
            locales \
--- a/ci/buildenv/debian-12-cross-armv7l.sh
+++ b/ci/buildenv/debian-12-cross-armv7l.sh
@ -26,7 +26,6 @@ function install_buildenv() {
            iproute2 \
            iptables \
            kmod \
-            libc-dev-bin \
            libnbd-dev \
            libxml2-utils \
            locales \
--- a/ci/buildenv/debian-12-cross-i686.sh
+++ b/ci/buildenv/debian-12-cross-i686.sh
@ -26,7 +26,6 @@ function install_buildenv() {
            iproute2 \
            iptables \
            kmod \
-            libc-dev-bin \
            libnbd-dev \
            libxml2-utils \
            locales \
--- a/ci/buildenv/debian-12-cross-mips64el.sh
+++ b/ci/buildenv/debian-12-cross-mips64el.sh
@ -26,7 +26,6 @@ function install_buildenv() {
            iproute2 \
            iptables \
            kmod \
-            libc-dev-bin \
            libnbd-dev \
            libxml2-utils \
            locales \
--- a/ci/buildenv/debian-12-cross-mipsel.sh
+++ b/ci/buildenv/debian-12-cross-mipsel.sh
@ -26,7 +26,6 @@ function install_buildenv() {
            iproute2 \
            iptables \
            kmod \
-            libc-dev-bin \
            libnbd-dev \
            libxml2-utils \
            locales \
--- a/ci/buildenv/debian-12-cross-ppc64le.sh
+++ b/ci/buildenv/debian-12-cross-ppc64le.sh
@ -26,7 +26,6 @@ function install_buildenv() {
            iproute2 \
            iptables \
            kmod \
-            libc-dev-bin \
            libnbd-dev \
            libxml2-utils \
            locales \
--- a/ci/buildenv/debian-12-cross-s390x.sh
+++ b/ci/buildenv/debian-12-cross-s390x.sh
@ -26,7 +26,6 @@ function install_buildenv() {
            iproute2 \
            iptables \
            kmod \
-            libc-dev-bin \
            libnbd-dev \
            libxml2-utils \
            locales \
--- a/ci/buildenv/debian-12.sh
+++ b/ci/buildenv/debian-12.sh
@ -33,7 +33,6 @@ function install_buildenv() {
            libattr1-dev \
            libaudit-dev \
            libblkid-dev \
-            libc-dev-bin \
            libc6-dev \
            libcap-ng-dev \
            libcurl4-gnutls-dev \
--- a/ci/buildenv/debian-sid-cross-aarch64.sh
+++ b/ci/buildenv/debian-sid-cross-aarch64.sh
@ -26,7 +26,6 @@ function install_buildenv() {
            iproute2 \
            iptables \
            kmod \
-            libc-dev-bin \
            libnbd-dev \
            libxml2-utils \
            locales \
--- a/ci/buildenv/debian-sid-cross-armv6l.sh
+++ b/ci/buildenv/debian-sid-cross-armv6l.sh
@ -26,7 +26,6 @@ function install_buildenv() {
            iproute2 \
            iptables \
            kmod \
-            libc-dev-bin \
            libnbd-dev \
            libxml2-utils \
            locales \
@ -66,7 +65,6 @@ function install_buildenv() {
            libdevmapper-dev:armel \
            libfuse-dev:armel \
            libglib2.0-dev:armel \
-            libglusterfs-dev:armel \
            libgnutls28-dev:armel \
            libiscsi-dev:armel \
            libnl-3-dev:armel \
--- a/ci/buildenv/debian-sid-cross-armv7l.sh
+++ b/ci/buildenv/debian-sid-cross-armv7l.sh
@ -26,7 +26,6 @@ function install_buildenv() {
            iproute2 \
            iptables \
            kmod \
-            libc-dev-bin \
            libnbd-dev \
            libxml2-utils \
            locales \
@ -66,7 +65,6 @@ function install_buildenv() {
            libdevmapper-dev:armhf \
            libfuse-dev:armhf \
            libglib2.0-dev:armhf \
-            libglusterfs-dev:armhf \
            libgnutls28-dev:armhf \
            libiscsi-dev:armhf \
            libnl-3-dev:armhf \
--- a/ci/buildenv/debian-sid-cross-i686.sh
+++ b/ci/buildenv/debian-sid-cross-i686.sh
@ -26,7 +26,6 @@ function install_buildenv() {
            iproute2 \
            iptables \
            kmod \
-            libc-dev-bin \
            libnbd-dev \
            libxml2-utils \
            locales \
@ -66,7 +65,6 @@ function install_buildenv() {
            libdevmapper-dev:i386 \
            libfuse-dev:i386 \
            libglib2.0-dev:i386 \
-            libglusterfs-dev:i386 \
            libgnutls28-dev:i386 \
            libiscsi-dev:i386 \
            libnl-3-dev:i386 \
--- a/ci/buildenv/debian-sid-cross-mips64el.sh
+++ b/ci/buildenv/debian-sid-cross-mips64el.sh
@ -26,7 +26,6 @@ function install_buildenv() {
            iproute2 \
            iptables \
            kmod \
-            libc-dev-bin \
            libnbd-dev \
            libxml2-utils \
            locales \
--- a/ci/buildenv/debian-sid-cross-ppc64le.sh
+++ b/ci/buildenv/debian-sid-cross-ppc64le.sh
@ -26,7 +26,6 @@ function install_buildenv() {
            iproute2 \
            iptables \
            kmod \
-            libc-dev-bin \
            libnbd-dev \
            libxml2-utils \
            locales \
--- a/ci/buildenv/debian-sid-cross-s390x.sh
+++ b/ci/buildenv/debian-sid-cross-s390x.sh
@ -26,7 +26,6 @@ function install_buildenv() {
            iproute2 \
            iptables \
            kmod \
-            libc-dev-bin \
            libnbd-dev \
            libxml2-utils \
            locales \
--- a/ci/buildenv/debian-sid.sh
+++ b/ci/buildenv/debian-sid.sh
@ -33,7 +33,6 @@ function install_buildenv() {
            libattr1-dev \
            libaudit-dev \
            libblkid-dev \
-            libc-dev-bin \
            libc6-dev \
            libcap-ng-dev \
            libcurl4-gnutls-dev \
--- a/ci/buildenv/fedora-37.sh
+++ b/ci/buildenv/fedora-37.sh
@ -72,7 +72,6 @@ function install_buildenv() {
        python3-flake8 \
        qemu-img \
        readline-devel \
-        rpcgen \
        rpm-build \
        sanlock-devel \
        scrub \
--- a/ci/buildenv/fedora-38-cross-mingw32.sh
+++ b/ci/buildenv/fedora-38-cross-mingw32.sh
@ -18,6 +18,7 @@ function install_buildenv() {
        dwarves \
        ebtables \
        firewalld-filesystem \
+        gettext \
        git \
        glibc-langpack-en \
        grep \
@ -41,7 +42,6 @@ function install_buildenv() {
        python3-docutils \
        python3-flake8 \
        qemu-img \
-        rpcgen \
        rpm-build \
        scrub \
        sed \
--- a/ci/buildenv/fedora-38-cross-mingw64.sh
+++ b/ci/buildenv/fedora-38-cross-mingw64.sh
@ -18,6 +18,7 @@ function install_buildenv() {
        dwarves \
        ebtables \
        firewalld-filesystem \
+        gettext \
        git \
        glibc-langpack-en \
        grep \
@ -41,7 +42,6 @@ function install_buildenv() {
        python3-docutils \
        python3-flake8 \
        qemu-img \
-        rpcgen \
        rpm-build \
        scrub \
        sed \
--- a/ci/buildenv/fedora-38.sh
+++ b/ci/buildenv/fedora-38.sh
@ -72,7 +72,6 @@ function install_buildenv() {
        python3-flake8 \
        qemu-img \
        readline-devel \
-        rpcgen \
        rpm-build \
        sanlock-devel \
        scrub \
--- a/ci/buildenv/fedora-rawhide-cross-mingw32.sh
+++ b/ci/buildenv/fedora-rawhide-cross-mingw32.sh
@ -19,6 +19,7 @@ function install_buildenv() {
        dwarves \
        ebtables \
        firewalld-filesystem \
+        gettext \
        git \
        glibc-langpack-en \
        grep \
@ -42,7 +43,6 @@ function install_buildenv() {
        python3-docutils \
        python3-flake8 \
        qemu-img \
-        rpcgen \
        rpm-build \
        scrub \
        sed \
--- a/ci/buildenv/fedora-rawhide-cross-mingw64.sh
+++ b/ci/buildenv/fedora-rawhide-cross-mingw64.sh
@ -19,6 +19,7 @@ function install_buildenv() {
        dwarves \
        ebtables \
        firewalld-filesystem \
+        gettext \
        git \
        glibc-langpack-en \
        grep \
@ -42,7 +43,6 @@ function install_buildenv() {
        python3-docutils \
        python3-flake8 \
        qemu-img \
-        rpcgen \
        rpm-build \
        scrub \
        sed \
--- a/ci/buildenv/fedora-rawhide.sh
+++ b/ci/buildenv/fedora-rawhide.sh
@ -73,7 +73,6 @@ function install_buildenv() {
        python3-flake8 \
        qemu-img \
        readline-devel \
-        rpcgen \
        rpm-build \
        sanlock-devel \
        scrub \
--- a/ci/buildenv/opensuse-leap-15.sh
+++ b/ci/buildenv/opensuse-leap-15.sh
@ -74,7 +74,6 @@ function install_buildenv() {
           python3-flake8 \
           qemu-tools \
           readline-devel \
-           rpcgen \
           rpm-build \
           sanlock-devel \
           scrub \
--- a/ci/buildenv/opensuse-tumbleweed.sh
+++ b/ci/buildenv/opensuse-tumbleweed.sh
@ -74,7 +74,6 @@ function install_buildenv() {
           python39-flake8 \
           qemu-tools \
           readline-devel \
-           rpcgen \
           rpm-build \
           sanlock-devel \
           scrub \
--- a/ci/buildenv/ubuntu-2004.sh
+++ b/ci/buildenv/ubuntu-2004.sh
@ -33,7 +33,6 @@ function install_buildenv() {
            libattr1-dev \
            libaudit-dev \
            libblkid-dev \
-            libc-dev-bin \
            libc6-dev \
            libcap-ng-dev \
            libcurl4-gnutls-dev \
--- a/ci/buildenv/ubuntu-2204.sh
+++ b/ci/buildenv/ubuntu-2204.sh
@ -33,7 +33,6 @@ function install_buildenv() {
            libattr1-dev \
            libaudit-dev \
            libblkid-dev \
-            libc-dev-bin \
            libc6-dev \
            libcap-ng-dev \
            libcurl4-gnutls-dev \
--- a/ci/cirrus/macos-12.vars
+++ b/ci/cirrus/macos-12.vars
@ -11,6 +11,6 @@ MAKE='/opt/homebrew/bin/gmake'
 NINJA='/opt/homebrew/bin/ninja'
 PACKAGING_COMMAND='brew'
 PIP3='/opt/homebrew/bin/pip3'
-PKGS='augeas bash-completion ccache codespell cppi curl diffutils docutils flake8 gettext git glib gnu-sed gnutls grep libiscsi libpcap libssh libssh2 libxml2 libxslt make meson ninja perl pkg-config python3 qemu readline rpcgen scrub yajl'
+PKGS='augeas bash-completion ccache codespell cppi curl diffutils docutils flake8 gettext git glib gnu-sed gnutls grep libiscsi libpcap libssh libssh2 libxml2 libxslt make meson ninja perl pkg-config python3 qemu readline scrub yajl'
 PYPI_PKGS=''
 PYTHON='/opt/homebrew/bin/python3'
--- a/ci/containers/almalinux-8.Dockerfile
+++ b/ci/containers/almalinux-8.Dockerfile
@ -76,7 +76,6 @@ RUN dnf update -y && \
        python3-flake8 \
        qemu-img \
        readline-devel \
-        rpcgen \
        rpm-build \
        sanlock-devel \
        scrub \
--- a/ci/containers/alpine-317.Dockerfile
+++ b/ci/containers/alpine-317.Dockerfile
@ -61,7 +61,6 @@ RUN apk update && \
        python3 \
        qemu-img \
        readline-dev \
-        rpcgen \
        samurai \
        sed \
        util-linux-dev \
--- a/ci/containers/alpine-edge.Dockerfile
+++ b/ci/containers/alpine-edge.Dockerfile
@ -61,7 +61,6 @@ RUN apk update && \
        python3 \
        qemu-img \
        readline-dev \
-        rpcgen \
        samurai \
        sed \
        util-linux-dev \
--- a/ci/containers/centos-stream-8.Dockerfile
+++ b/ci/containers/centos-stream-8.Dockerfile
@ -77,7 +77,6 @@ RUN dnf distro-sync -y && \
        python3-flake8 \
        qemu-img \
        readline-devel \
-        rpcgen \
        rpm-build \
        sanlock-devel \
        scrub \
--- a/ci/containers/centos-stream-9.Dockerfile
+++ b/ci/containers/centos-stream-9.Dockerfile
@ -73,7 +73,6 @@ RUN dnf distro-sync -y && \
        python3-flake8 \
        qemu-img \
        readline-devel \
-        rpcgen \
        rpm-build \
        sanlock-devel \
        scrub \
--- a/ci/containers/debian-11-cross-aarch64.Dockerfile
+++ b/ci/containers/debian-11-cross-aarch64.Dockerfile
@ -28,7 +28,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      iproute2 \
                      iptables \
                      kmod \
-                      libc-dev-bin \
                      libxml2-utils \
                      locales \
                      lvm2 \
--- a/ci/containers/debian-11-cross-armv6l.Dockerfile
+++ b/ci/containers/debian-11-cross-armv6l.Dockerfile
@ -28,7 +28,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      iproute2 \
                      iptables \
                      kmod \
-                      libc-dev-bin \
                      libxml2-utils \
                      locales \
                      lvm2 \
--- a/ci/containers/debian-11-cross-armv7l.Dockerfile
+++ b/ci/containers/debian-11-cross-armv7l.Dockerfile
@ -28,7 +28,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      iproute2 \
                      iptables \
                      kmod \
-                      libc-dev-bin \
                      libxml2-utils \
                      locales \
                      lvm2 \
--- a/ci/containers/debian-11-cross-i686.Dockerfile
+++ b/ci/containers/debian-11-cross-i686.Dockerfile
@ -28,7 +28,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      iproute2 \
                      iptables \
                      kmod \
-                      libc-dev-bin \
                      libxml2-utils \
                      locales \
                      lvm2 \
--- a/ci/containers/debian-11-cross-mips64el.Dockerfile
+++ b/ci/containers/debian-11-cross-mips64el.Dockerfile
@ -28,7 +28,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      iproute2 \
                      iptables \
                      kmod \
-                      libc-dev-bin \
                      libxml2-utils \
                      locales \
                      lvm2 \
--- a/ci/containers/debian-11-cross-mipsel.Dockerfile
+++ b/ci/containers/debian-11-cross-mipsel.Dockerfile
@ -28,7 +28,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      iproute2 \
                      iptables \
                      kmod \
-                      libc-dev-bin \
                      libxml2-utils \
                      locales \
                      lvm2 \
--- a/ci/containers/debian-11-cross-ppc64le.Dockerfile
+++ b/ci/containers/debian-11-cross-ppc64le.Dockerfile
@ -28,7 +28,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      iproute2 \
                      iptables \
                      kmod \
-                      libc-dev-bin \
                      libxml2-utils \
                      locales \
                      lvm2 \
--- a/ci/containers/debian-11-cross-s390x.Dockerfile
+++ b/ci/containers/debian-11-cross-s390x.Dockerfile
@ -28,7 +28,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      iproute2 \
                      iptables \
                      kmod \
-                      libc-dev-bin \
                      libxml2-utils \
                      locales \
                      lvm2 \
--- a/ci/containers/debian-11.Dockerfile
+++ b/ci/containers/debian-11.Dockerfile
@ -35,7 +35,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      libattr1-dev \
                      libaudit-dev \
                      libblkid-dev \
-                      libc-dev-bin \
                      libc6-dev \
                      libcap-ng-dev \
                      libcurl4-gnutls-dev \
--- a/ci/containers/debian-12-cross-aarch64.Dockerfile
+++ b/ci/containers/debian-12-cross-aarch64.Dockerfile
@ -28,7 +28,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      iproute2 \
                      iptables \
                      kmod \
-                      libc-dev-bin \
                      libnbd-dev \
                      libxml2-utils \
                      locales \
--- a/ci/containers/debian-12-cross-armv6l.Dockerfile
+++ b/ci/containers/debian-12-cross-armv6l.Dockerfile
@ -28,7 +28,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      iproute2 \
                      iptables \
                      kmod \
-                      libc-dev-bin \
                      libnbd-dev \
                      libxml2-utils \
                      locales \
--- a/ci/containers/debian-12-cross-armv7l.Dockerfile
+++ b/ci/containers/debian-12-cross-armv7l.Dockerfile
@ -28,7 +28,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      iproute2 \
                      iptables \
                      kmod \
-                      libc-dev-bin \
                      libnbd-dev \
                      libxml2-utils \
                      locales \
--- a/ci/containers/debian-12-cross-i686.Dockerfile
+++ b/ci/containers/debian-12-cross-i686.Dockerfile
@ -28,7 +28,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      iproute2 \
                      iptables \
                      kmod \
-                      libc-dev-bin \
                      libnbd-dev \
                      libxml2-utils \
                      locales \
--- a/ci/containers/debian-12-cross-mips64el.Dockerfile
+++ b/ci/containers/debian-12-cross-mips64el.Dockerfile
@ -28,7 +28,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      iproute2 \
                      iptables \
                      kmod \
-                      libc-dev-bin \
                      libnbd-dev \
                      libxml2-utils \
                      locales \
--- a/ci/containers/debian-12-cross-mipsel.Dockerfile
+++ b/ci/containers/debian-12-cross-mipsel.Dockerfile
@ -28,7 +28,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      iproute2 \
                      iptables \
                      kmod \
-                      libc-dev-bin \
                      libnbd-dev \
                      libxml2-utils \
                      locales \
--- a/ci/containers/debian-12-cross-ppc64le.Dockerfile
+++ b/ci/containers/debian-12-cross-ppc64le.Dockerfile
@ -28,7 +28,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      iproute2 \
                      iptables \
                      kmod \
-                      libc-dev-bin \
                      libnbd-dev \
                      libxml2-utils \
                      locales \
--- a/ci/containers/debian-12-cross-s390x.Dockerfile
+++ b/ci/containers/debian-12-cross-s390x.Dockerfile
@ -28,7 +28,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      iproute2 \
                      iptables \
                      kmod \
-                      libc-dev-bin \
                      libnbd-dev \
                      libxml2-utils \
                      locales \
--- a/ci/containers/debian-12.Dockerfile
+++ b/ci/containers/debian-12.Dockerfile
@ -35,7 +35,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      libattr1-dev \
                      libaudit-dev \
                      libblkid-dev \
-                      libc-dev-bin \
                      libc6-dev \
                      libcap-ng-dev \
                      libcurl4-gnutls-dev \
--- a/ci/containers/debian-sid-cross-aarch64.Dockerfile
+++ b/ci/containers/debian-sid-cross-aarch64.Dockerfile
@ -28,7 +28,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      iproute2 \
                      iptables \
                      kmod \
-                      libc-dev-bin \
                      libnbd-dev \
                      libxml2-utils \
                      locales \
--- a/ci/containers/debian-sid-cross-armv6l.Dockerfile
+++ b/ci/containers/debian-sid-cross-armv6l.Dockerfile
@ -28,7 +28,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      iproute2 \
                      iptables \
                      kmod \
-                      libc-dev-bin \
                      libnbd-dev \
                      libxml2-utils \
                      locales \
@ -77,7 +76,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      libdevmapper-dev:armel \
                      libfuse-dev:armel \
                      libglib2.0-dev:armel \
-                      libglusterfs-dev:armel \
                      libgnutls28-dev:armel \
                      libiscsi-dev:armel \
                      libnl-3-dev:armel \
--- a/ci/containers/debian-sid-cross-armv7l.Dockerfile
+++ b/ci/containers/debian-sid-cross-armv7l.Dockerfile
@ -28,7 +28,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      iproute2 \
                      iptables \
                      kmod \
-                      libc-dev-bin \
                      libnbd-dev \
                      libxml2-utils \
                      locales \
@ -77,7 +76,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      libdevmapper-dev:armhf \
                      libfuse-dev:armhf \
                      libglib2.0-dev:armhf \
-                      libglusterfs-dev:armhf \
                      libgnutls28-dev:armhf \
                      libiscsi-dev:armhf \
                      libnl-3-dev:armhf \
--- a/ci/containers/debian-sid-cross-i686.Dockerfile
+++ b/ci/containers/debian-sid-cross-i686.Dockerfile
@ -28,7 +28,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      iproute2 \
                      iptables \
                      kmod \
-                      libc-dev-bin \
                      libnbd-dev \
                      libxml2-utils \
                      locales \
@ -77,7 +76,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      libdevmapper-dev:i386 \
                      libfuse-dev:i386 \
                      libglib2.0-dev:i386 \
-                      libglusterfs-dev:i386 \
                      libgnutls28-dev:i386 \
                      libiscsi-dev:i386 \
                      libnl-3-dev:i386 \
--- a/ci/containers/debian-sid-cross-mips64el.Dockerfile
+++ b/ci/containers/debian-sid-cross-mips64el.Dockerfile
@ -28,7 +28,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      iproute2 \
                      iptables \
                      kmod \
-                      libc-dev-bin \
                      libnbd-dev \
                      libxml2-utils \
                      locales \
--- a/ci/containers/debian-sid-cross-ppc64le.Dockerfile
+++ b/ci/containers/debian-sid-cross-ppc64le.Dockerfile
@ -28,7 +28,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      iproute2 \
                      iptables \
                      kmod \
-                      libc-dev-bin \
                      libnbd-dev \
                      libxml2-utils \
                      locales \
--- a/ci/containers/debian-sid-cross-s390x.Dockerfile
+++ b/ci/containers/debian-sid-cross-s390x.Dockerfile
@ -28,7 +28,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      iproute2 \
                      iptables \
                      kmod \
-                      libc-dev-bin \
                      libnbd-dev \
                      libxml2-utils \
                      locales \
--- a/ci/containers/debian-sid.Dockerfile
+++ b/ci/containers/debian-sid.Dockerfile
@ -35,7 +35,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      libattr1-dev \
                      libaudit-dev \
                      libblkid-dev \
-                      libc-dev-bin \
                      libc6-dev \
                      libcap-ng-dev \
                      libcurl4-gnutls-dev \
--- a/ci/containers/fedora-37.Dockerfile
+++ b/ci/containers/fedora-37.Dockerfile
@ -83,7 +83,6 @@ exec "$@"\n' > /usr/bin/nosync && \
               python3-flake8 \
               qemu-img \
               readline-devel \
-               rpcgen \
               rpm-build \
               sanlock-devel \
               scrub \
--- a/ci/containers/fedora-38-cross-mingw32.Dockerfile
+++ b/ci/containers/fedora-38-cross-mingw32.Dockerfile
@ -29,6 +29,7 @@ exec "$@"\n' > /usr/bin/nosync && \
               dwarves \
               ebtables \
               firewalld-filesystem \
+               gettext \
               git \
               glibc-langpack-en \
               grep \
@ -52,7 +53,6 @@ exec "$@"\n' > /usr/bin/nosync && \
               python3-docutils \
               python3-flake8 \
               qemu-img \
-               rpcgen \
               rpm-build \
               scrub \
               sed \
--- a/ci/containers/fedora-38-cross-mingw64.Dockerfile
+++ b/ci/containers/fedora-38-cross-mingw64.Dockerfile
@ -29,6 +29,7 @@ exec "$@"\n' > /usr/bin/nosync && \
               dwarves \
               ebtables \
               firewalld-filesystem \
+               gettext \
               git \
               glibc-langpack-en \
               grep \
@ -52,7 +53,6 @@ exec "$@"\n' > /usr/bin/nosync && \
               python3-docutils \
               python3-flake8 \
               qemu-img \
-               rpcgen \
               rpm-build \
               scrub \
               sed \
--- a/ci/containers/fedora-38.Dockerfile
+++ b/ci/containers/fedora-38.Dockerfile
@ -83,7 +83,6 @@ exec "$@"\n' > /usr/bin/nosync && \
               python3-flake8 \
               qemu-img \
               readline-devel \
-               rpcgen \
               rpm-build \
               sanlock-devel \
               scrub \
--- a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile
+++ b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile
@ -30,6 +30,7 @@ exec "$@"\n' > /usr/bin/nosync && \
               dwarves \
               ebtables \
               firewalld-filesystem \
+               gettext \
               git \
               glibc-langpack-en \
               grep \
@ -53,7 +54,6 @@ exec "$@"\n' > /usr/bin/nosync && \
               python3-docutils \
               python3-flake8 \
               qemu-img \
-               rpcgen \
               rpm-build \
               scrub \
               sed \
--- a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile
+++ b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile
@ -30,6 +30,7 @@ exec "$@"\n' > /usr/bin/nosync && \
               dwarves \
               ebtables \
               firewalld-filesystem \
+               gettext \
               git \
               glibc-langpack-en \
               grep \
@ -53,7 +54,6 @@ exec "$@"\n' > /usr/bin/nosync && \
               python3-docutils \
               python3-flake8 \
               qemu-img \
-               rpcgen \
               rpm-build \
               scrub \
               sed \
--- a/ci/containers/fedora-rawhide.Dockerfile
+++ b/ci/containers/fedora-rawhide.Dockerfile
@ -84,7 +84,6 @@ exec "$@"\n' > /usr/bin/nosync && \
               python3-flake8 \
               qemu-img \
               readline-devel \
-               rpcgen \
               rpm-build \
               sanlock-devel \
               scrub \
--- a/ci/containers/opensuse-leap-15.Dockerfile
+++ b/ci/containers/opensuse-leap-15.Dockerfile
@ -75,7 +75,6 @@ RUN zypper update -y && \
           python3-flake8 \
           qemu-tools \
           readline-devel \
-           rpcgen \
           rpm-build \
           sanlock-devel \
           scrub \
--- a/ci/containers/opensuse-tumbleweed.Dockerfile
+++ b/ci/containers/opensuse-tumbleweed.Dockerfile
@ -75,7 +75,6 @@ RUN zypper dist-upgrade -y && \
           python39-flake8 \
           qemu-tools \
           readline-devel \
-           rpcgen \
           rpm-build \
           sanlock-devel \
           scrub \
--- a/ci/containers/ubuntu-2004.Dockerfile
+++ b/ci/containers/ubuntu-2004.Dockerfile
@ -35,7 +35,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      libattr1-dev \
                      libaudit-dev \
                      libblkid-dev \
-                      libc-dev-bin \
                      libc6-dev \
                      libcap-ng-dev \
                      libcurl4-gnutls-dev \
--- a/ci/containers/ubuntu-2204.Dockerfile
+++ b/ci/containers/ubuntu-2204.Dockerfile
@ -35,7 +35,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
                      libattr1-dev \
                      libaudit-dev \
                      libblkid-dev \
-                      libc-dev-bin \
                      libc6-dev \
                      libcap-ng-dev \
                      libcurl4-gnutls-dev \