From 4cf8067c73c9842301279d78ac4e36953cdcdcb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1n=20Tomko?= Date: Wed, 14 Aug 2024 17:55:17 +0200 Subject: [PATCH] ci: adapt to 'dtrace' package split MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Martin Kletzander --- 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 cbfeb71c92..d6dcf86733 100644 --- a/ci/buildenv/fedora-rawhide.sh +++ b/ci/buildenv/fedora-rawhide.sh @@ -83,6 +83,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/buildenv/opensuse-tumbleweed.sh b/ci/buildenv/opensuse-tumbleweed.sh index 4e0f812622..b3175fe404 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 a673f82b4b..a1cb9ec978 100644 --- a/ci/containers/fedora-rawhide.Dockerfile +++ b/ci/containers/fedora-rawhide.Dockerfile @@ -94,6 +94,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/containers/opensuse-tumbleweed.Dockerfile b/ci/containers/opensuse-tumbleweed.Dockerfile index 82b6aee142..d7cbc88e1a 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 b29fe227bb..9f8fc06ce4 100644 --- a/ci/lcitool/projects/libvirt.yml +++ b/ci/lcitool/projects/libvirt.yml @@ -76,6 +76,7 @@ packages: - sed - showmount - systemd-rpm-macros + - systemtap - tc - wireshark - xen