February 2025 - Devel - libvirt List Archives

[PATCH v2 0/8] Enable virtio-mem-ccw
by Michal Privoznik 04 Feb '25

04 Feb '25

v2 of: https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/thread/KA2D… diff to v1: - Previously, virtio-mem-pci wasn't supported (in fact QEMU errored out), but this changed in QEMU upstream, so this limitation is lifted. - Added a test case for virtio-mem-pci on s390x Most of the patches is ACKed already (thanks Boris and David!), only a few remain for review. Michal Prívozník (8): qemu: Do NOT autoadd NUMA node for s390 qemu_command: Use qemuBuildVirtioDevProps() to build cmd line for virtio-mem and virtio-pmem qemuxmlconftest: Introduce memory-hotplug-virtio-mem-pci-s390x.xml qemu_caps: Introduce QEMU_CAPS_DEVICE_VIRTIO_MEM_CCW qemu: Validate virtio-mem-ccw qemu: Allow virtio-mem on CCW qemuxmlconftest: Introduce memory-hotplug-virtio-mem-ccw-s390x.xml NEWS: Document virtio-mem-ccw NEWS.rst | 5 ++ src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 28 ++++++-- src/qemu/qemu_domain.c | 6 +- src/qemu/qemu_postparse.c | 1 + src/qemu/qemu_validate.c | 35 ++++++++- .../caps_10.0.0_s390x.xml | 1 + ...lug-virtio-mem-ccw-s390x.s390x-latest.args | 39 ++++++++++ ...plug-virtio-mem-ccw-s390x.s390x-latest.xml | 60 ++++++++++++++++ .../memory-hotplug-virtio-mem-ccw-s390x.xml | 57 +++++++++++++++ ...lug-virtio-mem-pci-s390x.s390x-latest.args | 41 +++++++++++ ...plug-virtio-mem-pci-s390x.s390x-latest.xml | 71 +++++++++++++++++++ .../memory-hotplug-virtio-mem-pci-s390x.xml | 59 +++++++++++++++ tests/qemuxmlconftest.c | 2 + 15 files changed, 399 insertions(+), 9 deletions(-) create mode 100644 tests/qemuxmlconfdata/memory-hotplug-virtio-mem-ccw-s390x.s390x-latest.args create mode 100644 tests/qemuxmlconfdata/memory-hotplug-virtio-mem-ccw-s390x.s390x-latest.xml create mode 100644 tests/qemuxmlconfdata/memory-hotplug-virtio-mem-ccw-s390x.xml create mode 100644 tests/qemuxmlconfdata/memory-hotplug-virtio-mem-pci-s390x.s390x-latest.args create mode 100644 tests/qemuxmlconfdata/memory-hotplug-virtio-mem-pci-s390x.s390x-latest.xml create mode 100644 tests/qemuxmlconfdata/memory-hotplug-virtio-mem-pci-s390x.xml -- 2.45.3

3 16

[PATCH 0/7] hw/arm/raspi4b: Add models with 4GB and 8GB of DRAM
by Philippe Mathieu-Daudé 04 Feb '25

04 Feb '25

- Deprecate the 'raspi4b' machine name, renaming it as 'raspi4b-1g' on 32-bit hosts, 'raspi4b-2g' otherwise. - Add the 'raspi4b-4g' and 'raspi4b-8g' machines, with respectively 4GB and 8GB of DRAM. Philippe Mathieu-Daudé (7): hw/arm/raspi4b: Declare machine types using DEFINE_TYPES() macro hw/arm/raspi4b: Introduce abstract raspi4-base machine type hw/arm/raspi4b: Split raspi4b_machine_class_init() in two (1g and 2g) hw/arm/raspi4b: Rename as raspi4b-1g / raspi4b-2g, deprecating old name hw/arm/raspi4b: Expose the raspi4b-1g machine on 64-bit hosts hw/arm/raspi4b: Add the raspi4b-4g machine hw/arm/raspi4b: Add the raspi4b-8g machine docs/about/deprecated.rst | 6 +++ hw/arm/raspi4b.c | 91 +++++++++++++++++++++++++++++++-------- 2 files changed, 79 insertions(+), 18 deletions(-) -- 2.47.1

5 17

[libvirt PATCH] ci: refresh with latest 'lcitool manifest'
by Pavel Hrdina 03 Feb '25

03 Feb '25

Fedora and Alpine updated to latest versions. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- ci/buildenv/{alpine-319.sh => alpine-320.sh} | 0 ci/buildenv/debian-11-cross-aarch64.sh | 2 +- ci/buildenv/debian-11-cross-armv6l.sh | 2 +- ci/buildenv/debian-11-cross-armv7l.sh | 2 +- ci/buildenv/debian-11-cross-i686.sh | 2 +- ci/buildenv/debian-11-cross-mips64el.sh | 2 +- ci/buildenv/debian-11-cross-mipsel.sh | 2 +- ci/buildenv/debian-11-cross-ppc64le.sh | 2 +- ci/buildenv/debian-11-cross-s390x.sh | 2 +- ci/buildenv/debian-11.sh | 2 +- ci/buildenv/debian-12-cross-aarch64.sh | 2 +- ci/buildenv/debian-12-cross-armv6l.sh | 2 +- ci/buildenv/debian-12-cross-armv7l.sh | 2 +- ci/buildenv/debian-12-cross-i686.sh | 2 +- ci/buildenv/debian-12-cross-mips64el.sh | 2 +- ci/buildenv/debian-12-cross-mipsel.sh | 2 +- ci/buildenv/debian-12-cross-ppc64le.sh | 2 +- ci/buildenv/debian-12-cross-s390x.sh | 2 +- ci/buildenv/debian-12.sh | 2 +- ci/buildenv/debian-sid-cross-aarch64.sh | 2 +- ci/buildenv/debian-sid-cross-armv6l.sh | 2 +- ci/buildenv/debian-sid-cross-armv7l.sh | 2 +- ci/buildenv/debian-sid-cross-i686.sh | 2 +- ci/buildenv/debian-sid-cross-mips64el.sh | 2 +- ci/buildenv/debian-sid-cross-ppc64le.sh | 2 +- ci/buildenv/debian-sid-cross-s390x.sh | 2 +- ci/buildenv/debian-sid.sh | 2 +- ...-mingw32.sh => fedora-41-cross-mingw32.sh} | 2 +- ...-mingw64.sh => fedora-41-cross-mingw64.sh} | 2 +- ci/buildenv/{fedora-39.sh => fedora-41.sh} | 3 +- ci/cirrus/freebsd-13.vars | 2 +- ci/cirrus/freebsd-14.vars | 2 +- ...e-319.Dockerfile => alpine-320.Dockerfile} | 2 +- .../debian-11-cross-aarch64.Dockerfile | 2 +- .../debian-11-cross-armv6l.Dockerfile | 2 +- .../debian-11-cross-armv7l.Dockerfile | 2 +- ci/containers/debian-11-cross-i686.Dockerfile | 2 +- .../debian-11-cross-mips64el.Dockerfile | 2 +- .../debian-11-cross-mipsel.Dockerfile | 2 +- .../debian-11-cross-ppc64le.Dockerfile | 2 +- .../debian-11-cross-s390x.Dockerfile | 2 +- ci/containers/debian-11.Dockerfile | 2 +- .../debian-12-cross-aarch64.Dockerfile | 2 +- .../debian-12-cross-armv6l.Dockerfile | 2 +- .../debian-12-cross-armv7l.Dockerfile | 2 +- ci/containers/debian-12-cross-i686.Dockerfile | 2 +- .../debian-12-cross-mips64el.Dockerfile | 2 +- .../debian-12-cross-mipsel.Dockerfile | 2 +- .../debian-12-cross-ppc64le.Dockerfile | 2 +- .../debian-12-cross-s390x.Dockerfile | 2 +- ci/containers/debian-12.Dockerfile | 2 +- .../debian-sid-cross-aarch64.Dockerfile | 2 +- .../debian-sid-cross-armv6l.Dockerfile | 2 +- .../debian-sid-cross-armv7l.Dockerfile | 2 +- .../debian-sid-cross-i686.Dockerfile | 2 +- .../debian-sid-cross-mips64el.Dockerfile | 2 +- .../debian-sid-cross-ppc64le.Dockerfile | 2 +- .../debian-sid-cross-s390x.Dockerfile | 2 +- ci/containers/debian-sid.Dockerfile | 2 +- ...ile => fedora-41-cross-mingw32.Dockerfile} | 4 +- ...ile => fedora-41-cross-mingw64.Dockerfile} | 4 +- ...ora-39.Dockerfile => fedora-41.Dockerfile} | 5 +- ci/gitlab.yml | 1 + ci/gitlab/build-templates.yml | 4 +- ci/gitlab/builds.yml | 54 +++++++++---------- ci/gitlab/containers.yml | 26 ++++----- ci/integration.yml | 20 +++---- ci/manifest.yml | 18 +++---- 68 files changed, 128 insertions(+), 125 deletions(-) rename ci/buildenv/{alpine-319.sh => alpine-320.sh} (100%) rename ci/buildenv/{fedora-40-cross-mingw32.sh => fedora-41-cross-mingw32.sh} (98%) rename ci/buildenv/{fedora-40-cross-mingw64.sh => fedora-41-cross-mingw64.sh} (98%) rename ci/buildenv/{fedora-39.sh => fedora-41.sh} (97%) rename ci/containers/{alpine-319.Dockerfile => alpine-320.Dockerfile} (98%) rename ci/containers/{fedora-40-cross-mingw32.Dockerfile => fedora-41-cross-mingw32.Dockerfile} (96%) rename ci/containers/{fedora-40-cross-mingw64.Dockerfile => fedora-41-cross-mingw64.Dockerfile} (96%) rename ci/containers/{fedora-39.Dockerfile => fedora-41.Dockerfile} (96%) diff --git a/ci/buildenv/alpine-319.sh b/ci/buildenv/alpine-320.sh similarity index 100% rename from ci/buildenv/alpine-319.sh rename to ci/buildenv/alpine-320.sh diff --git a/ci/buildenv/debian-11-cross-aarch64.sh b/ci/buildenv/debian-11-cross-aarch64.sh index 6600b73e74..a52164a851 100644 --- a/ci/buildenv/debian-11-cross-aarch64.sh +++ b/ci/buildenv/debian-11-cross-aarch64.sh @@ -82,7 +82,7 @@ function install_buildenv() { libsanlock-dev:arm64 \ libsasl2-dev:arm64 \ libselinux1-dev:arm64 \ - libssh-gcrypt-dev:arm64 \ + libssh-dev:arm64 \ libssh2-1-dev:arm64 \ libtirpc-dev:arm64 \ libudev-dev:arm64 \ diff --git a/ci/buildenv/debian-11-cross-armv6l.sh b/ci/buildenv/debian-11-cross-armv6l.sh index 761d813df0..caef8e80a4 100644 --- a/ci/buildenv/debian-11-cross-armv6l.sh +++ b/ci/buildenv/debian-11-cross-armv6l.sh @@ -82,7 +82,7 @@ function install_buildenv() { libsanlock-dev:armel \ libsasl2-dev:armel \ libselinux1-dev:armel \ - libssh-gcrypt-dev:armel \ + libssh-dev:armel \ libssh2-1-dev:armel \ libtirpc-dev:armel \ libudev-dev:armel \ diff --git a/ci/buildenv/debian-11-cross-armv7l.sh b/ci/buildenv/debian-11-cross-armv7l.sh index 6c016bd90b..81d92e6386 100644 --- a/ci/buildenv/debian-11-cross-armv7l.sh +++ b/ci/buildenv/debian-11-cross-armv7l.sh @@ -82,7 +82,7 @@ function install_buildenv() { libsanlock-dev:armhf \ libsasl2-dev:armhf \ libselinux1-dev:armhf \ - libssh-gcrypt-dev:armhf \ + libssh-dev:armhf \ libssh2-1-dev:armhf \ libtirpc-dev:armhf \ libudev-dev:armhf \ diff --git a/ci/buildenv/debian-11-cross-i686.sh b/ci/buildenv/debian-11-cross-i686.sh index b9705f1c3c..7ab7242654 100644 --- a/ci/buildenv/debian-11-cross-i686.sh +++ b/ci/buildenv/debian-11-cross-i686.sh @@ -82,7 +82,7 @@ function install_buildenv() { libsanlock-dev:i386 \ libsasl2-dev:i386 \ libselinux1-dev:i386 \ - libssh-gcrypt-dev:i386 \ + libssh-dev:i386 \ libssh2-1-dev:i386 \ libtirpc-dev:i386 \ libudev-dev:i386 \ diff --git a/ci/buildenv/debian-11-cross-mips64el.sh b/ci/buildenv/debian-11-cross-mips64el.sh index 065c61ba57..f983ab2981 100644 --- a/ci/buildenv/debian-11-cross-mips64el.sh +++ b/ci/buildenv/debian-11-cross-mips64el.sh @@ -82,7 +82,7 @@ function install_buildenv() { libsanlock-dev:mips64el \ libsasl2-dev:mips64el \ libselinux1-dev:mips64el \ - libssh-gcrypt-dev:mips64el \ + libssh-dev:mips64el \ libssh2-1-dev:mips64el \ libtirpc-dev:mips64el \ libudev-dev:mips64el \ diff --git a/ci/buildenv/debian-11-cross-mipsel.sh b/ci/buildenv/debian-11-cross-mipsel.sh index 89a0a8904b..55a99b861f 100644 --- a/ci/buildenv/debian-11-cross-mipsel.sh +++ b/ci/buildenv/debian-11-cross-mipsel.sh @@ -82,7 +82,7 @@ function install_buildenv() { libsanlock-dev:mipsel \ libsasl2-dev:mipsel \ libselinux1-dev:mipsel \ - libssh-gcrypt-dev:mipsel \ + libssh-dev:mipsel \ libssh2-1-dev:mipsel \ libtirpc-dev:mipsel \ libudev-dev:mipsel \ diff --git a/ci/buildenv/debian-11-cross-ppc64le.sh b/ci/buildenv/debian-11-cross-ppc64le.sh index c898939f09..b7d26e67fd 100644 --- a/ci/buildenv/debian-11-cross-ppc64le.sh +++ b/ci/buildenv/debian-11-cross-ppc64le.sh @@ -82,7 +82,7 @@ function install_buildenv() { libsanlock-dev:ppc64el \ libsasl2-dev:ppc64el \ libselinux1-dev:ppc64el \ - libssh-gcrypt-dev:ppc64el \ + libssh-dev:ppc64el \ libssh2-1-dev:ppc64el \ libtirpc-dev:ppc64el \ libudev-dev:ppc64el \ diff --git a/ci/buildenv/debian-11-cross-s390x.sh b/ci/buildenv/debian-11-cross-s390x.sh index f1b94ac872..ac259c5625 100644 --- a/ci/buildenv/debian-11-cross-s390x.sh +++ b/ci/buildenv/debian-11-cross-s390x.sh @@ -82,7 +82,7 @@ function install_buildenv() { libsanlock-dev:s390x \ libsasl2-dev:s390x \ libselinux1-dev:s390x \ - libssh-gcrypt-dev:s390x \ + libssh-dev:s390x \ libssh2-1-dev:s390x \ libtirpc-dev:s390x \ libudev-dev:s390x \ diff --git a/ci/buildenv/debian-11.sh b/ci/buildenv/debian-11.sh index 9ba9e80183..affdf6e445 100644 --- a/ci/buildenv/debian-11.sh +++ b/ci/buildenv/debian-11.sh @@ -57,7 +57,7 @@ function install_buildenv() { libsanlock-dev \ libsasl2-dev \ libselinux1-dev \ - libssh-gcrypt-dev \ + libssh-dev \ libssh2-1-dev \ libtirpc-dev \ libudev-dev \ diff --git a/ci/buildenv/debian-12-cross-aarch64.sh b/ci/buildenv/debian-12-cross-aarch64.sh index b4a056d940..1d69c099a4 100644 --- a/ci/buildenv/debian-12-cross-aarch64.sh +++ b/ci/buildenv/debian-12-cross-aarch64.sh @@ -83,7 +83,7 @@ function install_buildenv() { libsanlock-dev:arm64 \ libsasl2-dev:arm64 \ libselinux1-dev:arm64 \ - libssh-gcrypt-dev:arm64 \ + libssh-dev:arm64 \ libssh2-1-dev:arm64 \ libtirpc-dev:arm64 \ libudev-dev:arm64 \ diff --git a/ci/buildenv/debian-12-cross-armv6l.sh b/ci/buildenv/debian-12-cross-armv6l.sh index 07ffb3da37..db2ee46af5 100644 --- a/ci/buildenv/debian-12-cross-armv6l.sh +++ b/ci/buildenv/debian-12-cross-armv6l.sh @@ -83,7 +83,7 @@ function install_buildenv() { libsanlock-dev:armel \ libsasl2-dev:armel \ libselinux1-dev:armel \ - libssh-gcrypt-dev:armel \ + libssh-dev:armel \ libssh2-1-dev:armel \ libtirpc-dev:armel \ libudev-dev:armel \ diff --git a/ci/buildenv/debian-12-cross-armv7l.sh b/ci/buildenv/debian-12-cross-armv7l.sh index 6f88f6cc06..9ab435d0d7 100644 --- a/ci/buildenv/debian-12-cross-armv7l.sh +++ b/ci/buildenv/debian-12-cross-armv7l.sh @@ -83,7 +83,7 @@ function install_buildenv() { libsanlock-dev:armhf \ libsasl2-dev:armhf \ libselinux1-dev:armhf \ - libssh-gcrypt-dev:armhf \ + libssh-dev:armhf \ libssh2-1-dev:armhf \ libtirpc-dev:armhf \ libudev-dev:armhf \ diff --git a/ci/buildenv/debian-12-cross-i686.sh b/ci/buildenv/debian-12-cross-i686.sh index 5da816d086..fbc6da5dd4 100644 --- a/ci/buildenv/debian-12-cross-i686.sh +++ b/ci/buildenv/debian-12-cross-i686.sh @@ -83,7 +83,7 @@ function install_buildenv() { libsanlock-dev:i386 \ libsasl2-dev:i386 \ libselinux1-dev:i386 \ - libssh-gcrypt-dev:i386 \ + libssh-dev:i386 \ libssh2-1-dev:i386 \ libtirpc-dev:i386 \ libudev-dev:i386 \ diff --git a/ci/buildenv/debian-12-cross-mips64el.sh b/ci/buildenv/debian-12-cross-mips64el.sh index 09c445758c..f7067dfeb3 100644 --- a/ci/buildenv/debian-12-cross-mips64el.sh +++ b/ci/buildenv/debian-12-cross-mips64el.sh @@ -83,7 +83,7 @@ function install_buildenv() { libsanlock-dev:mips64el \ libsasl2-dev:mips64el \ libselinux1-dev:mips64el \ - libssh-gcrypt-dev:mips64el \ + libssh-dev:mips64el \ libssh2-1-dev:mips64el \ libtirpc-dev:mips64el \ libudev-dev:mips64el \ diff --git a/ci/buildenv/debian-12-cross-mipsel.sh b/ci/buildenv/debian-12-cross-mipsel.sh index a762d1e3b8..6dd5333ae4 100644 --- a/ci/buildenv/debian-12-cross-mipsel.sh +++ b/ci/buildenv/debian-12-cross-mipsel.sh @@ -83,7 +83,7 @@ function install_buildenv() { libsanlock-dev:mipsel \ libsasl2-dev:mipsel \ libselinux1-dev:mipsel \ - libssh-gcrypt-dev:mipsel \ + libssh-dev:mipsel \ libssh2-1-dev:mipsel \ libtirpc-dev:mipsel \ libudev-dev:mipsel \ diff --git a/ci/buildenv/debian-12-cross-ppc64le.sh b/ci/buildenv/debian-12-cross-ppc64le.sh index fe7b672799..97de655904 100644 --- a/ci/buildenv/debian-12-cross-ppc64le.sh +++ b/ci/buildenv/debian-12-cross-ppc64le.sh @@ -83,7 +83,7 @@ function install_buildenv() { libsanlock-dev:ppc64el \ libsasl2-dev:ppc64el \ libselinux1-dev:ppc64el \ - libssh-gcrypt-dev:ppc64el \ + libssh-dev:ppc64el \ libssh2-1-dev:ppc64el \ libtirpc-dev:ppc64el \ libudev-dev:ppc64el \ diff --git a/ci/buildenv/debian-12-cross-s390x.sh b/ci/buildenv/debian-12-cross-s390x.sh index 1ca0768d14..725d1ee113 100644 --- a/ci/buildenv/debian-12-cross-s390x.sh +++ b/ci/buildenv/debian-12-cross-s390x.sh @@ -83,7 +83,7 @@ function install_buildenv() { libsanlock-dev:s390x \ libsasl2-dev:s390x \ libselinux1-dev:s390x \ - libssh-gcrypt-dev:s390x \ + libssh-dev:s390x \ libssh2-1-dev:s390x \ libtirpc-dev:s390x \ libudev-dev:s390x \ diff --git a/ci/buildenv/debian-12.sh b/ci/buildenv/debian-12.sh index fcd5291f22..5e5b759f08 100644 --- a/ci/buildenv/debian-12.sh +++ b/ci/buildenv/debian-12.sh @@ -57,7 +57,7 @@ function install_buildenv() { libsanlock-dev \ libsasl2-dev \ libselinux1-dev \ - libssh-gcrypt-dev \ + libssh-dev \ libssh2-1-dev \ libtirpc-dev \ libudev-dev \ diff --git a/ci/buildenv/debian-sid-cross-aarch64.sh b/ci/buildenv/debian-sid-cross-aarch64.sh index b4a056d940..1d69c099a4 100644 --- a/ci/buildenv/debian-sid-cross-aarch64.sh +++ b/ci/buildenv/debian-sid-cross-aarch64.sh @@ -83,7 +83,7 @@ function install_buildenv() { libsanlock-dev:arm64 \ libsasl2-dev:arm64 \ libselinux1-dev:arm64 \ - libssh-gcrypt-dev:arm64 \ + libssh-dev:arm64 \ libssh2-1-dev:arm64 \ libtirpc-dev:arm64 \ libudev-dev:arm64 \ diff --git a/ci/buildenv/debian-sid-cross-armv6l.sh b/ci/buildenv/debian-sid-cross-armv6l.sh index 53d2d79b38..ac03caeb5c 100644 --- a/ci/buildenv/debian-sid-cross-armv6l.sh +++ b/ci/buildenv/debian-sid-cross-armv6l.sh @@ -82,7 +82,7 @@ function install_buildenv() { libsanlock-dev:armel \ libsasl2-dev:armel \ libselinux1-dev:armel \ - libssh-gcrypt-dev:armel \ + libssh-dev:armel \ libssh2-1-dev:armel \ libtirpc-dev:armel \ libudev-dev:armel \ diff --git a/ci/buildenv/debian-sid-cross-armv7l.sh b/ci/buildenv/debian-sid-cross-armv7l.sh index 4e60877e77..c540104cb0 100644 --- a/ci/buildenv/debian-sid-cross-armv7l.sh +++ b/ci/buildenv/debian-sid-cross-armv7l.sh @@ -82,7 +82,7 @@ function install_buildenv() { libsanlock-dev:armhf \ libsasl2-dev:armhf \ libselinux1-dev:armhf \ - libssh-gcrypt-dev:armhf \ + libssh-dev:armhf \ libssh2-1-dev:armhf \ libtirpc-dev:armhf \ libudev-dev:armhf \ diff --git a/ci/buildenv/debian-sid-cross-i686.sh b/ci/buildenv/debian-sid-cross-i686.sh index 98e08b2397..b558576fca 100644 --- a/ci/buildenv/debian-sid-cross-i686.sh +++ b/ci/buildenv/debian-sid-cross-i686.sh @@ -82,7 +82,7 @@ function install_buildenv() { libsanlock-dev:i386 \ libsasl2-dev:i386 \ libselinux1-dev:i386 \ - libssh-gcrypt-dev:i386 \ + libssh-dev:i386 \ libssh2-1-dev:i386 \ libtirpc-dev:i386 \ libudev-dev:i386 \ diff --git a/ci/buildenv/debian-sid-cross-mips64el.sh b/ci/buildenv/debian-sid-cross-mips64el.sh index 09c445758c..f7067dfeb3 100644 --- a/ci/buildenv/debian-sid-cross-mips64el.sh +++ b/ci/buildenv/debian-sid-cross-mips64el.sh @@ -83,7 +83,7 @@ function install_buildenv() { libsanlock-dev:mips64el \ libsasl2-dev:mips64el \ libselinux1-dev:mips64el \ - libssh-gcrypt-dev:mips64el \ + libssh-dev:mips64el \ libssh2-1-dev:mips64el \ libtirpc-dev:mips64el \ libudev-dev:mips64el \ diff --git a/ci/buildenv/debian-sid-cross-ppc64le.sh b/ci/buildenv/debian-sid-cross-ppc64le.sh index fe7b672799..97de655904 100644 --- a/ci/buildenv/debian-sid-cross-ppc64le.sh +++ b/ci/buildenv/debian-sid-cross-ppc64le.sh @@ -83,7 +83,7 @@ function install_buildenv() { libsanlock-dev:ppc64el \ libsasl2-dev:ppc64el \ libselinux1-dev:ppc64el \ - libssh-gcrypt-dev:ppc64el \ + libssh-dev:ppc64el \ libssh2-1-dev:ppc64el \ libtirpc-dev:ppc64el \ libudev-dev:ppc64el \ diff --git a/ci/buildenv/debian-sid-cross-s390x.sh b/ci/buildenv/debian-sid-cross-s390x.sh index 1ca0768d14..725d1ee113 100644 --- a/ci/buildenv/debian-sid-cross-s390x.sh +++ b/ci/buildenv/debian-sid-cross-s390x.sh @@ -83,7 +83,7 @@ function install_buildenv() { libsanlock-dev:s390x \ libsasl2-dev:s390x \ libselinux1-dev:s390x \ - libssh-gcrypt-dev:s390x \ + libssh-dev:s390x \ libssh2-1-dev:s390x \ libtirpc-dev:s390x \ libudev-dev:s390x \ diff --git a/ci/buildenv/debian-sid.sh b/ci/buildenv/debian-sid.sh index fcd5291f22..5e5b759f08 100644 --- a/ci/buildenv/debian-sid.sh +++ b/ci/buildenv/debian-sid.sh @@ -57,7 +57,7 @@ function install_buildenv() { libsanlock-dev \ libsasl2-dev \ libselinux1-dev \ - libssh-gcrypt-dev \ + libssh-dev \ libssh2-1-dev \ libtirpc-dev \ libudev-dev \ diff --git a/ci/buildenv/fedora-40-cross-mingw32.sh b/ci/buildenv/fedora-41-cross-mingw32.sh similarity index 98% rename from ci/buildenv/fedora-40-cross-mingw32.sh rename to ci/buildenv/fedora-41-cross-mingw32.sh index 9104b2e20e..b19f0dccb2 100644 --- a/ci/buildenv/fedora-40-cross-mingw32.sh +++ b/ci/buildenv/fedora-41-cross-mingw32.sh @@ -8,7 +8,7 @@ function install_buildenv() { dnf update -y dnf install -y \ augeas \ - bash-completion \ + bash-completion-devel \ ca-certificates \ ccache \ codespell \ diff --git a/ci/buildenv/fedora-40-cross-mingw64.sh b/ci/buildenv/fedora-41-cross-mingw64.sh similarity index 98% rename from ci/buildenv/fedora-40-cross-mingw64.sh rename to ci/buildenv/fedora-41-cross-mingw64.sh index 35120064ec..20dca703b5 100644 --- a/ci/buildenv/fedora-40-cross-mingw64.sh +++ b/ci/buildenv/fedora-41-cross-mingw64.sh @@ -8,7 +8,7 @@ function install_buildenv() { dnf update -y dnf install -y \ augeas \ - bash-completion \ + bash-completion-devel \ ca-certificates \ ccache \ codespell \ diff --git a/ci/buildenv/fedora-39.sh b/ci/buildenv/fedora-41.sh similarity index 97% rename from ci/buildenv/fedora-39.sh rename to ci/buildenv/fedora-41.sh index e45ac2230f..c32a689fbd 100644 --- a/ci/buildenv/fedora-39.sh +++ b/ci/buildenv/fedora-41.sh @@ -9,7 +9,7 @@ function install_buildenv() { dnf install -y \ audit-libs-devel \ augeas \ - bash-completion \ + bash-completion-devel \ ca-certificates \ ccache \ clang \ @@ -82,6 +82,7 @@ function install_buildenv() { systemd-devel \ systemd-rpm-macros \ systemtap-sdt-devel \ + systemtap-sdt-dtrace \ wireshark-devel \ xen-devel rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED diff --git a/ci/cirrus/freebsd-13.vars b/ci/cirrus/freebsd-13.vars index fbcd613095..56b66e3b2a 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 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 polkit 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 3002987cbd..fb665d16ee 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 ccache 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 polkit py311-black py311-docutils py311-flake8 py311-pytest python3 qemu readline' PYPI_PKGS='' PYTHON='/usr/local/bin/python3' diff --git a/ci/containers/alpine-319.Dockerfile b/ci/containers/alpine-320.Dockerfile similarity index 98% rename from ci/containers/alpine-319.Dockerfile rename to ci/containers/alpine-320.Dockerfile index 2e4842ef3e..1b95c92e65 100644 --- a/ci/containers/alpine-319.Dockerfile +++ b/ci/containers/alpine-320.Dockerfile @@ -4,7 +4,7 @@ # # https://gitlab.com/libvirt/libvirt-ci -FROM docker.io/library/alpine:3.19 +FROM docker.io/library/alpine:3.20 RUN apk update && \ apk upgrade && \ diff --git a/ci/containers/debian-11-cross-aarch64.Dockerfile b/ci/containers/debian-11-cross-aarch64.Dockerfile index f8d4ea8ed2..79c359f9fa 100644 --- a/ci/containers/debian-11-cross-aarch64.Dockerfile +++ b/ci/containers/debian-11-cross-aarch64.Dockerfile @@ -93,7 +93,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:arm64 \ libsasl2-dev:arm64 \ libselinux1-dev:arm64 \ - libssh-gcrypt-dev:arm64 \ + libssh-dev:arm64 \ libssh2-1-dev:arm64 \ libtirpc-dev:arm64 \ libudev-dev:arm64 \ diff --git a/ci/containers/debian-11-cross-armv6l.Dockerfile b/ci/containers/debian-11-cross-armv6l.Dockerfile index f974163000..27bd6c578b 100644 --- a/ci/containers/debian-11-cross-armv6l.Dockerfile +++ b/ci/containers/debian-11-cross-armv6l.Dockerfile @@ -93,7 +93,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:armel \ libsasl2-dev:armel \ libselinux1-dev:armel \ - libssh-gcrypt-dev:armel \ + libssh-dev:armel \ libssh2-1-dev:armel \ libtirpc-dev:armel \ libudev-dev:armel \ diff --git a/ci/containers/debian-11-cross-armv7l.Dockerfile b/ci/containers/debian-11-cross-armv7l.Dockerfile index ced175c7c0..3b413673a6 100644 --- a/ci/containers/debian-11-cross-armv7l.Dockerfile +++ b/ci/containers/debian-11-cross-armv7l.Dockerfile @@ -93,7 +93,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:armhf \ libsasl2-dev:armhf \ libselinux1-dev:armhf \ - libssh-gcrypt-dev:armhf \ + libssh-dev:armhf \ libssh2-1-dev:armhf \ libtirpc-dev:armhf \ libudev-dev:armhf \ diff --git a/ci/containers/debian-11-cross-i686.Dockerfile b/ci/containers/debian-11-cross-i686.Dockerfile index c1ee60f3b6..ab5173f2f1 100644 --- a/ci/containers/debian-11-cross-i686.Dockerfile +++ b/ci/containers/debian-11-cross-i686.Dockerfile @@ -93,7 +93,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:i386 \ libsasl2-dev:i386 \ libselinux1-dev:i386 \ - libssh-gcrypt-dev:i386 \ + libssh-dev:i386 \ libssh2-1-dev:i386 \ libtirpc-dev:i386 \ libudev-dev:i386 \ diff --git a/ci/containers/debian-11-cross-mips64el.Dockerfile b/ci/containers/debian-11-cross-mips64el.Dockerfile index 98c40beef4..04fa68f688 100644 --- a/ci/containers/debian-11-cross-mips64el.Dockerfile +++ b/ci/containers/debian-11-cross-mips64el.Dockerfile @@ -93,7 +93,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:mips64el \ libsasl2-dev:mips64el \ libselinux1-dev:mips64el \ - libssh-gcrypt-dev:mips64el \ + libssh-dev:mips64el \ libssh2-1-dev:mips64el \ libtirpc-dev:mips64el \ libudev-dev:mips64el \ diff --git a/ci/containers/debian-11-cross-mipsel.Dockerfile b/ci/containers/debian-11-cross-mipsel.Dockerfile index e3531a9fac..558382ad25 100644 --- a/ci/containers/debian-11-cross-mipsel.Dockerfile +++ b/ci/containers/debian-11-cross-mipsel.Dockerfile @@ -93,7 +93,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:mipsel \ libsasl2-dev:mipsel \ libselinux1-dev:mipsel \ - libssh-gcrypt-dev:mipsel \ + libssh-dev:mipsel \ libssh2-1-dev:mipsel \ libtirpc-dev:mipsel \ libudev-dev:mipsel \ diff --git a/ci/containers/debian-11-cross-ppc64le.Dockerfile b/ci/containers/debian-11-cross-ppc64le.Dockerfile index 8f9f729909..ed68e8f0af 100644 --- a/ci/containers/debian-11-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-11-cross-ppc64le.Dockerfile @@ -93,7 +93,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:ppc64el \ libsasl2-dev:ppc64el \ libselinux1-dev:ppc64el \ - libssh-gcrypt-dev:ppc64el \ + libssh-dev:ppc64el \ libssh2-1-dev:ppc64el \ libtirpc-dev:ppc64el \ libudev-dev:ppc64el \ diff --git a/ci/containers/debian-11-cross-s390x.Dockerfile b/ci/containers/debian-11-cross-s390x.Dockerfile index b09076b148..62791ac154 100644 --- a/ci/containers/debian-11-cross-s390x.Dockerfile +++ b/ci/containers/debian-11-cross-s390x.Dockerfile @@ -93,7 +93,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:s390x \ libsasl2-dev:s390x \ libselinux1-dev:s390x \ - libssh-gcrypt-dev:s390x \ + libssh-dev:s390x \ libssh2-1-dev:s390x \ libtirpc-dev:s390x \ libudev-dev:s390x \ diff --git a/ci/containers/debian-11.Dockerfile b/ci/containers/debian-11.Dockerfile index 1660bd9c52..48c59e3aab 100644 --- a/ci/containers/debian-11.Dockerfile +++ b/ci/containers/debian-11.Dockerfile @@ -59,7 +59,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev \ libsasl2-dev \ libselinux1-dev \ - libssh-gcrypt-dev \ + libssh-dev \ libssh2-1-dev \ libtirpc-dev \ libudev-dev \ diff --git a/ci/containers/debian-12-cross-aarch64.Dockerfile b/ci/containers/debian-12-cross-aarch64.Dockerfile index f4d587177b..ebccfbc203 100644 --- a/ci/containers/debian-12-cross-aarch64.Dockerfile +++ b/ci/containers/debian-12-cross-aarch64.Dockerfile @@ -94,7 +94,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:arm64 \ libsasl2-dev:arm64 \ libselinux1-dev:arm64 \ - libssh-gcrypt-dev:arm64 \ + libssh-dev:arm64 \ libssh2-1-dev:arm64 \ libtirpc-dev:arm64 \ libudev-dev:arm64 \ diff --git a/ci/containers/debian-12-cross-armv6l.Dockerfile b/ci/containers/debian-12-cross-armv6l.Dockerfile index d8f2a3bc42..a6f51c80fd 100644 --- a/ci/containers/debian-12-cross-armv6l.Dockerfile +++ b/ci/containers/debian-12-cross-armv6l.Dockerfile @@ -94,7 +94,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:armel \ libsasl2-dev:armel \ libselinux1-dev:armel \ - libssh-gcrypt-dev:armel \ + libssh-dev:armel \ libssh2-1-dev:armel \ libtirpc-dev:armel \ libudev-dev:armel \ diff --git a/ci/containers/debian-12-cross-armv7l.Dockerfile b/ci/containers/debian-12-cross-armv7l.Dockerfile index 1abfb79931..132938ce10 100644 --- a/ci/containers/debian-12-cross-armv7l.Dockerfile +++ b/ci/containers/debian-12-cross-armv7l.Dockerfile @@ -94,7 +94,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:armhf \ libsasl2-dev:armhf \ libselinux1-dev:armhf \ - libssh-gcrypt-dev:armhf \ + libssh-dev:armhf \ libssh2-1-dev:armhf \ libtirpc-dev:armhf \ libudev-dev:armhf \ diff --git a/ci/containers/debian-12-cross-i686.Dockerfile b/ci/containers/debian-12-cross-i686.Dockerfile index 5681121d80..3a76ee4e76 100644 --- a/ci/containers/debian-12-cross-i686.Dockerfile +++ b/ci/containers/debian-12-cross-i686.Dockerfile @@ -94,7 +94,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:i386 \ libsasl2-dev:i386 \ libselinux1-dev:i386 \ - libssh-gcrypt-dev:i386 \ + libssh-dev:i386 \ libssh2-1-dev:i386 \ libtirpc-dev:i386 \ libudev-dev:i386 \ diff --git a/ci/containers/debian-12-cross-mips64el.Dockerfile b/ci/containers/debian-12-cross-mips64el.Dockerfile index a4f2aabe10..c8009062ef 100644 --- a/ci/containers/debian-12-cross-mips64el.Dockerfile +++ b/ci/containers/debian-12-cross-mips64el.Dockerfile @@ -94,7 +94,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:mips64el \ libsasl2-dev:mips64el \ libselinux1-dev:mips64el \ - libssh-gcrypt-dev:mips64el \ + libssh-dev:mips64el \ libssh2-1-dev:mips64el \ libtirpc-dev:mips64el \ libudev-dev:mips64el \ diff --git a/ci/containers/debian-12-cross-mipsel.Dockerfile b/ci/containers/debian-12-cross-mipsel.Dockerfile index a3f0652818..efb4639a26 100644 --- a/ci/containers/debian-12-cross-mipsel.Dockerfile +++ b/ci/containers/debian-12-cross-mipsel.Dockerfile @@ -94,7 +94,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:mipsel \ libsasl2-dev:mipsel \ libselinux1-dev:mipsel \ - libssh-gcrypt-dev:mipsel \ + libssh-dev:mipsel \ libssh2-1-dev:mipsel \ libtirpc-dev:mipsel \ libudev-dev:mipsel \ diff --git a/ci/containers/debian-12-cross-ppc64le.Dockerfile b/ci/containers/debian-12-cross-ppc64le.Dockerfile index caf8229a8e..3b0cfab7ef 100644 --- a/ci/containers/debian-12-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-12-cross-ppc64le.Dockerfile @@ -94,7 +94,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:ppc64el \ libsasl2-dev:ppc64el \ libselinux1-dev:ppc64el \ - libssh-gcrypt-dev:ppc64el \ + libssh-dev:ppc64el \ libssh2-1-dev:ppc64el \ libtirpc-dev:ppc64el \ libudev-dev:ppc64el \ diff --git a/ci/containers/debian-12-cross-s390x.Dockerfile b/ci/containers/debian-12-cross-s390x.Dockerfile index c4f8479c13..c730b44e03 100644 --- a/ci/containers/debian-12-cross-s390x.Dockerfile +++ b/ci/containers/debian-12-cross-s390x.Dockerfile @@ -94,7 +94,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:s390x \ libsasl2-dev:s390x \ libselinux1-dev:s390x \ - libssh-gcrypt-dev:s390x \ + libssh-dev:s390x \ libssh2-1-dev:s390x \ libtirpc-dev:s390x \ libudev-dev:s390x \ diff --git a/ci/containers/debian-12.Dockerfile b/ci/containers/debian-12.Dockerfile index 3e6d0597e2..778f6962d9 100644 --- a/ci/containers/debian-12.Dockerfile +++ b/ci/containers/debian-12.Dockerfile @@ -59,7 +59,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev \ libsasl2-dev \ libselinux1-dev \ - libssh-gcrypt-dev \ + libssh-dev \ libssh2-1-dev \ libtirpc-dev \ libudev-dev \ diff --git a/ci/containers/debian-sid-cross-aarch64.Dockerfile b/ci/containers/debian-sid-cross-aarch64.Dockerfile index 3a06f01c5c..2d0e4d8a98 100644 --- a/ci/containers/debian-sid-cross-aarch64.Dockerfile +++ b/ci/containers/debian-sid-cross-aarch64.Dockerfile @@ -94,7 +94,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:arm64 \ libsasl2-dev:arm64 \ libselinux1-dev:arm64 \ - libssh-gcrypt-dev:arm64 \ + libssh-dev:arm64 \ libssh2-1-dev:arm64 \ libtirpc-dev:arm64 \ libudev-dev:arm64 \ diff --git a/ci/containers/debian-sid-cross-armv6l.Dockerfile b/ci/containers/debian-sid-cross-armv6l.Dockerfile index fdf129aa04..d3034c0131 100644 --- a/ci/containers/debian-sid-cross-armv6l.Dockerfile +++ b/ci/containers/debian-sid-cross-armv6l.Dockerfile @@ -93,7 +93,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:armel \ libsasl2-dev:armel \ libselinux1-dev:armel \ - libssh-gcrypt-dev:armel \ + libssh-dev:armel \ libssh2-1-dev:armel \ libtirpc-dev:armel \ libudev-dev:armel \ diff --git a/ci/containers/debian-sid-cross-armv7l.Dockerfile b/ci/containers/debian-sid-cross-armv7l.Dockerfile index 8dbb705d69..30234b6755 100644 --- a/ci/containers/debian-sid-cross-armv7l.Dockerfile +++ b/ci/containers/debian-sid-cross-armv7l.Dockerfile @@ -93,7 +93,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:armhf \ libsasl2-dev:armhf \ libselinux1-dev:armhf \ - libssh-gcrypt-dev:armhf \ + libssh-dev:armhf \ libssh2-1-dev:armhf \ libtirpc-dev:armhf \ libudev-dev:armhf \ diff --git a/ci/containers/debian-sid-cross-i686.Dockerfile b/ci/containers/debian-sid-cross-i686.Dockerfile index f856306a62..2c2c4772c8 100644 --- a/ci/containers/debian-sid-cross-i686.Dockerfile +++ b/ci/containers/debian-sid-cross-i686.Dockerfile @@ -93,7 +93,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:i386 \ libsasl2-dev:i386 \ libselinux1-dev:i386 \ - libssh-gcrypt-dev:i386 \ + libssh-dev:i386 \ libssh2-1-dev:i386 \ libtirpc-dev:i386 \ libudev-dev:i386 \ diff --git a/ci/containers/debian-sid-cross-mips64el.Dockerfile b/ci/containers/debian-sid-cross-mips64el.Dockerfile index 468c5fbc3e..0af87394cc 100644 --- a/ci/containers/debian-sid-cross-mips64el.Dockerfile +++ b/ci/containers/debian-sid-cross-mips64el.Dockerfile @@ -94,7 +94,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:mips64el \ libsasl2-dev:mips64el \ libselinux1-dev:mips64el \ - libssh-gcrypt-dev:mips64el \ + libssh-dev:mips64el \ libssh2-1-dev:mips64el \ libtirpc-dev:mips64el \ libudev-dev:mips64el \ diff --git a/ci/containers/debian-sid-cross-ppc64le.Dockerfile b/ci/containers/debian-sid-cross-ppc64le.Dockerfile index 37c256fe1e..d91a84c65b 100644 --- a/ci/containers/debian-sid-cross-ppc64le.Dockerfile +++ b/ci/containers/debian-sid-cross-ppc64le.Dockerfile @@ -94,7 +94,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:ppc64el \ libsasl2-dev:ppc64el \ libselinux1-dev:ppc64el \ - libssh-gcrypt-dev:ppc64el \ + libssh-dev:ppc64el \ libssh2-1-dev:ppc64el \ libtirpc-dev:ppc64el \ libudev-dev:ppc64el \ diff --git a/ci/containers/debian-sid-cross-s390x.Dockerfile b/ci/containers/debian-sid-cross-s390x.Dockerfile index 232a8d7844..147c5e992f 100644 --- a/ci/containers/debian-sid-cross-s390x.Dockerfile +++ b/ci/containers/debian-sid-cross-s390x.Dockerfile @@ -94,7 +94,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev:s390x \ libsasl2-dev:s390x \ libselinux1-dev:s390x \ - libssh-gcrypt-dev:s390x \ + libssh-dev:s390x \ libssh2-1-dev:s390x \ libtirpc-dev:s390x \ libudev-dev:s390x \ diff --git a/ci/containers/debian-sid.Dockerfile b/ci/containers/debian-sid.Dockerfile index febd286d86..daa750324b 100644 --- a/ci/containers/debian-sid.Dockerfile +++ b/ci/containers/debian-sid.Dockerfile @@ -59,7 +59,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libsanlock-dev \ libsasl2-dev \ libselinux1-dev \ - libssh-gcrypt-dev \ + libssh-dev \ libssh2-1-dev \ libtirpc-dev \ libudev-dev \ diff --git a/ci/containers/fedora-40-cross-mingw32.Dockerfile b/ci/containers/fedora-41-cross-mingw32.Dockerfile similarity index 96% rename from ci/containers/fedora-40-cross-mingw32.Dockerfile rename to ci/containers/fedora-41-cross-mingw32.Dockerfile index ed8566f273..6ab14be6fc 100644 --- a/ci/containers/fedora-40-cross-mingw32.Dockerfile +++ b/ci/containers/fedora-41-cross-mingw32.Dockerfile @@ -4,7 +4,7 @@ # # https://gitlab.com/libvirt/libvirt-ci -FROM registry.fedoraproject.org/fedora:40 +FROM registry.fedoraproject.org/fedora:41 RUN dnf install -y nosync && \ printf '#!/bin/sh\n\ @@ -19,7 +19,7 @@ exec "$@"\n' > /usr/bin/nosync && \ nosync dnf update -y && \ nosync dnf install -y \ augeas \ - bash-completion \ + bash-completion-devel \ ca-certificates \ ccache \ codespell \ diff --git a/ci/containers/fedora-40-cross-mingw64.Dockerfile b/ci/containers/fedora-41-cross-mingw64.Dockerfile similarity index 96% rename from ci/containers/fedora-40-cross-mingw64.Dockerfile rename to ci/containers/fedora-41-cross-mingw64.Dockerfile index b030427e0c..a0ec65d74a 100644 --- a/ci/containers/fedora-40-cross-mingw64.Dockerfile +++ b/ci/containers/fedora-41-cross-mingw64.Dockerfile @@ -4,7 +4,7 @@ # # https://gitlab.com/libvirt/libvirt-ci -FROM registry.fedoraproject.org/fedora:40 +FROM registry.fedoraproject.org/fedora:41 RUN dnf install -y nosync && \ printf '#!/bin/sh\n\ @@ -19,7 +19,7 @@ exec "$@"\n' > /usr/bin/nosync && \ nosync dnf update -y && \ nosync dnf install -y \ augeas \ - bash-completion \ + bash-completion-devel \ ca-certificates \ ccache \ codespell \ diff --git a/ci/containers/fedora-39.Dockerfile b/ci/containers/fedora-41.Dockerfile similarity index 96% rename from ci/containers/fedora-39.Dockerfile rename to ci/containers/fedora-41.Dockerfile index 2e35ca426d..a46f220de0 100644 --- a/ci/containers/fedora-39.Dockerfile +++ b/ci/containers/fedora-41.Dockerfile @@ -4,7 +4,7 @@ # # https://gitlab.com/libvirt/libvirt-ci -FROM registry.fedoraproject.org/fedora:39 +FROM registry.fedoraproject.org/fedora:41 RUN dnf install -y nosync && \ printf '#!/bin/sh\n\ @@ -20,7 +20,7 @@ exec "$@"\n' > /usr/bin/nosync && \ nosync dnf install -y \ audit-libs-devel \ augeas \ - bash-completion \ + bash-completion-devel \ ca-certificates \ ccache \ clang \ @@ -93,6 +93,7 @@ exec "$@"\n' > /usr/bin/nosync && \ systemd-devel \ systemd-rpm-macros \ systemtap-sdt-devel \ + systemtap-sdt-dtrace \ wireshark-devel \ xen-devel && \ nosync dnf autoremove -y && \ diff --git a/ci/gitlab.yml b/ci/gitlab.yml index 0daab12676..0e6de9f36d 100644 --- a/ci/gitlab.yml +++ b/ci/gitlab.yml @@ -55,6 +55,7 @@ variables: RUN_UPSTREAM_NAMESPACE: libvirt + CONTAINER_UPSTREAM_NAMESPACE: libvirt FF_SCRIPT_SECTIONS: 1 diff --git a/ci/gitlab/build-templates.yml b/ci/gitlab/build-templates.yml index 5ba91ffc67..a4b76e06d0 100644 --- a/ci/gitlab/build-templates.yml +++ b/ci/gitlab/build-templates.yml @@ -35,7 +35,7 @@ fi - cat /packages.txt variables: - IMAGE: $CI_REGISTRY/$RUN_UPSTREAM_NAMESPACE/libvirt/ci-$NAME:latest + IMAGE: $CI_REGISTRY/$CONTAINER_UPSTREAM_NAMESPACE/libvirt/ci-$NAME:latest rules: ### PUSH events @@ -179,7 +179,7 @@ fi - cat /packages.txt variables: - IMAGE: $CI_REGISTRY/$RUN_UPSTREAM_NAMESPACE/libvirt/ci-$NAME-cross-$CROSS:latest + IMAGE: $CI_REGISTRY/$CONTAINER_UPSTREAM_NAMESPACE/libvirt/ci-$NAME-cross-$CROSS:latest rules: ### PUSH events diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml index 3e7f36802e..fc0001b70a 100644 --- a/ci/gitlab/builds.yml +++ b/ci/gitlab/builds.yml @@ -33,15 +33,15 @@ x86_64-almalinux-9-clang: TARGET_BASE_IMAGE: docker.io/library/almalinux:9 -x86_64-alpine-319: +x86_64-alpine-320: extends: .native_build_job needs: - - job: x86_64-alpine-319-container + - job: x86_64-alpine-320-container optional: true allow_failure: false variables: - NAME: alpine-319 - TARGET_BASE_IMAGE: docker.io/library/alpine:3.19 + NAME: alpine-320 + TARGET_BASE_IMAGE: docker.io/library/alpine:3.20 x86_64-alpine-edge: @@ -127,21 +127,6 @@ x86_64-debian-sid: TARGET_BASE_IMAGE: docker.io/library/debian:sid-slim -x86_64-fedora-39: - extends: .native_build_job - needs: - - job: x86_64-fedora-39-container - optional: true - allow_failure: false - variables: - NAME: fedora-39 - TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:39 - artifacts: - expire_in: 1 day - paths: - - libvirt-rpms - - x86_64-fedora-40: extends: .native_build_job needs: @@ -157,6 +142,21 @@ x86_64-fedora-40: - libvirt-rpms +x86_64-fedora-41: + extends: .native_build_job + needs: + - job: x86_64-fedora-41-container + optional: true + allow_failure: false + variables: + NAME: fedora-41 + TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:41 + artifacts: + expire_in: 1 day + paths: + - libvirt-rpms + + x86_64-fedora-rawhide: extends: .native_build_job needs: @@ -544,29 +544,29 @@ s390x-debian-sid: TARGET_BASE_IMAGE: docker.io/library/debian:sid-slim -mingw32-fedora-40: +mingw32-fedora-41: extends: .cross_build_job needs: - - job: mingw32-fedora-40-container + - job: mingw32-fedora-41-container optional: true allow_failure: false variables: CROSS: mingw32 JOB_OPTIONAL: 1 - NAME: fedora-40 - TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:40 + NAME: fedora-41 + TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:41 -mingw64-fedora-40: +mingw64-fedora-41: extends: .cross_build_job needs: - - job: mingw64-fedora-40-container + - job: mingw64-fedora-41-container optional: true allow_failure: false variables: CROSS: mingw64 - NAME: fedora-40 - TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:40 + NAME: fedora-41 + TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:41 mingw32-fedora-rawhide: diff --git a/ci/gitlab/containers.yml b/ci/gitlab/containers.yml index 55137dc1c3..b4244650c3 100644 --- a/ci/gitlab/containers.yml +++ b/ci/gitlab/containers.yml @@ -14,11 +14,11 @@ x86_64-almalinux-9-container: NAME: almalinux-9 -x86_64-alpine-319-container: +x86_64-alpine-320-container: extends: .container_job allow_failure: false variables: - NAME: alpine-319 + NAME: alpine-320 x86_64-alpine-edge-container: @@ -57,13 +57,6 @@ x86_64-debian-sid-container: NAME: debian-sid -x86_64-fedora-39-container: - extends: .container_job - allow_failure: false - variables: - NAME: fedora-39 - - x86_64-fedora-40-container: extends: .container_job allow_failure: false @@ -71,6 +64,13 @@ x86_64-fedora-40-container: NAME: fedora-40 +x86_64-fedora-41-container: + extends: .container_job + allow_failure: false + variables: + NAME: fedora-41 + + x86_64-fedora-rawhide-container: extends: .container_job allow_failure: true @@ -292,19 +292,19 @@ s390x-debian-sid-container: NAME: debian-sid-cross-s390x -mingw32-fedora-40-container: +mingw32-fedora-41-container: extends: .container_job allow_failure: false variables: JOB_OPTIONAL: 1 - NAME: fedora-40-cross-mingw32 + NAME: fedora-41-cross-mingw32 -mingw64-fedora-40-container: +mingw64-fedora-41-container: extends: .container_job allow_failure: false variables: - NAME: fedora-40-cross-mingw64 + NAME: fedora-41-cross-mingw64 mingw32-fedora-rawhide-container: diff --git a/ci/integration.yml b/ci/integration.yml index 2fc8d02956..2c5e5a65bc 100644 --- a/ci/integration.yml +++ b/ci/integration.yml @@ -29,23 +29,23 @@ centos-stream-9-tests: # and libvirt-python CI jobs, so the new target needs to be introduced # there before it can be used here. The VM template for the target # also needs to be created on the runner host. -fedora-39-tests: +fedora-41-tests: extends: .integration_tests variables: # needed by libvirt-gitlab-executor - DISTRO: fedora-39 + DISTRO: fedora-41 # can be overridden in forks to set a different runner tag LIBVIRT_CI_INTEGRATION_RUNNER_TAG: redhat-vm-host tags: - $LIBVIRT_CI_INTEGRATION_RUNNER_TAG needs: - - x86_64-fedora-39 + - x86_64-fedora-41 - project: libvirt/libvirt-perl - job: x86_64-fedora-39 + job: x86_64-fedora-41 ref: master artifacts: true - project: libvirt/libvirt-python - job: x86_64-fedora-39 + job: x86_64-fedora-41 ref: master artifacts: true @@ -53,22 +53,22 @@ fedora-39-tests: # and libvirt-python CI jobs, so the new target needs to be introduced # there before it can be used here. The VM template for the target # also needs to be created on the runner host. -.fedora-39-upstream-qemu-tests: +.fedora-41-upstream-qemu-tests: extends: .integration_tests variables: # needed by libvirt-gitlab-executor - DISTRO: fedora-39 + DISTRO: fedora-41 # can be overridden in forks to set a different runner tag LIBVIRT_CI_INTEGRATION_RUNNER_TAG: redhat-vm-host tags: - $LIBVIRT_CI_INTEGRATION_RUNNER_TAG needs: - - x86_64-fedora-39 + - x86_64-fedora-41 - project: libvirt/libvirt-perl - job: x86_64-fedora-39 + job: x86_64-fedora-41 ref: master artifacts: true - project: libvirt/libvirt-python - job: x86_64-fedora-39 + job: x86_64-fedora-41 ref: master artifacts: true diff --git a/ci/manifest.yml b/ci/manifest.yml index 43b9995717..cd68f5f7cb 100644 --- a/ci/manifest.yml +++ b/ci/manifest.yml @@ -19,7 +19,7 @@ targets: RPM: skip CC: clang - alpine-319: x86_64 + alpine-320: x86_64 alpine-edge: jobs: @@ -144,14 +144,6 @@ targets: containers: false builds: false - fedora-39: - jobs: - - arch: x86_64 - artifacts: - expire_in: 1 day - paths: - - libvirt-rpms - fedora-40: jobs: - arch: x86_64 @@ -160,6 +152,14 @@ targets: paths: - libvirt-rpms + fedora-41: + jobs: + - arch: x86_64 + artifacts: + expire_in: 1 day + paths: + - libvirt-rpms + - arch: mingw32 builds: false -- 2.48.1

2 3

[libvirt PATCH] libvirt.spec.in: fix indentation
by Pavel Hrdina 03 Feb '25

03 Feb '25

Fixes: cf32953f5b6ec30386f71b40cf458467752a6dca Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- Pushed libvirt.spec.in | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index be91fa6bb4..cb41ea1de1 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -541,10 +541,10 @@ Requires(posttrans): /usr/bin/systemctl Requires(preun): /usr/bin/systemctl # libvirtd depends on 'messagebus' service Requires: dbus -%if %{with_account_add} + %if %{with_account_add} # For uid creation during pre Requires(pre): shadow-utils -%endif + %endif # Needed by /usr/libexec/libvirt-guests.sh script. %if 0%{?fedora} Requires: gettext-runtime @@ -1103,10 +1103,10 @@ Wireshark dissector plugin for better analysis of libvirt RPC traffic. %package login-shell Summary: Login shell for connecting users to an LXC container Requires: libvirt-libs = %{version}-%{release} -%if %{with_account_add} + %if %{with_account_add} # For uid creation during pre Requires(pre): shadow-utils -%endif + %endif %description login-shell Provides the set-uid virt-login-shell binary that is used to @@ -1806,12 +1806,12 @@ export VIR_TEST_DEBUG=1 %pre daemon-common %libvirt_sysconfig_pre libvirt-guests %libvirt_systemd_oneshot_pre libvirt-guests -%if %{with_account_add} + %if %{with_account_add} # 'libvirt' group is just to allow password-less polkit access to libvirt # daemons. The uid number is irrelevant, so we use dynamic allocation. getent group libvirt >/dev/null || groupadd -r libvirt exit 0 -%endif + %endif %posttrans daemon-common %libvirt_sysconfig_posttrans libvirt-guests @@ -1934,7 +1934,7 @@ exit 0 %libvirt_sysconfig_pre virtqemud %libvirt_systemd_unix_pre virtqemud -%if %{with_account_add} + %if %{with_account_add} # We want soft static allocation of well-known ids, as disk images # are commonly shared across NFS mounts by id rather than name. # See https://docs.fedoraproject.org/en-US/packaging-guidelines/UsersAndGroups/ @@ -1950,7 +1950,7 @@ if ! getent passwd 'qemu' >/dev/null; then fi fi exit 0 -%endif + %endif %posttrans daemon-driver-qemu %libvirt_sysconfig_posttrans virtqemud @@ -2077,10 +2077,10 @@ done %if %{with_lxc} %pre login-shell -%if %{with_account_add} + %if %{with_account_add} getent group virtlogin >/dev/null || groupadd -r virtlogin exit 0 -%endif + %endif %endif %endif -- 2.48.1

1 0