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@redhat.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
This commit is contained in:
Ján Tomko 2024-08-14 17:55:17 +02:00
parent 8a9750cb29
commit 4cf8067c73
5 changed files with 7 additions and 2 deletions

View File

@ -83,6 +83,7 @@ function install_buildenv() {
systemd-devel \ systemd-devel \
systemd-rpm-macros \ systemd-rpm-macros \
systemtap-sdt-devel \ systemtap-sdt-devel \
systemtap-sdt-dtrace \
wireshark-devel \ wireshark-devel \
xen-devel xen-devel
rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED

View File

@ -81,7 +81,8 @@ function install_buildenv() {
sanlock-devel \ sanlock-devel \
sed \ sed \
systemd-rpm-macros \ systemd-rpm-macros \
systemtap-sdt-devel \ systemtap-dtrace \
systemtap-headers \
wireshark-devel \ wireshark-devel \
xen-devel xen-devel
rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED

View File

@ -94,6 +94,7 @@ exec "$@"\n' > /usr/bin/nosync && \
systemd-devel \ systemd-devel \
systemd-rpm-macros \ systemd-rpm-macros \
systemtap-sdt-devel \ systemtap-sdt-devel \
systemtap-sdt-dtrace \
wireshark-devel \ wireshark-devel \
xen-devel && \ xen-devel && \
nosync dnf autoremove -y && \ nosync dnf autoremove -y && \

View File

@ -82,7 +82,8 @@ RUN zypper dist-upgrade -y && \
sanlock-devel \ sanlock-devel \
sed \ sed \
systemd-rpm-macros \ systemd-rpm-macros \
systemtap-sdt-devel \ systemtap-dtrace \
systemtap-headers \
wireshark-devel \ wireshark-devel \
xen-devel && \ xen-devel && \
zypper clean --all && \ zypper clean --all && \

View File

@ -76,6 +76,7 @@ packages:
- sed - sed
- showmount - showmount
- systemd-rpm-macros - systemd-rpm-macros
- systemtap
- tc - tc
- wireshark - wireshark
- xen - xen