In this batch: - dnsmasq is dropped as build dependency - Alpine Edge rpcgen package collision fix Signed-off-by: Erik Skultety <eskultet(a)redhat.com&gt; --- corresponding pipeline: https://gitlab.com/eskultety/libvirt/-/pipelines/510287873 ci/cirrus/freebsd-12.vars | 2 +- ci/cirrus/freebsd-13.vars | 2 +- ci/cirrus/freebsd-current.vars | 2 +- ci/cirrus/macos-11.vars | 2 +- ci/containers/almalinux-8.Dockerfile | 1 - ci/containers/alpine-314.Dockerfile | 1 - ci/containers/alpine-edge.Dockerfile | 2 +- ci/containers/centos-stream-8.Dockerfile | 3 +-- ci/containers/centos-stream-9.Dockerfile | 3 +-- ci/containers/debian-10-cross-aarch64.Dockerfile | 1 - ci/containers/debian-10-cross-armv6l.Dockerfile | 1 - ci/containers/debian-10-cross-armv7l.Dockerfile | 1 - ci/containers/debian-10-cross-i686.Dockerfile | 1 - ci/containers/debian-10-cross-mips.Dockerfile | 1 - ci/containers/debian-10-cross-mips64el.Dockerfile | 1 - ci/containers/debian-10-cross-mipsel.Dockerfile | 1 - ci/containers/debian-10-cross-ppc64le.Dockerfile | 1 - ci/containers/debian-10-cross-s390x.Dockerfile | 1 - ci/containers/debian-10.Dockerfile | 1 - ci/containers/debian-11-cross-aarch64.Dockerfile | 1 - ci/containers/debian-11-cross-armv6l.Dockerfile | 1 - ci/containers/debian-11-cross-armv7l.Dockerfile | 1 - ci/containers/debian-11-cross-i686.Dockerfile | 1 - ci/containers/debian-11-cross-mips64el.Dockerfile | 1 - ci/containers/debian-11-cross-mipsel.Dockerfile | 1 - ci/containers/debian-11-cross-ppc64le.Dockerfile | 1 - ci/containers/debian-11-cross-s390x.Dockerfile | 1 - ci/containers/debian-11.Dockerfile | 1 - ci/containers/debian-sid-cross-aarch64.Dockerfile | 1 - ci/containers/debian-sid-cross-armv6l.Dockerfile | 1 - ci/containers/debian-sid-cross-armv7l.Dockerfile | 1 - ci/containers/debian-sid-cross-i686.Dockerfile | 1 - ci/containers/debian-sid-cross-mips64el.Dockerfile | 1 - ci/containers/debian-sid-cross-mipsel.Dockerfile | 1 - ci/containers/debian-sid-cross-ppc64le.Dockerfile | 1 - ci/containers/debian-sid-cross-s390x.Dockerfile | 1 - ci/containers/debian-sid.Dockerfile | 1 - ci/containers/fedora-34.Dockerfile | 1 - ci/containers/fedora-35-cross-mingw32.Dockerfile | 1 - ci/containers/fedora-35-cross-mingw64.Dockerfile | 1 - ci/containers/fedora-35.Dockerfile | 1 - ci/containers/fedora-rawhide-cross-mingw32.Dockerfile | 1 - ci/containers/fedora-rawhide-cross-mingw64.Dockerfile | 1 - ci/containers/fedora-rawhide.Dockerfile | 1 - ci/containers/opensuse-leap-152.Dockerfile | 1 - ci/containers/opensuse-tumbleweed.Dockerfile | 1 - ci/containers/ubuntu-2004.Dockerfile | 1 - 47 files changed, 7 insertions(+), 49 deletions(-) diff --git a/ci/cirrus/freebsd-12.vars b/ci/cirrus/freebsd-12.vars index 480a403361..e8b06b32e1 100644 --- a/ci/cirrus/freebsd-12.vars +++ b/ci/cirrus/freebsd-12.vars @@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PACKAGING_COMMAND='pkg' PIP3='/usr/local/bin/pip-3.8' -PKGS='augeas bash-completion ca_root_nss ccache codespell cppi curl cyrus-sasl diffutils diskscrub dnsmasq fusefs-libs gettext git glib gmake gnugrep gnutls gsed libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py38-docutils py38-flake8 python3 qemu readline yajl' +PKGS='augeas bash-completion ca_root_nss ccache codespell cppi curl cyrus-sasl diffutils diskscrub fusefs-libs gettext git glib gmake gnugrep gnutls gsed libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py38-docutils py38-flake8 python3 qemu readline yajl' PYPI_PKGS='' PYTHON='/usr/local/bin/python3' diff --git a/ci/cirrus/freebsd-13.vars b/ci/cirrus/freebsd-13.vars index 480a403361..e8b06b32e1 100644 --- a/ci/cirrus/freebsd-13.vars +++ b/ci/cirrus/freebsd-13.vars @@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PACKAGING_COMMAND='pkg' PIP3='/usr/local/bin/pip-3.8' -PKGS='augeas bash-completion ca_root_nss ccache codespell cppi curl cyrus-sasl diffutils diskscrub dnsmasq fusefs-libs gettext git glib gmake gnugrep gnutls gsed libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py38-docutils py38-flake8 python3 qemu readline yajl' +PKGS='augeas bash-completion ca_root_nss ccache codespell cppi curl cyrus-sasl diffutils diskscrub fusefs-libs gettext git glib gmake gnugrep gnutls gsed libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py38-docutils py38-flake8 python3 qemu readline yajl' PYPI_PKGS='' PYTHON='/usr/local/bin/python3' diff --git a/ci/cirrus/freebsd-current.vars b/ci/cirrus/freebsd-current.vars index 480a403361..e8b06b32e1 100644 --- a/ci/cirrus/freebsd-current.vars +++ b/ci/cirrus/freebsd-current.vars @@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PACKAGING_COMMAND='pkg' PIP3='/usr/local/bin/pip-3.8' -PKGS='augeas bash-completion ca_root_nss ccache codespell cppi curl cyrus-sasl diffutils diskscrub dnsmasq fusefs-libs gettext git glib gmake gnugrep gnutls gsed libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py38-docutils py38-flake8 python3 qemu readline yajl' +PKGS='augeas bash-completion ca_root_nss ccache codespell cppi curl cyrus-sasl diffutils diskscrub fusefs-libs gettext git glib gmake gnugrep gnutls gsed libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py38-docutils py38-flake8 python3 qemu readline yajl' PYPI_PKGS='' PYTHON='/usr/local/bin/python3' diff --git a/ci/cirrus/macos-11.vars b/ci/cirrus/macos-11.vars index eb6d6db18f..a5afb4eb4d 100644 --- a/ci/cirrus/macos-11.vars +++ b/ci/cirrus/macos-11.vars @@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PACKAGING_COMMAND='brew' PIP3='/usr/local/bin/pip3' -PKGS='augeas bash-completion ccache codespell cppi curl diffutils dnsmasq 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 rpcgen scrub yajl' PYPI_PKGS='' PYTHON='/usr/local/bin/python3' diff --git a/ci/containers/almalinux-8.Dockerfile b/ci/containers/almalinux-8.Dockerfile index 55ce0908a3..1b55e9f66f 100644 --- a/ci/containers/almalinux-8.Dockerfile +++ b/ci/containers/almalinux-8.Dockerfile @@ -22,7 +22,6 @@ RUN dnf update -y && \ cyrus-sasl-devel \ device-mapper-devel \ diffutils \ - dnsmasq \ dwarves \ ebtables \ firewalld-filesystem \ diff --git a/ci/containers/alpine-314.Dockerfile b/ci/containers/alpine-314.Dockerfile index 4ca35a949b..1cd3fc6b0c 100644 --- a/ci/containers/alpine-314.Dockerfile +++ b/ci/containers/alpine-314.Dockerfile @@ -21,7 +21,6 @@ RUN apk update && \ curl-dev \ cyrus-sasl-dev \ diffutils \ - dnsmasq \ eudev-dev \ fuse-dev \ gcc \ diff --git a/ci/containers/alpine-edge.Dockerfile b/ci/containers/alpine-edge.Dockerfile index d171ed1be7..76e85b4386 100644 --- a/ci/containers/alpine-edge.Dockerfile +++ b/ci/containers/alpine-edge.Dockerfile @@ -21,7 +21,6 @@ RUN apk update && \ curl-dev \ cyrus-sasl-dev \ diffutils \ - dnsmasq \ eudev-dev \ fuse-dev \ gcc \ @@ -62,6 +61,7 @@ RUN apk update && \ python3 \ qemu-img \ readline-dev \ + rpcgen \ samurai \ sed \ util-linux-dev \ diff --git a/ci/containers/centos-stream-8.Dockerfile b/ci/containers/centos-stream-8.Dockerfile index 2496c5b0bb..82cbd7cde7 100644 --- a/ci/containers/centos-stream-8.Dockerfile +++ b/ci/containers/centos-stream-8.Dockerfile @@ -6,7 +6,7 @@ FROM quay.io/centos/centos:stream8 -RUN dnf update -y && \ +RUN dnf distro-sync -y && \ dnf install 'dnf-command(config-manager)' -y && \ dnf config-manager --set-enabled -y powertools && \ dnf install -y centos-release-advanced-virtualization && \ @@ -22,7 +22,6 @@ RUN dnf update -y && \ cyrus-sasl-devel \ device-mapper-devel \ diffutils \ - dnsmasq \ dwarves \ ebtables \ firewalld-filesystem \ diff --git a/ci/containers/centos-stream-9.Dockerfile b/ci/containers/centos-stream-9.Dockerfile index d20602b847..34ff3a06eb 100644 --- a/ci/containers/centos-stream-9.Dockerfile +++ b/ci/containers/centos-stream-9.Dockerfile @@ -6,7 +6,7 @@ FROM quay.io/centos/centos:stream9 -RUN dnf update -y && \ +RUN dnf distro-sync -y && \ dnf install 'dnf-command(config-manager)' -y && \ dnf config-manager --set-enabled -y crb && \ dnf install -y \ @@ -22,7 +22,6 @@ RUN dnf update -y && \ cyrus-sasl-devel \ device-mapper-devel \ diffutils \ - dnsmasq \ dwarves \ ebtables \ firewalld-filesystem \ diff --git a/ci/containers/debian-10-cross-aarch64.Dockerfile b/ci/containers/debian-10-cross-aarch64.Dockerfile index ca6b36b439..f4054490df 100644 --- a/ci/containers/debian-10-cross-aarch64.Dockerfile +++ b/ci/containers/debian-10-cross-aarch64.Dockerfile @@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ codespell \ cpp \ diffutils \ - dnsmasq-base \ dwarves \ ebtables \ flake8 \ diff --git a/ci/containers/debian-10-cross-armv6l.Dockerfile b/ci/containers/debian-10-cross-armv6l.Dockerfile index 6818d6c409..96a6fa94aa 100644 --- a/ci/containers/debian-10-cross-armv6l.Dockerfile +++ b/ci/containers/debian-10-cross-armv6l.Dockerfile @@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ codespell \ cpp \ diffutils \ - dnsmasq-base \ dwarves \ ebtables \ flake8 \ diff --git a/ci/containers/debian-10-cross-armv7l.Dockerfile b/ci/containers/debian-10-cross-armv7l.Dockerfile index 726d5d5846..d3c221e87a 100644 --- a/ci/containers/debian-10-cross-armv7l.Dockerfile +++ b/ci/containers/debian-10-cross-armv7l.Dockerfile @@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ codespell \ cpp \ diffutils \ - dnsmasq-base \ dwarves \ ebtables \ flake8 \ diff --git a/ci/containers/debian-10-cross-i686.Dockerfile b/ci/containers/debian-10-cross-i686.Dockerfile index 16e29e00c9..37f4962286 100644 --- a/ci/containers/debian-10-cross-i686.Dockerfile +++ b/ci/containers/debian-10-cross-i686.Dockerfile @@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ codespell \ cpp \ diffutils \ - dnsmasq-base \ dwarves \ ebtables \ flake8 \ diff --git a/ci/containers/debian-10-cross-mips.Dockerfile b/ci/containers/debian-10-cross-mips.Dockerfile index d5cabb47c4..7c8847260f 100644 --- a/ci/containers/debian-10-cross-mips.Dockerfile +++ b/ci/containers/debian-10-cross-mips.Dockerfile @@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ codespell \ cpp \ diffutils \ - dnsmasq-base \ dwarves \ ebtables \ flake8 \ diff --git a/ci/containers/debian-10-cross-mips64el.Dockerfile b/ci/containers/debian-10-cross-mips64el.Dockerfile index ff63c2b5da..0cc7bc7034 100644 --- a/ci/containers/debian-10-cross-mips64el.Dockerfile +++ b/ci/containers/debian-10-cross-mips64el.Dockerfile @@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ codespell \ cpp \ diffutils \ - dnsmasq-base \ dwarves \ ebtables \ flake8 \ diff --git a/ci/containers/debian-10-cross-mipsel.Dockerfile b/ci/containers/debian-10-cross-mipsel.Dockerfile index 93b68bd10e..ae3fd260ea 100644 --- a/ci/containers/debian-10-cross-mipsel.Dockerfile +++ b/ci/containers/debian-10-cross-mipsel.Dockerfile @@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ codespell \ cpp \ diffutils \ - dnsmasq-base \ dwarves \ ebtables \ flake8 \ diff --git a/ci/containers/debian-10-cross-ppc64le.Dockerfile b/ci/containers/debian-10-cross-ppc64le.Dockerfile index 5577056754..7cd3a3a419 100644 --- a/ci/containers/debian-10-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-10-cross-ppc64le.Dockerfile @@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ codespell \ cpp \ diffutils \ - dnsmasq-base \ dwarves \ ebtables \ flake8 \ diff --git a/ci/containers/debian-10-cross-s390x.Dockerfile b/ci/containers/debian-10-cross-s390x.Dockerfile index 886d532927..589a5b1d9c 100644 --- a/ci/containers/debian-10-cross-s390x.Dockerfile +++ b/ci/containers/debian-10-cross-s390x.Dockerfile @@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ codespell \ cpp \ diffutils \ - dnsmasq-base \ dwarves \ ebtables \ flake8 \ diff --git a/ci/containers/debian-10.Dockerfile b/ci/containers/debian-10.Dockerfile index 63d070cb37..41691c708f 100644 --- a/ci/containers/debian-10.Dockerfile +++ b/ci/containers/debian-10.Dockerfile @@ -20,7 +20,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ codespell \ cpp \ diffutils \ - dnsmasq-base \ dwarves \ ebtables \ flake8 \ diff --git a/ci/containers/debian-11-cross-aarch64.Dockerfile b/ci/containers/debian-11-cross-aarch64.Dockerfile index d57a7c0e6e..778eed4be1 100644 --- a/ci/containers/debian-11-cross-aarch64.Dockerfile +++ b/ci/containers/debian-11-cross-aarch64.Dockerfile @@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ codespell \ cpp \ diffutils \ - dnsmasq-base \ dwarves \ ebtables \ flake8 \ diff --git a/ci/containers/debian-11-cross-armv6l.Dockerfile b/ci/containers/debian-11-cross-armv6l.Dockerfile index cead78f3ca..6c13a93b95 100644 --- a/ci/containers/debian-11-cross-armv6l.Dockerfile +++ b/ci/containers/debian-11-cross-armv6l.Dockerfile @@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ codespell \ cpp \ diffutils \ - dnsmasq-base \ dwarves \ ebtables \ flake8 \ diff --git a/ci/containers/debian-11-cross-armv7l.Dockerfile b/ci/containers/debian-11-cross-armv7l.Dockerfile index bb3ce1c70c..66f95d5cd8 100644 --- a/ci/containers/debian-11-cross-armv7l.Dockerfile +++ b/ci/containers/debian-11-cross-armv7l.Dockerfile @@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ codespell \ cpp \ diffutils \ - dnsmasq-base \ dwarves \ ebtables \ flake8 \ diff --git a/ci/containers/debian-11-cross-i686.Dockerfile b/ci/containers/debian-11-cross-i686.Dockerfile index a3408eb6fe..a12e703f42 100644 --- a/ci/containers/debian-11-cross-i686.Dockerfile +++ b/ci/containers/debian-11-cross-i686.Dockerfile @@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ codespell \ cpp \ diffutils \ - dnsmasq-base \ dwarves \ ebtables \ flake8 \ diff --git a/ci/containers/debian-11-cross-mips64el.Dockerfile b/ci/containers/debian-11-cross-mips64el.Dockerfile index cf28516bb9..9c880ba1f1 100644 --- a/ci/containers/debian-11-cross-mips64el.Dockerfile +++ b/ci/containers/debian-11-cross-mips64el.Dockerfile @@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ codespell \ cpp \ diffutils \ - dnsmasq-base \ dwarves \ ebtables \ flake8 \ diff --git a/ci/containers/debian-11-cross-mipsel.Dockerfile b/ci/containers/debian-11-cross-mipsel.Dockerfile index 535e8a53f1..b4d2b53f27 100644 --- a/ci/containers/debian-11-cross-mipsel.Dockerfile +++ b/ci/containers/debian-11-cross-mipsel.Dockerfile @@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ codespell \ cpp \ diffutils \ - dnsmasq-base \ dwarves \ ebtables \ flake8 \ diff --git a/ci/containers/debian-11-cross-ppc64le.Dockerfile b/ci/containers/debian-11-cross-ppc64le.Dockerfile index 147a45c837..bd2d62b0bb 100644 --- a/ci/containers/debian-11-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-11-cross-ppc64le.Dockerfile @@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ codespell \ cpp \ diffutils \ - dnsmasq-base \ dwarves \ ebtables \ flake8 \ diff --git a/ci/containers/debian-11-cross-s390x.Dockerfile b/ci/containers/debian-11-cross-s390x.Dockerfile index d3e879b084..aa73a79210 100644 --- a/ci/containers/debian-11-cross-s390x.Dockerfile +++ b/ci/containers/debian-11-cross-s390x.Dockerfile @@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ codespell \ cpp \ diffutils \ - dnsmasq-base \ dwarves \ ebtables \ flake8 \ diff --git a/ci/containers/debian-11.Dockerfile b/ci/containers/debian-11.Dockerfile index 102973de0b..2609c83928 100644 --- a/ci/containers/debian-11.Dockerfile +++ b/ci/containers/debian-11.Dockerfile @@ -20,7 +20,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ codespell \ cpp \ diffutils \ - dnsmasq-base \ dwarves \ ebtables \ flake8 \ diff --git a/ci/containers/debian-sid-cross-aarch64.Dockerfile b/ci/containers/debian-sid-cross-aarch64.Dockerfile index 96f3651e54..7e4e5d0b7c 100644 --- a/ci/containers/debian-sid-cross-aarch64.Dockerfile +++ b/ci/containers/debian-sid-cross-aarch64.Dockerfile @@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ codespell \ cpp \ diffutils \ - dnsmasq-base \ dwarves \ ebtables \ flake8 \ diff --git a/ci/containers/debian-sid-cross-armv6l.Dockerfile b/ci/containers/debian-sid-cross-armv6l.Dockerfile index 332e0d6570..c64bf14f67 100644 --- a/ci/containers/debian-sid-cross-armv6l.Dockerfile +++ b/ci/containers/debian-sid-cross-armv6l.Dockerfile @@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ codespell \ cpp \ diffutils \ - dnsmasq-base \ dwarves \ ebtables \ flake8 \ diff --git a/ci/containers/debian-sid-cross-armv7l.Dockerfile b/ci/containers/debian-sid-cross-armv7l.Dockerfile index 1372fe954d..81604816f7 100644 --- a/ci/containers/debian-sid-cross-armv7l.Dockerfile +++ b/ci/containers/debian-sid-cross-armv7l.Dockerfile @@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ codespell \ cpp \ diffutils \ - dnsmasq-base \ dwarves \ ebtables \ flake8 \ diff --git a/ci/containers/debian-sid-cross-i686.Dockerfile b/ci/containers/debian-sid-cross-i686.Dockerfile index 9557986f1b..4f0f1a992a 100644 --- a/ci/containers/debian-sid-cross-i686.Dockerfile +++ b/ci/containers/debian-sid-cross-i686.Dockerfile @@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ codespell \ cpp \ diffutils \ - dnsmasq-base \ dwarves \ ebtables \ flake8 \ diff --git a/ci/containers/debian-sid-cross-mips64el.Dockerfile b/ci/containers/debian-sid-cross-mips64el.Dockerfile index 0738f5bdad..c6186a2454 100644 --- a/ci/containers/debian-sid-cross-mips64el.Dockerfile +++ b/ci/containers/debian-sid-cross-mips64el.Dockerfile @@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ codespell \ cpp \ diffutils \ - dnsmasq-base \ dwarves \ ebtables \ flake8 \ diff --git a/ci/containers/debian-sid-cross-mipsel.Dockerfile b/ci/containers/debian-sid-cross-mipsel.Dockerfile index 8fabe91bfd..eece32d2da 100644 --- a/ci/containers/debian-sid-cross-mipsel.Dockerfile +++ b/ci/containers/debian-sid-cross-mipsel.Dockerfile @@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ codespell \ cpp \ diffutils \ - dnsmasq-base \ dwarves \ ebtables \ flake8 \ diff --git a/ci/containers/debian-sid-cross-ppc64le.Dockerfile b/ci/containers/debian-sid-cross-ppc64le.Dockerfile index 4b71bba63c..1605ca2771 100644 --- a/ci/containers/debian-sid-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-sid-cross-ppc64le.Dockerfile @@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ codespell \ cpp \ diffutils \ - dnsmasq-base \ dwarves \ ebtables \ flake8 \ diff --git a/ci/containers/debian-sid-cross-s390x.Dockerfile b/ci/containers/debian-sid-cross-s390x.Dockerfile index 68f35fc72d..7b5a6b4b79 100644 --- a/ci/containers/debian-sid-cross-s390x.Dockerfile +++ b/ci/containers/debian-sid-cross-s390x.Dockerfile @@ -19,7 +19,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ codespell \ cpp \ diffutils \ - dnsmasq-base \ dwarves \ ebtables \ flake8 \ diff --git a/ci/containers/debian-sid.Dockerfile b/ci/containers/debian-sid.Dockerfile index 0cabbcea66..52f1724415 100644 --- a/ci/containers/debian-sid.Dockerfile +++ b/ci/containers/debian-sid.Dockerfile @@ -20,7 +20,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ codespell \ cpp \ diffutils \ - dnsmasq-base \ dwarves \ ebtables \ flake8 \ diff --git a/ci/containers/fedora-34.Dockerfile b/ci/containers/fedora-34.Dockerfile index 9153ec2ca1..6949231a62 100644 --- a/ci/containers/fedora-34.Dockerfile +++ b/ci/containers/fedora-34.Dockerfile @@ -30,7 +30,6 @@ exec "$@"' > /usr/bin/nosync && \ cyrus-sasl-devel \ device-mapper-devel \ diffutils \ - dnsmasq \ dwarves \ ebtables \ firewalld-filesystem \ diff --git a/ci/containers/fedora-35-cross-mingw32.Dockerfile b/ci/containers/fedora-35-cross-mingw32.Dockerfile index 0181237702..3cc5e7b59b 100644 --- a/ci/containers/fedora-35-cross-mingw32.Dockerfile +++ b/ci/containers/fedora-35-cross-mingw32.Dockerfile @@ -26,7 +26,6 @@ exec "$@"' > /usr/bin/nosync && \ cpp \ cppi \ diffutils \ - dnsmasq \ dwarves \ ebtables \ firewalld-filesystem \ diff --git a/ci/containers/fedora-35-cross-mingw64.Dockerfile b/ci/containers/fedora-35-cross-mingw64.Dockerfile index 889f32bbfc..b6662f6da7 100644 --- a/ci/containers/fedora-35-cross-mingw64.Dockerfile +++ b/ci/containers/fedora-35-cross-mingw64.Dockerfile @@ -26,7 +26,6 @@ exec "$@"' > /usr/bin/nosync && \ cpp \ cppi \ diffutils \ - dnsmasq \ dwarves \ ebtables \ firewalld-filesystem \ diff --git a/ci/containers/fedora-35.Dockerfile b/ci/containers/fedora-35.Dockerfile index 48d22cb056..117b2736c3 100644 --- a/ci/containers/fedora-35.Dockerfile +++ b/ci/containers/fedora-35.Dockerfile @@ -30,7 +30,6 @@ exec "$@"' > /usr/bin/nosync && \ cyrus-sasl-devel \ device-mapper-devel \ diffutils \ - dnsmasq \ dwarves \ ebtables \ firewalld-filesystem \ diff --git a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile index 3e474578f0..5c4a124e33 100644 --- a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile +++ b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile @@ -27,7 +27,6 @@ exec "$@"' > /usr/bin/nosync && \ cpp \ cppi \ diffutils \ - dnsmasq \ dwarves \ ebtables \ firewalld-filesystem \ diff --git a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile index a27fb5af4e..7e626a8230 100644 --- a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile +++ b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile @@ -27,7 +27,6 @@ exec "$@"' > /usr/bin/nosync && \ cpp \ cppi \ diffutils \ - dnsmasq \ dwarves \ ebtables \ firewalld-filesystem \ diff --git a/ci/containers/fedora-rawhide.Dockerfile b/ci/containers/fedora-rawhide.Dockerfile index 9615f22230..beca9062f5 100644 --- a/ci/containers/fedora-rawhide.Dockerfile +++ b/ci/containers/fedora-rawhide.Dockerfile @@ -31,7 +31,6 @@ exec "$@"' > /usr/bin/nosync && \ cyrus-sasl-devel \ device-mapper-devel \ diffutils \ - dnsmasq \ dwarves \ ebtables \ firewalld-filesystem \ diff --git a/ci/containers/opensuse-leap-152.Dockerfile b/ci/containers/opensuse-leap-152.Dockerfile index 864dfa4fa7..19161f60cf 100644 --- a/ci/containers/opensuse-leap-152.Dockerfile +++ b/ci/containers/opensuse-leap-152.Dockerfile @@ -21,7 +21,6 @@ RUN zypper update -y && \ cyrus-sasl-devel \ device-mapper-devel \ diffutils \ - dnsmasq \ dwarves \ ebtables \ fuse-devel \ diff --git a/ci/containers/opensuse-tumbleweed.Dockerfile b/ci/containers/opensuse-tumbleweed.Dockerfile index 8f249ccb61..72824c5505 100644 --- a/ci/containers/opensuse-tumbleweed.Dockerfile +++ b/ci/containers/opensuse-tumbleweed.Dockerfile @@ -21,7 +21,6 @@ RUN zypper dist-upgrade -y && \ cyrus-sasl-devel \ device-mapper-devel \ diffutils \ - dnsmasq \ dwarves \ ebtables \ fuse-devel \ diff --git a/ci/containers/ubuntu-2004.Dockerfile b/ci/containers/ubuntu-2004.Dockerfile index b6b10f2cbe..81115ab338 100644 --- a/ci/containers/ubuntu-2004.Dockerfile +++ b/ci/containers/ubuntu-2004.Dockerfile @@ -20,7 +20,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ codespell \ cpp \ diffutils \ - dnsmasq-base \ dwarves \ ebtables \ flake8 \ -- 2.34.1