[PATCH 0/3] Drop unnecessary build dependencies
We've recently stopped checking for the presence of several commands at build time. That means we don't need them in the RPM or CI build environment either. Test pipeline: https://gitlab.com/abologna/libvirt/-/pipelines/1855622714 Andrea Bolognani (3): rpm: Fix/clarify Requires rpm: Drop unnecessary BuildRequires ci: Drop unnecessary build dependencies ci/buildenv/almalinux-9.sh | 9 --------- ci/buildenv/alpine-321.sh | 6 ------ ci/buildenv/alpine-edge.sh | 6 ------ ci/buildenv/centos-stream-9.sh | 9 --------- ci/buildenv/debian-12-cross-aarch64.sh | 8 -------- ci/buildenv/debian-12-cross-armv6l.sh | 8 -------- ci/buildenv/debian-12-cross-armv7l.sh | 8 -------- ci/buildenv/debian-12-cross-i686.sh | 8 -------- ci/buildenv/debian-12-cross-mips64el.sh | 8 -------- ci/buildenv/debian-12-cross-mipsel.sh | 8 -------- ci/buildenv/debian-12-cross-ppc64le.sh | 8 -------- ci/buildenv/debian-12-cross-s390x.sh | 8 -------- ci/buildenv/debian-12.sh | 8 -------- ci/buildenv/debian-sid-cross-aarch64.sh | 8 -------- ci/buildenv/debian-sid-cross-armv6l.sh | 8 -------- ci/buildenv/debian-sid-cross-armv7l.sh | 8 -------- ci/buildenv/debian-sid-cross-i686.sh | 8 -------- ci/buildenv/debian-sid-cross-mips64el.sh | 8 -------- ci/buildenv/debian-sid-cross-ppc64le.sh | 8 -------- ci/buildenv/debian-sid-cross-s390x.sh | 8 -------- ci/buildenv/debian-sid.sh | 8 -------- ci/buildenv/fedora-41.sh | 9 --------- ci/buildenv/fedora-42-cross-mingw32.sh | 9 --------- ci/buildenv/fedora-42-cross-mingw64.sh | 9 --------- ci/buildenv/fedora-42.sh | 9 --------- ci/buildenv/fedora-rawhide-cross-mingw32.sh | 9 --------- ci/buildenv/fedora-rawhide-cross-mingw64.sh | 9 --------- ci/buildenv/fedora-rawhide.sh | 9 --------- ci/buildenv/opensuse-leap-15.sh | 8 -------- ci/buildenv/opensuse-tumbleweed.sh | 8 -------- ci/buildenv/ubuntu-2204.sh | 8 -------- ci/buildenv/ubuntu-2404.sh | 8 -------- ci/cirrus/freebsd-13.vars | 2 +- ci/cirrus/freebsd-14.vars | 2 +- ci/containers/almalinux-9.Dockerfile | 9 --------- ci/containers/alpine-321.Dockerfile | 6 ------ ci/containers/alpine-edge.Dockerfile | 6 ------ ci/containers/centos-stream-9.Dockerfile | 9 --------- .../debian-12-cross-aarch64.Dockerfile | 8 -------- .../debian-12-cross-armv6l.Dockerfile | 8 -------- .../debian-12-cross-armv7l.Dockerfile | 8 -------- ci/containers/debian-12-cross-i686.Dockerfile | 8 -------- .../debian-12-cross-mips64el.Dockerfile | 8 -------- .../debian-12-cross-mipsel.Dockerfile | 8 -------- .../debian-12-cross-ppc64le.Dockerfile | 8 -------- ci/containers/debian-12-cross-s390x.Dockerfile | 8 -------- ci/containers/debian-12.Dockerfile | 8 -------- .../debian-sid-cross-aarch64.Dockerfile | 8 -------- .../debian-sid-cross-armv6l.Dockerfile | 8 -------- .../debian-sid-cross-armv7l.Dockerfile | 8 -------- ci/containers/debian-sid-cross-i686.Dockerfile | 8 -------- .../debian-sid-cross-mips64el.Dockerfile | 8 -------- .../debian-sid-cross-ppc64le.Dockerfile | 8 -------- .../debian-sid-cross-s390x.Dockerfile | 8 -------- ci/containers/debian-sid.Dockerfile | 8 -------- ci/containers/fedora-41.Dockerfile | 9 --------- .../fedora-42-cross-mingw32.Dockerfile | 9 --------- .../fedora-42-cross-mingw64.Dockerfile | 9 --------- ci/containers/fedora-42.Dockerfile | 9 --------- .../fedora-rawhide-cross-mingw32.Dockerfile | 9 --------- .../fedora-rawhide-cross-mingw64.Dockerfile | 9 --------- ci/containers/fedora-rawhide.Dockerfile | 9 --------- ci/containers/opensuse-leap-15.Dockerfile | 8 -------- ci/containers/opensuse-tumbleweed.Dockerfile | 8 -------- ci/containers/ubuntu-2204.Dockerfile | 8 -------- ci/containers/ubuntu-2404.Dockerfile | 8 -------- ci/lcitool/projects/libvirt.yml | 9 --------- libvirt.spec.in | 18 +++--------------- 68 files changed, 5 insertions(+), 548 deletions(-) -- 2.49.0
daemon-common should have always depended on kmod, since there are various situations in which a module (un)load might be triggered by a driver. For the util-linux dependency, we're simply adjusting the comment to match reality. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- libvirt.spec.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index fd1e2d28c0..f6ce2caff5 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -515,6 +515,8 @@ Requires: libvirt-libs = %{version}-%{release} # Recommends here will install libvirt-client by default (if available), but # RPM won't complain if the package is unavailable, masked, or removed later. Recommends: libvirt-client = %{version}-%{release} +# For modprobe and rmmod +Requires: kmod # for /sbin/ip Requires: iproute # for /sbin/tc @@ -674,7 +676,7 @@ Summary: Storage driver plugin including base backends for the libvirtd daemon Requires: libvirt-daemon-common = %{version}-%{release} Requires: libvirt-libs = %{version}-%{release} Recommends: nfs-utils -# For mkfs +# For mkfs and mount/umount Requires: util-linux # For storage wiping with different algorithms Requires: scrub -- 2.49.0
We've recently stopped checking for the presence of various commands at build time, which means that we no longer need to have the corresponding packages installed in the build environment. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- libvirt.spec.in | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index f6ce2caff5..47644556d9 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -371,12 +371,7 @@ BuildRequires: sanlock-devel >= 2.4 BuildRequires: libpcap-devel >= 1.5.0 BuildRequires: libnl3-devel BuildRequires: libselinux-devel -# For modprobe -BuildRequires: kmod BuildRequires: cyrus-sasl-devel -BuildRequires: polkit >= 0.112 -# For mount/umount in FS driver -BuildRequires: util-linux %if %{with_qemu} # For managing ACLs BuildRequires: libacl-devel @@ -387,10 +382,6 @@ BuildRequires: /usr/bin/qemu-img %if %{with_nbdkit} BuildRequires: libnbd-devel %endif -# For LVM drivers -BuildRequires: lvm2 -# For pool type=iscsi -BuildRequires: iscsi-initiator-utils %if %{with_storage_iscsi_direct} # For pool type=iscsi-direct BuildRequires: libiscsi-devel @@ -430,11 +421,6 @@ BuildRequires: libwsman-devel >= 2.6.3 BuildRequires: audit-libs-devel BuildRequires: systemtap-sdt-devel BuildRequires: /usr/bin/dtrace -# For mount/umount in FS driver -BuildRequires: util-linux - %if %{with_numad} -BuildRequires: numad - %endif %if %{with_wireshark} BuildRequires: wireshark-devel %endif -- 2.49.0
We no longer check for the presence of the commands included in these packages at build time. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- ci/buildenv/almalinux-9.sh | 9 --------- ci/buildenv/alpine-321.sh | 6 ------ ci/buildenv/alpine-edge.sh | 6 ------ ci/buildenv/centos-stream-9.sh | 9 --------- ci/buildenv/debian-12-cross-aarch64.sh | 8 -------- ci/buildenv/debian-12-cross-armv6l.sh | 8 -------- ci/buildenv/debian-12-cross-armv7l.sh | 8 -------- ci/buildenv/debian-12-cross-i686.sh | 8 -------- ci/buildenv/debian-12-cross-mips64el.sh | 8 -------- ci/buildenv/debian-12-cross-mipsel.sh | 8 -------- ci/buildenv/debian-12-cross-ppc64le.sh | 8 -------- ci/buildenv/debian-12-cross-s390x.sh | 8 -------- ci/buildenv/debian-12.sh | 8 -------- ci/buildenv/debian-sid-cross-aarch64.sh | 8 -------- ci/buildenv/debian-sid-cross-armv6l.sh | 8 -------- ci/buildenv/debian-sid-cross-armv7l.sh | 8 -------- ci/buildenv/debian-sid-cross-i686.sh | 8 -------- ci/buildenv/debian-sid-cross-mips64el.sh | 8 -------- ci/buildenv/debian-sid-cross-ppc64le.sh | 8 -------- ci/buildenv/debian-sid-cross-s390x.sh | 8 -------- ci/buildenv/debian-sid.sh | 8 -------- ci/buildenv/fedora-41.sh | 9 --------- ci/buildenv/fedora-42-cross-mingw32.sh | 9 --------- ci/buildenv/fedora-42-cross-mingw64.sh | 9 --------- ci/buildenv/fedora-42.sh | 9 --------- ci/buildenv/fedora-rawhide-cross-mingw32.sh | 9 --------- ci/buildenv/fedora-rawhide-cross-mingw64.sh | 9 --------- ci/buildenv/fedora-rawhide.sh | 9 --------- ci/buildenv/opensuse-leap-15.sh | 8 -------- ci/buildenv/opensuse-tumbleweed.sh | 8 -------- ci/buildenv/ubuntu-2204.sh | 8 -------- ci/buildenv/ubuntu-2404.sh | 8 -------- ci/cirrus/freebsd-13.vars | 2 +- ci/cirrus/freebsd-14.vars | 2 +- ci/containers/almalinux-9.Dockerfile | 9 --------- ci/containers/alpine-321.Dockerfile | 6 ------ ci/containers/alpine-edge.Dockerfile | 6 ------ ci/containers/centos-stream-9.Dockerfile | 9 --------- ci/containers/debian-12-cross-aarch64.Dockerfile | 8 -------- ci/containers/debian-12-cross-armv6l.Dockerfile | 8 -------- ci/containers/debian-12-cross-armv7l.Dockerfile | 8 -------- ci/containers/debian-12-cross-i686.Dockerfile | 8 -------- ci/containers/debian-12-cross-mips64el.Dockerfile | 8 -------- ci/containers/debian-12-cross-mipsel.Dockerfile | 8 -------- ci/containers/debian-12-cross-ppc64le.Dockerfile | 8 -------- ci/containers/debian-12-cross-s390x.Dockerfile | 8 -------- ci/containers/debian-12.Dockerfile | 8 -------- ci/containers/debian-sid-cross-aarch64.Dockerfile | 8 -------- ci/containers/debian-sid-cross-armv6l.Dockerfile | 8 -------- ci/containers/debian-sid-cross-armv7l.Dockerfile | 8 -------- ci/containers/debian-sid-cross-i686.Dockerfile | 8 -------- ci/containers/debian-sid-cross-mips64el.Dockerfile | 8 -------- ci/containers/debian-sid-cross-ppc64le.Dockerfile | 8 -------- ci/containers/debian-sid-cross-s390x.Dockerfile | 8 -------- ci/containers/debian-sid.Dockerfile | 8 -------- ci/containers/fedora-41.Dockerfile | 9 --------- ci/containers/fedora-42-cross-mingw32.Dockerfile | 9 --------- ci/containers/fedora-42-cross-mingw64.Dockerfile | 9 --------- ci/containers/fedora-42.Dockerfile | 9 --------- ci/containers/fedora-rawhide-cross-mingw32.Dockerfile | 9 --------- ci/containers/fedora-rawhide-cross-mingw64.Dockerfile | 9 --------- ci/containers/fedora-rawhide.Dockerfile | 9 --------- ci/containers/opensuse-leap-15.Dockerfile | 8 -------- ci/containers/opensuse-tumbleweed.Dockerfile | 8 -------- ci/containers/ubuntu-2204.Dockerfile | 8 -------- ci/containers/ubuntu-2404.Dockerfile | 8 -------- ci/lcitool/projects/libvirt.yml | 9 --------- 67 files changed, 2 insertions(+), 533 deletions(-) diff --git a/ci/buildenv/almalinux-9.sh b/ci/buildenv/almalinux-9.sh index 3f3993229e..c0cdb5dc81 100644 --- a/ci/buildenv/almalinux-9.sh +++ b/ci/buildenv/almalinux-9.sh @@ -33,12 +33,7 @@ function install_buildenv() { glibc-langpack-en \ gnutls-devel \ grep \ - iproute \ - iproute-tc \ - iptables \ - iscsi-initiator-utils \ json-c-devel \ - kmod \ libacl-devel \ libattr-devel \ libblkid-devel \ @@ -58,17 +53,13 @@ function install_buildenv() { libxml2 \ libxml2-devel \ libxslt \ - lvm2 \ make \ meson \ - nfs-utils \ ninja-build \ numactl-devel \ - numad \ parted-devel \ perl-base \ pkgconfig \ - polkit \ python3 \ python3-docutils \ python3-flake8 \ diff --git a/ci/buildenv/alpine-321.sh b/ci/buildenv/alpine-321.sh index d2149a6def..f00e207fb6 100644 --- a/ci/buildenv/alpine-321.sh +++ b/ci/buildenv/alpine-321.sh @@ -29,10 +29,8 @@ function install_buildenv() { glib-dev \ gnutls-dev \ grep \ - iproute2 \ iptables \ json-c-dev \ - kmod \ libcap-ng-dev \ libnl3-dev \ libpcap-dev \ @@ -44,19 +42,15 @@ function install_buildenv() { libxml2-dev \ libxml2-utils \ libxslt \ - lvm2 \ lvm2-dev \ make \ meson \ musl-dev \ netcf-dev \ - nfs-utils \ numactl-dev \ - open-iscsi \ parted-dev \ perl \ pkgconf \ - polkit \ py3-docutils \ py3-flake8 \ py3-pytest \ diff --git a/ci/buildenv/alpine-edge.sh b/ci/buildenv/alpine-edge.sh index d2149a6def..f00e207fb6 100644 --- a/ci/buildenv/alpine-edge.sh +++ b/ci/buildenv/alpine-edge.sh @@ -29,10 +29,8 @@ function install_buildenv() { glib-dev \ gnutls-dev \ grep \ - iproute2 \ iptables \ json-c-dev \ - kmod \ libcap-ng-dev \ libnl3-dev \ libpcap-dev \ @@ -44,19 +42,15 @@ function install_buildenv() { libxml2-dev \ libxml2-utils \ libxslt \ - lvm2 \ lvm2-dev \ make \ meson \ musl-dev \ netcf-dev \ - nfs-utils \ numactl-dev \ - open-iscsi \ parted-dev \ perl \ pkgconf \ - polkit \ py3-docutils \ py3-flake8 \ py3-pytest \ diff --git a/ci/buildenv/centos-stream-9.sh b/ci/buildenv/centos-stream-9.sh index cb67c3cdcc..2ae2d2a910 100644 --- a/ci/buildenv/centos-stream-9.sh +++ b/ci/buildenv/centos-stream-9.sh @@ -34,12 +34,7 @@ function install_buildenv() { glibc-langpack-en \ gnutls-devel \ grep \ - iproute \ - iproute-tc \ - iptables \ - iscsi-initiator-utils \ json-c-devel \ - kmod \ libacl-devel \ libattr-devel \ libblkid-devel \ @@ -59,17 +54,13 @@ function install_buildenv() { libxml2 \ libxml2-devel \ libxslt \ - lvm2 \ make \ meson \ - nfs-utils \ ninja-build \ numactl-devel \ - numad \ parted-devel \ perl-base \ pkgconfig \ - polkit \ python3 \ python3-docutils \ python3-flake8 \ diff --git a/ci/buildenv/debian-12-cross-aarch64.sh b/ci/buildenv/debian-12-cross-aarch64.sh index 1d69c099a4..7732cc8128 100644 --- a/ci/buildenv/debian-12-cross-aarch64.sh +++ b/ci/buildenv/debian-12-cross-aarch64.sh @@ -24,23 +24,15 @@ function install_buildenv() { gettext \ git \ grep \ - iproute2 \ - iptables \ - kmod \ libclang-rt-dev \ libnbd-dev \ libxml2-utils \ locales \ - lvm2 \ make \ meson \ - nfs-common \ ninja-build \ - numad \ - open-iscsi \ perl-base \ pkgconf \ - polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-12-cross-armv6l.sh b/ci/buildenv/debian-12-cross-armv6l.sh index db2ee46af5..a61ada219c 100644 --- a/ci/buildenv/debian-12-cross-armv6l.sh +++ b/ci/buildenv/debian-12-cross-armv6l.sh @@ -24,23 +24,15 @@ function install_buildenv() { gettext \ git \ grep \ - iproute2 \ - iptables \ - kmod \ libclang-rt-dev \ libnbd-dev \ libxml2-utils \ locales \ - lvm2 \ make \ meson \ - nfs-common \ ninja-build \ - numad \ - open-iscsi \ perl-base \ pkgconf \ - polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-12-cross-armv7l.sh b/ci/buildenv/debian-12-cross-armv7l.sh index 9ab435d0d7..1e6dd778cc 100644 --- a/ci/buildenv/debian-12-cross-armv7l.sh +++ b/ci/buildenv/debian-12-cross-armv7l.sh @@ -24,23 +24,15 @@ function install_buildenv() { gettext \ git \ grep \ - iproute2 \ - iptables \ - kmod \ libclang-rt-dev \ libnbd-dev \ libxml2-utils \ locales \ - lvm2 \ make \ meson \ - nfs-common \ ninja-build \ - numad \ - open-iscsi \ perl-base \ pkgconf \ - polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-12-cross-i686.sh b/ci/buildenv/debian-12-cross-i686.sh index fbc6da5dd4..f04d3019b4 100644 --- a/ci/buildenv/debian-12-cross-i686.sh +++ b/ci/buildenv/debian-12-cross-i686.sh @@ -24,23 +24,15 @@ function install_buildenv() { gettext \ git \ grep \ - iproute2 \ - iptables \ - kmod \ libclang-rt-dev \ libnbd-dev \ libxml2-utils \ locales \ - lvm2 \ make \ meson \ - nfs-common \ ninja-build \ - numad \ - open-iscsi \ perl-base \ pkgconf \ - polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-12-cross-mips64el.sh b/ci/buildenv/debian-12-cross-mips64el.sh index f7067dfeb3..9b8538e572 100644 --- a/ci/buildenv/debian-12-cross-mips64el.sh +++ b/ci/buildenv/debian-12-cross-mips64el.sh @@ -24,23 +24,15 @@ function install_buildenv() { gettext \ git \ grep \ - iproute2 \ - iptables \ - kmod \ libclang-rt-dev \ libnbd-dev \ libxml2-utils \ locales \ - lvm2 \ make \ meson \ - nfs-common \ ninja-build \ - numad \ - open-iscsi \ perl-base \ pkgconf \ - polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-12-cross-mipsel.sh b/ci/buildenv/debian-12-cross-mipsel.sh index 6dd5333ae4..f706596c56 100644 --- a/ci/buildenv/debian-12-cross-mipsel.sh +++ b/ci/buildenv/debian-12-cross-mipsel.sh @@ -24,23 +24,15 @@ function install_buildenv() { gettext \ git \ grep \ - iproute2 \ - iptables \ - kmod \ libclang-rt-dev \ libnbd-dev \ libxml2-utils \ locales \ - lvm2 \ make \ meson \ - nfs-common \ ninja-build \ - numad \ - open-iscsi \ perl-base \ pkgconf \ - polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-12-cross-ppc64le.sh b/ci/buildenv/debian-12-cross-ppc64le.sh index 97de655904..bc590b7efe 100644 --- a/ci/buildenv/debian-12-cross-ppc64le.sh +++ b/ci/buildenv/debian-12-cross-ppc64le.sh @@ -24,23 +24,15 @@ function install_buildenv() { gettext \ git \ grep \ - iproute2 \ - iptables \ - kmod \ libclang-rt-dev \ libnbd-dev \ libxml2-utils \ locales \ - lvm2 \ make \ meson \ - nfs-common \ ninja-build \ - numad \ - open-iscsi \ perl-base \ pkgconf \ - polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-12-cross-s390x.sh b/ci/buildenv/debian-12-cross-s390x.sh index 725d1ee113..0f4b428381 100644 --- a/ci/buildenv/debian-12-cross-s390x.sh +++ b/ci/buildenv/debian-12-cross-s390x.sh @@ -24,23 +24,15 @@ function install_buildenv() { gettext \ git \ grep \ - iproute2 \ - iptables \ - kmod \ libclang-rt-dev \ libnbd-dev \ libxml2-utils \ locales \ - lvm2 \ make \ meson \ - nfs-common \ ninja-build \ - numad \ - open-iscsi \ perl-base \ pkgconf \ - polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-12.sh b/ci/buildenv/debian-12.sh index 5e5b759f08..c0b7dc28cb 100644 --- a/ci/buildenv/debian-12.sh +++ b/ci/buildenv/debian-12.sh @@ -26,9 +26,6 @@ function install_buildenv() { gettext \ git \ grep \ - iproute2 \ - iptables \ - kmod \ libacl1-dev \ libapparmor-dev \ libattr1-dev \ @@ -65,16 +62,11 @@ function install_buildenv() { libxml2-dev \ libxml2-utils \ locales \ - lvm2 \ make \ meson \ - nfs-common \ ninja-build \ - numad \ - open-iscsi \ perl-base \ pkgconf \ - polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-sid-cross-aarch64.sh b/ci/buildenv/debian-sid-cross-aarch64.sh index 1d69c099a4..7732cc8128 100644 --- a/ci/buildenv/debian-sid-cross-aarch64.sh +++ b/ci/buildenv/debian-sid-cross-aarch64.sh @@ -24,23 +24,15 @@ function install_buildenv() { gettext \ git \ grep \ - iproute2 \ - iptables \ - kmod \ libclang-rt-dev \ libnbd-dev \ libxml2-utils \ locales \ - lvm2 \ make \ meson \ - nfs-common \ ninja-build \ - numad \ - open-iscsi \ perl-base \ pkgconf \ - polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-sid-cross-armv6l.sh b/ci/buildenv/debian-sid-cross-armv6l.sh index 598c50c518..28c5eb87a3 100644 --- a/ci/buildenv/debian-sid-cross-armv6l.sh +++ b/ci/buildenv/debian-sid-cross-armv6l.sh @@ -24,23 +24,15 @@ function install_buildenv() { gettext \ git \ grep \ - iproute2 \ - iptables \ - kmod \ libclang-rt-dev \ libnbd-dev \ libxml2-utils \ locales \ - lvm2 \ make \ meson \ - nfs-common \ ninja-build \ - numad \ - open-iscsi \ perl-base \ pkgconf \ - polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-sid-cross-armv7l.sh b/ci/buildenv/debian-sid-cross-armv7l.sh index 5592b1f19f..e014b3dd0f 100644 --- a/ci/buildenv/debian-sid-cross-armv7l.sh +++ b/ci/buildenv/debian-sid-cross-armv7l.sh @@ -24,23 +24,15 @@ function install_buildenv() { gettext \ git \ grep \ - iproute2 \ - iptables \ - kmod \ libclang-rt-dev \ libnbd-dev \ libxml2-utils \ locales \ - lvm2 \ make \ meson \ - nfs-common \ ninja-build \ - numad \ - open-iscsi \ perl-base \ pkgconf \ - polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-sid-cross-i686.sh b/ci/buildenv/debian-sid-cross-i686.sh index 60b4862674..293ae76a33 100644 --- a/ci/buildenv/debian-sid-cross-i686.sh +++ b/ci/buildenv/debian-sid-cross-i686.sh @@ -24,23 +24,15 @@ function install_buildenv() { gettext \ git \ grep \ - iproute2 \ - iptables \ - kmod \ libclang-rt-dev \ libnbd-dev \ libxml2-utils \ locales \ - lvm2 \ make \ meson \ - nfs-common \ ninja-build \ - numad \ - open-iscsi \ perl-base \ pkgconf \ - polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-sid-cross-mips64el.sh b/ci/buildenv/debian-sid-cross-mips64el.sh index f7067dfeb3..9b8538e572 100644 --- a/ci/buildenv/debian-sid-cross-mips64el.sh +++ b/ci/buildenv/debian-sid-cross-mips64el.sh @@ -24,23 +24,15 @@ function install_buildenv() { gettext \ git \ grep \ - iproute2 \ - iptables \ - kmod \ libclang-rt-dev \ libnbd-dev \ libxml2-utils \ locales \ - lvm2 \ make \ meson \ - nfs-common \ ninja-build \ - numad \ - open-iscsi \ perl-base \ pkgconf \ - polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-sid-cross-ppc64le.sh b/ci/buildenv/debian-sid-cross-ppc64le.sh index 97de655904..bc590b7efe 100644 --- a/ci/buildenv/debian-sid-cross-ppc64le.sh +++ b/ci/buildenv/debian-sid-cross-ppc64le.sh @@ -24,23 +24,15 @@ function install_buildenv() { gettext \ git \ grep \ - iproute2 \ - iptables \ - kmod \ libclang-rt-dev \ libnbd-dev \ libxml2-utils \ locales \ - lvm2 \ make \ meson \ - nfs-common \ ninja-build \ - numad \ - open-iscsi \ perl-base \ pkgconf \ - polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-sid-cross-s390x.sh b/ci/buildenv/debian-sid-cross-s390x.sh index 725d1ee113..0f4b428381 100644 --- a/ci/buildenv/debian-sid-cross-s390x.sh +++ b/ci/buildenv/debian-sid-cross-s390x.sh @@ -24,23 +24,15 @@ function install_buildenv() { gettext \ git \ grep \ - iproute2 \ - iptables \ - kmod \ libclang-rt-dev \ libnbd-dev \ libxml2-utils \ locales \ - lvm2 \ make \ meson \ - nfs-common \ ninja-build \ - numad \ - open-iscsi \ perl-base \ pkgconf \ - polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/debian-sid.sh b/ci/buildenv/debian-sid.sh index 5e5b759f08..c0b7dc28cb 100644 --- a/ci/buildenv/debian-sid.sh +++ b/ci/buildenv/debian-sid.sh @@ -26,9 +26,6 @@ function install_buildenv() { gettext \ git \ grep \ - iproute2 \ - iptables \ - kmod \ libacl1-dev \ libapparmor-dev \ libattr1-dev \ @@ -65,16 +62,11 @@ function install_buildenv() { libxml2-dev \ libxml2-utils \ locales \ - lvm2 \ make \ meson \ - nfs-common \ ninja-build \ - numad \ - open-iscsi \ perl-base \ pkgconf \ - polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/fedora-41.sh b/ci/buildenv/fedora-41.sh index c32a689fbd..44380a365f 100644 --- a/ci/buildenv/fedora-41.sh +++ b/ci/buildenv/fedora-41.sh @@ -33,12 +33,7 @@ function install_buildenv() { glusterfs-api-devel \ gnutls-devel \ grep \ - iproute \ - iproute-tc \ - iptables \ - iscsi-initiator-utils \ json-c-devel \ - kmod \ libacl-devel \ libattr-devel \ libblkid-devel \ @@ -58,17 +53,13 @@ function install_buildenv() { libxml2 \ libxml2-devel \ libxslt \ - lvm2 \ make \ meson \ - nfs-utils \ ninja-build \ numactl-devel \ - numad \ parted-devel \ perl-base \ pkgconfig \ - polkit \ python3 \ python3-black \ python3-docutils \ diff --git a/ci/buildenv/fedora-42-cross-mingw32.sh b/ci/buildenv/fedora-42-cross-mingw32.sh index b19f0dccb2..695b06c8e4 100644 --- a/ci/buildenv/fedora-42-cross-mingw32.sh +++ b/ci/buildenv/fedora-42-cross-mingw32.sh @@ -23,22 +23,13 @@ function install_buildenv() { git \ glibc-langpack-en \ grep \ - iproute \ - iproute-tc \ - iptables \ - iscsi-initiator-utils \ - kmod \ libnbd-devel \ libxml2 \ libxslt \ - lvm2 \ make \ meson \ - nfs-utils \ ninja-build \ - numad \ perl-base \ - polkit \ python3 \ python3-black \ python3-docutils \ diff --git a/ci/buildenv/fedora-42-cross-mingw64.sh b/ci/buildenv/fedora-42-cross-mingw64.sh index 20dca703b5..10193af1e6 100644 --- a/ci/buildenv/fedora-42-cross-mingw64.sh +++ b/ci/buildenv/fedora-42-cross-mingw64.sh @@ -23,22 +23,13 @@ function install_buildenv() { git \ glibc-langpack-en \ grep \ - iproute \ - iproute-tc \ - iptables \ - iscsi-initiator-utils \ - kmod \ libnbd-devel \ libxml2 \ libxslt \ - lvm2 \ make \ meson \ - nfs-utils \ ninja-build \ - numad \ perl-base \ - polkit \ python3 \ python3-black \ python3-docutils \ diff --git a/ci/buildenv/fedora-42.sh b/ci/buildenv/fedora-42.sh index c32a689fbd..44380a365f 100644 --- a/ci/buildenv/fedora-42.sh +++ b/ci/buildenv/fedora-42.sh @@ -33,12 +33,7 @@ function install_buildenv() { glusterfs-api-devel \ gnutls-devel \ grep \ - iproute \ - iproute-tc \ - iptables \ - iscsi-initiator-utils \ json-c-devel \ - kmod \ libacl-devel \ libattr-devel \ libblkid-devel \ @@ -58,17 +53,13 @@ function install_buildenv() { libxml2 \ libxml2-devel \ libxslt \ - lvm2 \ make \ meson \ - nfs-utils \ ninja-build \ numactl-devel \ - numad \ parted-devel \ perl-base \ pkgconfig \ - polkit \ python3 \ python3-black \ python3-docutils \ diff --git a/ci/buildenv/fedora-rawhide-cross-mingw32.sh b/ci/buildenv/fedora-rawhide-cross-mingw32.sh index dadc40dc4e..1d79394383 100644 --- a/ci/buildenv/fedora-rawhide-cross-mingw32.sh +++ b/ci/buildenv/fedora-rawhide-cross-mingw32.sh @@ -24,22 +24,13 @@ function install_buildenv() { git \ glibc-langpack-en \ grep \ - iproute \ - iproute-tc \ - iptables \ - iscsi-initiator-utils \ - kmod \ libnbd-devel \ libxml2 \ libxslt \ - lvm2 \ make \ meson \ - nfs-utils \ ninja-build \ - numad \ perl-base \ - polkit \ python3 \ python3-black \ python3-docutils \ diff --git a/ci/buildenv/fedora-rawhide-cross-mingw64.sh b/ci/buildenv/fedora-rawhide-cross-mingw64.sh index c484250272..dc2a0db9c3 100644 --- a/ci/buildenv/fedora-rawhide-cross-mingw64.sh +++ b/ci/buildenv/fedora-rawhide-cross-mingw64.sh @@ -24,22 +24,13 @@ function install_buildenv() { git \ glibc-langpack-en \ grep \ - iproute \ - iproute-tc \ - iptables \ - iscsi-initiator-utils \ - kmod \ libnbd-devel \ libxml2 \ libxslt \ - lvm2 \ make \ meson \ - nfs-utils \ ninja-build \ - numad \ perl-base \ - polkit \ python3 \ python3-black \ python3-docutils \ diff --git a/ci/buildenv/fedora-rawhide.sh b/ci/buildenv/fedora-rawhide.sh index d6dcf86733..d730fbedbb 100644 --- a/ci/buildenv/fedora-rawhide.sh +++ b/ci/buildenv/fedora-rawhide.sh @@ -34,12 +34,7 @@ function install_buildenv() { glusterfs-api-devel \ gnutls-devel \ grep \ - iproute \ - iproute-tc \ - iptables \ - iscsi-initiator-utils \ json-c-devel \ - kmod \ libacl-devel \ libattr-devel \ libblkid-devel \ @@ -59,17 +54,13 @@ function install_buildenv() { libxml2 \ libxml2-devel \ libxslt \ - lvm2 \ make \ meson \ - nfs-utils \ ninja-build \ numactl-devel \ - numad \ parted-devel \ perl-base \ pkgconfig \ - polkit \ python3 \ python3-black \ python3-docutils \ diff --git a/ci/buildenv/opensuse-leap-15.sh b/ci/buildenv/opensuse-leap-15.sh index add707c752..843fa32686 100644 --- a/ci/buildenv/opensuse-leap-15.sh +++ b/ci/buildenv/opensuse-leap-15.sh @@ -33,9 +33,6 @@ function install_buildenv() { glibc-locale \ glusterfs-devel \ grep \ - iproute2 \ - iptables \ - kmod \ libacl-devel \ libapparmor-devel \ libattr-devel \ @@ -60,17 +57,12 @@ function install_buildenv() { libxml2 \ libxml2-devel \ libxslt \ - lvm2 \ make \ meson \ - nfs-utils \ ninja \ - numad \ - open-iscsi \ parted-devel \ perl-base \ pkgconfig \ - polkit \ python3-base \ python3-docutils \ python3-flake8 \ diff --git a/ci/buildenv/opensuse-tumbleweed.sh b/ci/buildenv/opensuse-tumbleweed.sh index b3175fe404..fcf2707e3f 100644 --- a/ci/buildenv/opensuse-tumbleweed.sh +++ b/ci/buildenv/opensuse-tumbleweed.sh @@ -32,9 +32,6 @@ function install_buildenv() { glibc-locale \ glusterfs-devel \ grep \ - iproute2 \ - iptables \ - kmod \ libacl-devel \ libapparmor-devel \ libattr-devel \ @@ -59,17 +56,12 @@ function install_buildenv() { libxml2 \ libxml2-devel \ libxslt \ - lvm2 \ make \ meson \ - nfs-utils \ ninja \ - numad \ - open-iscsi \ parted-devel \ perl-base \ pkgconfig \ - polkit \ python3-base \ python3-black \ python3-docutils \ diff --git a/ci/buildenv/ubuntu-2204.sh b/ci/buildenv/ubuntu-2204.sh index e581ce6012..a64f77847b 100644 --- a/ci/buildenv/ubuntu-2204.sh +++ b/ci/buildenv/ubuntu-2204.sh @@ -26,9 +26,6 @@ function install_buildenv() { gettext \ git \ grep \ - iproute2 \ - iptables \ - kmod \ libacl1-dev \ libapparmor-dev \ libattr1-dev \ @@ -66,16 +63,11 @@ function install_buildenv() { libxml2-dev \ libxml2-utils \ locales \ - lvm2 \ make \ meson \ - nfs-common \ ninja-build \ - numad \ - open-iscsi \ perl-base \ pkgconf \ - polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/buildenv/ubuntu-2404.sh b/ci/buildenv/ubuntu-2404.sh index 8e459cbb25..2b443b7bb3 100644 --- a/ci/buildenv/ubuntu-2404.sh +++ b/ci/buildenv/ubuntu-2404.sh @@ -26,9 +26,6 @@ function install_buildenv() { gettext \ git \ grep \ - iproute2 \ - iptables \ - kmod \ libacl1-dev \ libapparmor-dev \ libattr1-dev \ @@ -66,16 +63,11 @@ function install_buildenv() { libxml2-dev \ libxml2-utils \ locales \ - lvm2 \ make \ meson \ - nfs-common \ ninja-build \ - numad \ - open-iscsi \ perl-base \ pkgconf \ - polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/cirrus/freebsd-13.vars b/ci/cirrus/freebsd-13.vars index 56b66e3b2a..e80b2eeb5d 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 ccache4 codespell cppi curl cyrus-sasl diffutils fusefs-libs gettext git glib gmake gnugrep gnutls gsed json-c libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py311-black py311-docutils py311-flake8 py311-pytest python3 qemu readline' +PKGS='augeas bash-completion ca_root_nss ccache4 codespell cppi curl cyrus-sasl diffutils fusefs-libs gettext git glib gmake gnugrep gnutls gsed json-c libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf py311-black py311-docutils py311-flake8 py311-pytest python3 qemu readline' PYPI_PKGS='' PYTHON='/usr/local/bin/python3' diff --git a/ci/cirrus/freebsd-14.vars b/ci/cirrus/freebsd-14.vars index fb665d16ee..e4d162212c 100644 --- a/ci/cirrus/freebsd-14.vars +++ b/ci/cirrus/freebsd-14.vars @@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PACKAGING_COMMAND='pkg' PIP3='/usr/local/bin/pip' -PKGS='augeas bash-completion ca_root_nss ccache4 codespell cppi curl cyrus-sasl diffutils fusefs-libs gettext git glib gmake gnugrep gnutls gsed json-c libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py311-black py311-docutils py311-flake8 py311-pytest python3 qemu readline' +PKGS='augeas bash-completion ca_root_nss ccache4 codespell cppi curl cyrus-sasl diffutils fusefs-libs gettext git glib gmake gnugrep gnutls gsed json-c libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf py311-black py311-docutils py311-flake8 py311-pytest python3 qemu readline' PYPI_PKGS='' PYTHON='/usr/local/bin/python3' diff --git a/ci/containers/almalinux-9.Dockerfile b/ci/containers/almalinux-9.Dockerfile index 576119542d..a30e4d9452 100644 --- a/ci/containers/almalinux-9.Dockerfile +++ b/ci/containers/almalinux-9.Dockerfile @@ -34,12 +34,7 @@ RUN dnf update -y && \ glibc-langpack-en \ gnutls-devel \ grep \ - iproute \ - iproute-tc \ - iptables \ - iscsi-initiator-utils \ json-c-devel \ - kmod \ libacl-devel \ libattr-devel \ libblkid-devel \ @@ -59,17 +54,13 @@ RUN dnf update -y && \ libxml2 \ libxml2-devel \ libxslt \ - lvm2 \ make \ meson \ - nfs-utils \ ninja-build \ numactl-devel \ - numad \ parted-devel \ perl-base \ pkgconfig \ - polkit \ python3 \ python3-docutils \ python3-flake8 \ diff --git a/ci/containers/alpine-321.Dockerfile b/ci/containers/alpine-321.Dockerfile index 2351b03653..d17126d86a 100644 --- a/ci/containers/alpine-321.Dockerfile +++ b/ci/containers/alpine-321.Dockerfile @@ -30,10 +30,8 @@ RUN apk update && \ glib-dev \ gnutls-dev \ grep \ - iproute2 \ iptables \ json-c-dev \ - kmod \ libcap-ng-dev \ libnl3-dev \ libpcap-dev \ @@ -45,19 +43,15 @@ RUN apk update && \ libxml2-dev \ libxml2-utils \ libxslt \ - lvm2 \ lvm2-dev \ make \ meson \ musl-dev \ netcf-dev \ - nfs-utils \ numactl-dev \ - open-iscsi \ parted-dev \ perl \ pkgconf \ - polkit \ py3-docutils \ py3-flake8 \ py3-pytest \ diff --git a/ci/containers/alpine-edge.Dockerfile b/ci/containers/alpine-edge.Dockerfile index 83f160257f..fc4b9a3e56 100644 --- a/ci/containers/alpine-edge.Dockerfile +++ b/ci/containers/alpine-edge.Dockerfile @@ -30,10 +30,8 @@ RUN apk update && \ glib-dev \ gnutls-dev \ grep \ - iproute2 \ iptables \ json-c-dev \ - kmod \ libcap-ng-dev \ libnl3-dev \ libpcap-dev \ @@ -45,19 +43,15 @@ RUN apk update && \ libxml2-dev \ libxml2-utils \ libxslt \ - lvm2 \ lvm2-dev \ make \ meson \ musl-dev \ netcf-dev \ - nfs-utils \ numactl-dev \ - open-iscsi \ parted-dev \ perl \ pkgconf \ - polkit \ py3-docutils \ py3-flake8 \ py3-pytest \ diff --git a/ci/containers/centos-stream-9.Dockerfile b/ci/containers/centos-stream-9.Dockerfile index 1b21f9ea75..94a563ad05 100644 --- a/ci/containers/centos-stream-9.Dockerfile +++ b/ci/containers/centos-stream-9.Dockerfile @@ -35,12 +35,7 @@ RUN dnf distro-sync -y && \ glibc-langpack-en \ gnutls-devel \ grep \ - iproute \ - iproute-tc \ - iptables \ - iscsi-initiator-utils \ json-c-devel \ - kmod \ libacl-devel \ libattr-devel \ libblkid-devel \ @@ -60,17 +55,13 @@ RUN dnf distro-sync -y && \ libxml2 \ libxml2-devel \ libxslt \ - lvm2 \ make \ meson \ - nfs-utils \ ninja-build \ numactl-devel \ - numad \ parted-devel \ perl-base \ pkgconfig \ - polkit \ python3 \ python3-docutils \ python3-flake8 \ diff --git a/ci/containers/debian-12-cross-aarch64.Dockerfile b/ci/containers/debian-12-cross-aarch64.Dockerfile index ebccfbc203..5130adc2fb 100644 --- a/ci/containers/debian-12-cross-aarch64.Dockerfile +++ b/ci/containers/debian-12-cross-aarch64.Dockerfile @@ -26,23 +26,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ gettext \ git \ grep \ - iproute2 \ - iptables \ - kmod \ libclang-rt-dev \ libnbd-dev \ libxml2-utils \ locales \ - lvm2 \ make \ meson \ - nfs-common \ ninja-build \ - numad \ - open-iscsi \ perl-base \ pkgconf \ - polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-12-cross-armv6l.Dockerfile b/ci/containers/debian-12-cross-armv6l.Dockerfile index a6f51c80fd..a2140109bf 100644 --- a/ci/containers/debian-12-cross-armv6l.Dockerfile +++ b/ci/containers/debian-12-cross-armv6l.Dockerfile @@ -26,23 +26,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ gettext \ git \ grep \ - iproute2 \ - iptables \ - kmod \ libclang-rt-dev \ libnbd-dev \ libxml2-utils \ locales \ - lvm2 \ make \ meson \ - nfs-common \ ninja-build \ - numad \ - open-iscsi \ perl-base \ pkgconf \ - polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-12-cross-armv7l.Dockerfile b/ci/containers/debian-12-cross-armv7l.Dockerfile index 132938ce10..1f23cd4005 100644 --- a/ci/containers/debian-12-cross-armv7l.Dockerfile +++ b/ci/containers/debian-12-cross-armv7l.Dockerfile @@ -26,23 +26,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ gettext \ git \ grep \ - iproute2 \ - iptables \ - kmod \ libclang-rt-dev \ libnbd-dev \ libxml2-utils \ locales \ - lvm2 \ make \ meson \ - nfs-common \ ninja-build \ - numad \ - open-iscsi \ perl-base \ pkgconf \ - polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-12-cross-i686.Dockerfile b/ci/containers/debian-12-cross-i686.Dockerfile index 3a76ee4e76..02489aec68 100644 --- a/ci/containers/debian-12-cross-i686.Dockerfile +++ b/ci/containers/debian-12-cross-i686.Dockerfile @@ -26,23 +26,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ gettext \ git \ grep \ - iproute2 \ - iptables \ - kmod \ libclang-rt-dev \ libnbd-dev \ libxml2-utils \ locales \ - lvm2 \ make \ meson \ - nfs-common \ ninja-build \ - numad \ - open-iscsi \ perl-base \ pkgconf \ - polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-12-cross-mips64el.Dockerfile b/ci/containers/debian-12-cross-mips64el.Dockerfile index c8009062ef..acad2cfd10 100644 --- a/ci/containers/debian-12-cross-mips64el.Dockerfile +++ b/ci/containers/debian-12-cross-mips64el.Dockerfile @@ -26,23 +26,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ gettext \ git \ grep \ - iproute2 \ - iptables \ - kmod \ libclang-rt-dev \ libnbd-dev \ libxml2-utils \ locales \ - lvm2 \ make \ meson \ - nfs-common \ ninja-build \ - numad \ - open-iscsi \ perl-base \ pkgconf \ - polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-12-cross-mipsel.Dockerfile b/ci/containers/debian-12-cross-mipsel.Dockerfile index efb4639a26..98ab8139ce 100644 --- a/ci/containers/debian-12-cross-mipsel.Dockerfile +++ b/ci/containers/debian-12-cross-mipsel.Dockerfile @@ -26,23 +26,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ gettext \ git \ grep \ - iproute2 \ - iptables \ - kmod \ libclang-rt-dev \ libnbd-dev \ libxml2-utils \ locales \ - lvm2 \ make \ meson \ - nfs-common \ ninja-build \ - numad \ - open-iscsi \ perl-base \ pkgconf \ - polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-12-cross-ppc64le.Dockerfile b/ci/containers/debian-12-cross-ppc64le.Dockerfile index 3b0cfab7ef..233ef84082 100644 --- a/ci/containers/debian-12-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-12-cross-ppc64le.Dockerfile @@ -26,23 +26,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ gettext \ git \ grep \ - iproute2 \ - iptables \ - kmod \ libclang-rt-dev \ libnbd-dev \ libxml2-utils \ locales \ - lvm2 \ make \ meson \ - nfs-common \ ninja-build \ - numad \ - open-iscsi \ perl-base \ pkgconf \ - polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-12-cross-s390x.Dockerfile b/ci/containers/debian-12-cross-s390x.Dockerfile index c730b44e03..6c1fae3d27 100644 --- a/ci/containers/debian-12-cross-s390x.Dockerfile +++ b/ci/containers/debian-12-cross-s390x.Dockerfile @@ -26,23 +26,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ gettext \ git \ grep \ - iproute2 \ - iptables \ - kmod \ libclang-rt-dev \ libnbd-dev \ libxml2-utils \ locales \ - lvm2 \ make \ meson \ - nfs-common \ ninja-build \ - numad \ - open-iscsi \ perl-base \ pkgconf \ - polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-12.Dockerfile b/ci/containers/debian-12.Dockerfile index 778f6962d9..8c801e228e 100644 --- a/ci/containers/debian-12.Dockerfile +++ b/ci/containers/debian-12.Dockerfile @@ -28,9 +28,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ gettext \ git \ grep \ - iproute2 \ - iptables \ - kmod \ libacl1-dev \ libapparmor-dev \ libattr1-dev \ @@ -67,16 +64,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libxml2-dev \ libxml2-utils \ locales \ - lvm2 \ make \ meson \ - nfs-common \ ninja-build \ - numad \ - open-iscsi \ perl-base \ pkgconf \ - polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-sid-cross-aarch64.Dockerfile b/ci/containers/debian-sid-cross-aarch64.Dockerfile index 2d0e4d8a98..5489aaa53c 100644 --- a/ci/containers/debian-sid-cross-aarch64.Dockerfile +++ b/ci/containers/debian-sid-cross-aarch64.Dockerfile @@ -26,23 +26,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ gettext \ git \ grep \ - iproute2 \ - iptables \ - kmod \ libclang-rt-dev \ libnbd-dev \ libxml2-utils \ locales \ - lvm2 \ make \ meson \ - nfs-common \ ninja-build \ - numad \ - open-iscsi \ perl-base \ pkgconf \ - polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-sid-cross-armv6l.Dockerfile b/ci/containers/debian-sid-cross-armv6l.Dockerfile index 130bd8a12d..e3ae1c50b7 100644 --- a/ci/containers/debian-sid-cross-armv6l.Dockerfile +++ b/ci/containers/debian-sid-cross-armv6l.Dockerfile @@ -26,23 +26,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ gettext \ git \ grep \ - iproute2 \ - iptables \ - kmod \ libclang-rt-dev \ libnbd-dev \ libxml2-utils \ locales \ - lvm2 \ make \ meson \ - nfs-common \ ninja-build \ - numad \ - open-iscsi \ perl-base \ pkgconf \ - polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-sid-cross-armv7l.Dockerfile b/ci/containers/debian-sid-cross-armv7l.Dockerfile index fd0992b308..e6118a0d9b 100644 --- a/ci/containers/debian-sid-cross-armv7l.Dockerfile +++ b/ci/containers/debian-sid-cross-armv7l.Dockerfile @@ -26,23 +26,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ gettext \ git \ grep \ - iproute2 \ - iptables \ - kmod \ libclang-rt-dev \ libnbd-dev \ libxml2-utils \ locales \ - lvm2 \ make \ meson \ - nfs-common \ ninja-build \ - numad \ - open-iscsi \ perl-base \ pkgconf \ - polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-sid-cross-i686.Dockerfile b/ci/containers/debian-sid-cross-i686.Dockerfile index 8aedb83266..decc0805e1 100644 --- a/ci/containers/debian-sid-cross-i686.Dockerfile +++ b/ci/containers/debian-sid-cross-i686.Dockerfile @@ -26,23 +26,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ gettext \ git \ grep \ - iproute2 \ - iptables \ - kmod \ libclang-rt-dev \ libnbd-dev \ libxml2-utils \ locales \ - lvm2 \ make \ meson \ - nfs-common \ ninja-build \ - numad \ - open-iscsi \ perl-base \ pkgconf \ - polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-sid-cross-mips64el.Dockerfile b/ci/containers/debian-sid-cross-mips64el.Dockerfile index 0af87394cc..67904f419f 100644 --- a/ci/containers/debian-sid-cross-mips64el.Dockerfile +++ b/ci/containers/debian-sid-cross-mips64el.Dockerfile @@ -26,23 +26,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ gettext \ git \ grep \ - iproute2 \ - iptables \ - kmod \ libclang-rt-dev \ libnbd-dev \ libxml2-utils \ locales \ - lvm2 \ make \ meson \ - nfs-common \ ninja-build \ - numad \ - open-iscsi \ perl-base \ pkgconf \ - polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-sid-cross-ppc64le.Dockerfile b/ci/containers/debian-sid-cross-ppc64le.Dockerfile index d91a84c65b..608017ade9 100644 --- a/ci/containers/debian-sid-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-sid-cross-ppc64le.Dockerfile @@ -26,23 +26,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ gettext \ git \ grep \ - iproute2 \ - iptables \ - kmod \ libclang-rt-dev \ libnbd-dev \ libxml2-utils \ locales \ - lvm2 \ make \ meson \ - nfs-common \ ninja-build \ - numad \ - open-iscsi \ perl-base \ pkgconf \ - polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-sid-cross-s390x.Dockerfile b/ci/containers/debian-sid-cross-s390x.Dockerfile index 147c5e992f..877239819f 100644 --- a/ci/containers/debian-sid-cross-s390x.Dockerfile +++ b/ci/containers/debian-sid-cross-s390x.Dockerfile @@ -26,23 +26,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ gettext \ git \ grep \ - iproute2 \ - iptables \ - kmod \ libclang-rt-dev \ libnbd-dev \ libxml2-utils \ locales \ - lvm2 \ make \ meson \ - nfs-common \ ninja-build \ - numad \ - open-iscsi \ perl-base \ pkgconf \ - polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/debian-sid.Dockerfile b/ci/containers/debian-sid.Dockerfile index daa750324b..7a6c7cd6a3 100644 --- a/ci/containers/debian-sid.Dockerfile +++ b/ci/containers/debian-sid.Dockerfile @@ -28,9 +28,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ gettext \ git \ grep \ - iproute2 \ - iptables \ - kmod \ libacl1-dev \ libapparmor-dev \ libattr1-dev \ @@ -67,16 +64,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libxml2-dev \ libxml2-utils \ locales \ - lvm2 \ make \ meson \ - nfs-common \ ninja-build \ - numad \ - open-iscsi \ perl-base \ pkgconf \ - polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/fedora-41.Dockerfile b/ci/containers/fedora-41.Dockerfile index a46f220de0..fbd19bf50a 100644 --- a/ci/containers/fedora-41.Dockerfile +++ b/ci/containers/fedora-41.Dockerfile @@ -44,12 +44,7 @@ exec "$@"\n' > /usr/bin/nosync && \ glusterfs-api-devel \ gnutls-devel \ grep \ - iproute \ - iproute-tc \ - iptables \ - iscsi-initiator-utils \ json-c-devel \ - kmod \ libacl-devel \ libattr-devel \ libblkid-devel \ @@ -69,17 +64,13 @@ exec "$@"\n' > /usr/bin/nosync && \ libxml2 \ libxml2-devel \ libxslt \ - lvm2 \ make \ meson \ - nfs-utils \ ninja-build \ numactl-devel \ - numad \ parted-devel \ perl-base \ pkgconfig \ - polkit \ python3 \ python3-black \ python3-docutils \ diff --git a/ci/containers/fedora-42-cross-mingw32.Dockerfile b/ci/containers/fedora-42-cross-mingw32.Dockerfile index 5689128ed9..69c6198c83 100644 --- a/ci/containers/fedora-42-cross-mingw32.Dockerfile +++ b/ci/containers/fedora-42-cross-mingw32.Dockerfile @@ -34,22 +34,13 @@ exec "$@"\n' > /usr/bin/nosync && \ git \ glibc-langpack-en \ grep \ - iproute \ - iproute-tc \ - iptables \ - iscsi-initiator-utils \ - kmod \ libnbd-devel \ libxml2 \ libxslt \ - lvm2 \ make \ meson \ - nfs-utils \ ninja-build \ - numad \ perl-base \ - polkit \ python3 \ python3-black \ python3-docutils \ diff --git a/ci/containers/fedora-42-cross-mingw64.Dockerfile b/ci/containers/fedora-42-cross-mingw64.Dockerfile index dff7d84fa3..a00067d614 100644 --- a/ci/containers/fedora-42-cross-mingw64.Dockerfile +++ b/ci/containers/fedora-42-cross-mingw64.Dockerfile @@ -34,22 +34,13 @@ exec "$@"\n' > /usr/bin/nosync && \ git \ glibc-langpack-en \ grep \ - iproute \ - iproute-tc \ - iptables \ - iscsi-initiator-utils \ - kmod \ libnbd-devel \ libxml2 \ libxslt \ - lvm2 \ make \ meson \ - nfs-utils \ ninja-build \ - numad \ perl-base \ - polkit \ python3 \ python3-black \ python3-docutils \ diff --git a/ci/containers/fedora-42.Dockerfile b/ci/containers/fedora-42.Dockerfile index a59c7beb41..df57898ed6 100644 --- a/ci/containers/fedora-42.Dockerfile +++ b/ci/containers/fedora-42.Dockerfile @@ -44,12 +44,7 @@ exec "$@"\n' > /usr/bin/nosync && \ glusterfs-api-devel \ gnutls-devel \ grep \ - iproute \ - iproute-tc \ - iptables \ - iscsi-initiator-utils \ json-c-devel \ - kmod \ libacl-devel \ libattr-devel \ libblkid-devel \ @@ -69,17 +64,13 @@ exec "$@"\n' > /usr/bin/nosync && \ libxml2 \ libxml2-devel \ libxslt \ - lvm2 \ make \ meson \ - nfs-utils \ ninja-build \ numactl-devel \ - numad \ parted-devel \ perl-base \ pkgconfig \ - polkit \ python3 \ python3-black \ python3-docutils \ diff --git a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile index 4e679991ef..381bab3088 100644 --- a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile +++ b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile @@ -35,22 +35,13 @@ exec "$@"\n' > /usr/bin/nosync && \ git \ glibc-langpack-en \ grep \ - iproute \ - iproute-tc \ - iptables \ - iscsi-initiator-utils \ - kmod \ libnbd-devel \ libxml2 \ libxslt \ - lvm2 \ make \ meson \ - nfs-utils \ ninja-build \ - numad \ perl-base \ - polkit \ python3 \ python3-black \ python3-docutils \ diff --git a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile index bd2641548a..9ccea17e22 100644 --- a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile +++ b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile @@ -35,22 +35,13 @@ exec "$@"\n' > /usr/bin/nosync && \ git \ glibc-langpack-en \ grep \ - iproute \ - iproute-tc \ - iptables \ - iscsi-initiator-utils \ - kmod \ libnbd-devel \ libxml2 \ libxslt \ - lvm2 \ make \ meson \ - nfs-utils \ ninja-build \ - numad \ perl-base \ - polkit \ python3 \ python3-black \ python3-docutils \ diff --git a/ci/containers/fedora-rawhide.Dockerfile b/ci/containers/fedora-rawhide.Dockerfile index a1cb9ec978..f4e95f8b8e 100644 --- a/ci/containers/fedora-rawhide.Dockerfile +++ b/ci/containers/fedora-rawhide.Dockerfile @@ -45,12 +45,7 @@ exec "$@"\n' > /usr/bin/nosync && \ glusterfs-api-devel \ gnutls-devel \ grep \ - iproute \ - iproute-tc \ - iptables \ - iscsi-initiator-utils \ json-c-devel \ - kmod \ libacl-devel \ libattr-devel \ libblkid-devel \ @@ -70,17 +65,13 @@ exec "$@"\n' > /usr/bin/nosync && \ libxml2 \ libxml2-devel \ libxslt \ - lvm2 \ make \ meson \ - nfs-utils \ ninja-build \ numactl-devel \ - numad \ parted-devel \ perl-base \ pkgconfig \ - polkit \ python3 \ python3-black \ python3-docutils \ diff --git a/ci/containers/opensuse-leap-15.Dockerfile b/ci/containers/opensuse-leap-15.Dockerfile index 952799aede..c19f136513 100644 --- a/ci/containers/opensuse-leap-15.Dockerfile +++ b/ci/containers/opensuse-leap-15.Dockerfile @@ -34,9 +34,6 @@ RUN zypper update -y && \ glibc-locale \ glusterfs-devel \ grep \ - iproute2 \ - iptables \ - kmod \ libacl-devel \ libapparmor-devel \ libattr-devel \ @@ -61,17 +58,12 @@ RUN zypper update -y && \ libxml2 \ libxml2-devel \ libxslt \ - lvm2 \ make \ meson \ - nfs-utils \ ninja \ - numad \ - open-iscsi \ parted-devel \ perl-base \ pkgconfig \ - polkit \ python3-base \ python3-docutils \ python3-flake8 \ diff --git a/ci/containers/opensuse-tumbleweed.Dockerfile b/ci/containers/opensuse-tumbleweed.Dockerfile index d7cbc88e1a..f220b82a1a 100644 --- a/ci/containers/opensuse-tumbleweed.Dockerfile +++ b/ci/containers/opensuse-tumbleweed.Dockerfile @@ -33,9 +33,6 @@ RUN zypper dist-upgrade -y && \ glibc-locale \ glusterfs-devel \ grep \ - iproute2 \ - iptables \ - kmod \ libacl-devel \ libapparmor-devel \ libattr-devel \ @@ -60,17 +57,12 @@ RUN zypper dist-upgrade -y && \ libxml2 \ libxml2-devel \ libxslt \ - lvm2 \ make \ meson \ - nfs-utils \ ninja \ - numad \ - open-iscsi \ parted-devel \ perl-base \ pkgconfig \ - polkit \ python3-base \ python3-black \ python3-docutils \ diff --git a/ci/containers/ubuntu-2204.Dockerfile b/ci/containers/ubuntu-2204.Dockerfile index dc69a7d4df..8fe2ab81b5 100644 --- a/ci/containers/ubuntu-2204.Dockerfile +++ b/ci/containers/ubuntu-2204.Dockerfile @@ -28,9 +28,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ gettext \ git \ grep \ - iproute2 \ - iptables \ - kmod \ libacl1-dev \ libapparmor-dev \ libattr1-dev \ @@ -68,16 +65,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libxml2-dev \ libxml2-utils \ locales \ - lvm2 \ make \ meson \ - nfs-common \ ninja-build \ - numad \ - open-iscsi \ perl-base \ pkgconf \ - polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/containers/ubuntu-2404.Dockerfile b/ci/containers/ubuntu-2404.Dockerfile index ecccfc637a..9f410e926c 100644 --- a/ci/containers/ubuntu-2404.Dockerfile +++ b/ci/containers/ubuntu-2404.Dockerfile @@ -28,9 +28,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ gettext \ git \ grep \ - iproute2 \ - iptables \ - kmod \ libacl1-dev \ libapparmor-dev \ libattr1-dev \ @@ -68,16 +65,11 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libxml2-dev \ libxml2-utils \ locales \ - lvm2 \ make \ meson \ - nfs-common \ ninja-build \ - numad \ - open-iscsi \ perl-base \ pkgconf \ - polkitd \ python3 \ python3-docutils \ python3-pytest \ diff --git a/ci/lcitool/projects/libvirt.yml b/ci/lcitool/projects/libvirt.yml index aa0dc5924a..8885b787e0 100644 --- a/ci/lcitool/projects/libvirt.yml +++ b/ci/lcitool/projects/libvirt.yml @@ -27,9 +27,6 @@ packages: - glusterfs - gnutls - grep - - ip - - iptables - - iscsiadm - json-c - libacl - libattr @@ -54,16 +51,12 @@ packages: - libtirpc - libudev - libxml2 - - lvm2 - make - meson - - modprobe - netcf - ninja - - numad - openwsman - perl - - pkcheck - pkg-config - portablexdr - python3 @@ -74,10 +67,8 @@ packages: - rpmbuild - sanlock - sed - - showmount - systemd-rpm-macros - systemtap - - tc - wireshark - xen - xmllint -- 2.49.0
On 6/5/25 18:40, Andrea Bolognani via Devel wrote:
We've recently stopped checking for the presence of several commands at build time. That means we don't need them in the RPM or CI build environment either.
Test pipeline: https://gitlab.com/abologna/libvirt/-/pipelines/1855622714
Andrea Bolognani (3): rpm: Fix/clarify Requires rpm: Drop unnecessary BuildRequires ci: Drop unnecessary build dependencies
68 files changed, 5 insertions(+), 548 deletions(-)
Reviewed-by: Michal Privoznik <mprivozn@redhat.com> Michal
participants (2)
-
Andrea Bolognani -
Michal Prívozník