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(-)
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-sdt' package mapping, as well as the old
'dtrace'.
Signed-off-by: Ján Tomko <jtomko@redhat.com>
---
This was generated from the libvirt-ci change from the following merge
request:
https://gitlab.com/libvirt/libvirt-ci/-/merge_requests/498
It is believed to fix the failure on Fedora Rawhide:
https://gitlab.com/janotomko/libvirt/-/pipelines/1413537405
(The failed job comes from a transient error on a cirrus builder)
I don't know what the issue with debian-sid is about
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..12e21893cf 100644
--- a/ci/lcitool/projects/libvirt.yml
+++ b/ci/lcitool/projects/libvirt.yml
@@ -75,6 +75,7 @@ packages:
- sed
- showmount
- systemd-rpm-macros
+ - systemtap-sdt
- tc
- wireshark
- xen
--
2.45.2On Wed, Aug 14, 2024 at 11:29:44PM +0200, Ján Tomko wrote:
>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-sdt' package mapping, as well as the old
>'dtrace'.
>
>Signed-off-by: Ján Tomko <jtomko@redhat.com>
>---
>This was generated from the libvirt-ci change from the following merge
>request:
>https://gitlab.com/libvirt/libvirt-ci/-/merge_requests/498
>
z>It is believed to fix the failure on Fedora Rawhide:
>https://gitlab.com/janotomko/libvirt/-/pipelines/1413537405
>(The failed job comes from a transient error on a cirrus builder)
>
I'm not sure what failure you are talking about. The pipeline is green
since you posted this patch.
Shouldn't this be changed in libvirt.spec.in as well since it currently
says just:
# we need /usr/sbin/dtrace
BuildRequires: systemtap-sdt-devel
Maybe even to just
BuildRequires: /usr/sbin/dtrace
??
>I don't know what the issue with debian-sid is about
>
> 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..12e21893cf 100644
>--- a/ci/lcitool/projects/libvirt.yml
>+++ b/ci/lcitool/projects/libvirt.yml
>@@ -75,6 +75,7 @@ packages:
> - sed
> - showmount
> - systemd-rpm-macros
>+ - systemtap-sdt
> - tc
> - wireshark
> - xen
>--
>2.45.2
>
On a Wednesday in 2024, Martin Kletzander wrote: >On Wed, Aug 14, 2024 at 11:29:44PM +0200, Ján Tomko wrote: >>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-sdt' package mapping, as well as the old >>'dtrace'. >> >>Signed-off-by: Ján Tomko <jtomko@redhat.com> >>--- >>This was generated from the libvirt-ci change from the following merge >>request: >>https://gitlab.com/libvirt/libvirt-ci/-/merge_requests/498 >> >z>It is believed to fix the failure on Fedora Rawhide: >>https://gitlab.com/janotomko/libvirt/-/pipelines/1413537405 >>(The failed job comes from a transient error on a cirrus builder) >> > >I'm not sure what failure you are talking about. The pipeline is green >since you posted this patch. > The current master still uses a container build of rawhide where systemtap-sdt-devel still depends on systemtap-sdt-dtrace: https://src.fedoraproject.org/rpms/systemtap/c/93948388bc54cd7a4efb1806d9787291d26b33d6?branch=rawhide systemtap-sdt-devel-5.2~pre17224323g98d1ea34-1.fc41.x86_64 systemtap-sdt-dtrace-5.2~pre17224323g98d1ea34-1.fc41.x86_64 However in current rawhide, the packages no longer depend on each other: (version 5.2~pre17224323g98d1ea34-2.fc41) https://src.fedoraproject.org/rpms/systemtap/c/20b4dc7947b0a1197c48b0b26821ae698ba1902d?branch=rawhide See my work-in-progres json-c pipeline that lead to a container refresh and thus failure: https://gitlab.com/janotomko/libvirt/-/jobs/7587452059 >Shouldn't this be changed in libvirt.spec.in as well since it currently >says just: > ># we need /usr/sbin/dtrace >BuildRequires: systemtap-sdt-devel > >Maybe even to just >BuildRequires: /usr/sbin/dtrace Yes, the specfile also needs to be changed. We need both, I've seen errors about the sdt.h inclusion with just the dtrace package installed. Jano > >?? >
© 2016 - 2024 Red Hat, Inc.