[libvirt PATCHv2] ci: adapt to 'dtrace' package split

Fedora has decided to separate dtrace out of the systemtap-sdt-devel package: https://fedoraproject.org/wiki/Changes/Separate_dtrace_package Similarly, these are split in OpenSUSE Tumbleweed, however in a backward-compatbile way: https://build.opensuse.org/package/show/openSUSE:Factory/systemtap Require the new 'systemtap' package mapping, as well as the old 'dtrace'. Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- v2: use 'systemtap' instead of 'systemtap-sdt' to match what was finally merged in libvirt-ci ci/buildenv/fedora-rawhide.sh | 1 + ci/buildenv/opensuse-tumbleweed.sh | 3 ++- ci/containers/fedora-rawhide.Dockerfile | 1 + ci/containers/opensuse-tumbleweed.Dockerfile | 3 ++- ci/lcitool/projects/libvirt.yml | 1 + 5 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ci/buildenv/fedora-rawhide.sh b/ci/buildenv/fedora-rawhide.sh index f89a87ad63..1706ec27f4 100644 --- a/ci/buildenv/fedora-rawhide.sh +++ b/ci/buildenv/fedora-rawhide.sh @@ -82,6 +82,7 @@ function install_buildenv() { systemd-devel \ systemd-rpm-macros \ systemtap-sdt-devel \ + systemtap-sdt-dtrace \ wireshark-devel \ xen-devel \ yajl-devel diff --git a/ci/buildenv/opensuse-tumbleweed.sh b/ci/buildenv/opensuse-tumbleweed.sh index ac566d349f..5117ea4ddb 100644 --- a/ci/buildenv/opensuse-tumbleweed.sh +++ b/ci/buildenv/opensuse-tumbleweed.sh @@ -81,7 +81,8 @@ function install_buildenv() { sanlock-devel \ sed \ systemd-rpm-macros \ - systemtap-sdt-devel \ + systemtap-dtrace \ + systemtap-headers \ wireshark-devel \ xen-devel rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED diff --git a/ci/containers/fedora-rawhide.Dockerfile b/ci/containers/fedora-rawhide.Dockerfile index 6f06843985..ef91b6acc7 100644 --- a/ci/containers/fedora-rawhide.Dockerfile +++ b/ci/containers/fedora-rawhide.Dockerfile @@ -93,6 +93,7 @@ exec "$@"\n' > /usr/bin/nosync && \ systemd-devel \ systemd-rpm-macros \ systemtap-sdt-devel \ + systemtap-sdt-dtrace \ wireshark-devel \ xen-devel \ yajl-devel && \ diff --git a/ci/containers/opensuse-tumbleweed.Dockerfile b/ci/containers/opensuse-tumbleweed.Dockerfile index 2b7cdb4af5..6a992e2039 100644 --- a/ci/containers/opensuse-tumbleweed.Dockerfile +++ b/ci/containers/opensuse-tumbleweed.Dockerfile @@ -82,7 +82,8 @@ RUN zypper dist-upgrade -y && \ sanlock-devel \ sed \ systemd-rpm-macros \ - systemtap-sdt-devel \ + systemtap-dtrace \ + systemtap-headers \ wireshark-devel \ xen-devel && \ zypper clean --all && \ diff --git a/ci/lcitool/projects/libvirt.yml b/ci/lcitool/projects/libvirt.yml index 5e0bd66958..cb501f5c85 100644 --- a/ci/lcitool/projects/libvirt.yml +++ b/ci/lcitool/projects/libvirt.yml @@ -75,6 +75,7 @@ packages: - sed - showmount - systemd-rpm-macros + - systemtap - tc - wireshark - xen -- 2.46.1