1. Patchew
  2. Libvirt
  3. View series

[libvirt PATCH] ci: refresh generated files

Ján Tomko posted 1 patch 1 year, 4 months ago
Failed in applying to current master (apply log)
ci/buildenv/fedora-rawhide.sh                | 2 +-
ci/buildenv/opensuse-tumbleweed.sh           | 2 +-
ci/containers/fedora-rawhide.Dockerfile      | 2 +-
ci/containers/opensuse-tumbleweed.Dockerfile | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
[libvirt PATCH] ci: refresh generated files
Posted by Ján Tomko 1 year, 4 months ago 
Signed-off-by: Ján Tomko <jtomko@redhat.com>
---
 ci/buildenv/fedora-rawhide.sh                | 2 +-
 ci/buildenv/opensuse-tumbleweed.sh           | 2 +-
 ci/containers/fedora-rawhide.Dockerfile      | 2 +-
 ci/containers/opensuse-tumbleweed.Dockerfile | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ci/buildenv/fedora-rawhide.sh b/ci/buildenv/fedora-rawhide.sh
index f89a87ad63..17ed6fe7a4 100644
--- a/ci/buildenv/fedora-rawhide.sh
+++ b/ci/buildenv/fedora-rawhide.sh
@@ -81,7 +81,7 @@ function install_buildenv() {
         sed \
         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..59a786efac 100644
--- a/ci/buildenv/opensuse-tumbleweed.sh
+++ b/ci/buildenv/opensuse-tumbleweed.sh
@@ -81,7 +81,7 @@ function install_buildenv() {
            sanlock-devel \
            sed \
            systemd-rpm-macros \
-           systemtap-sdt-devel \
+           systemtap-dtrace \
            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..90f2372663 100644
--- a/ci/containers/fedora-rawhide.Dockerfile
+++ b/ci/containers/fedora-rawhide.Dockerfile
@@ -92,7 +92,7 @@ exec "$@"\n' > /usr/bin/nosync && \
                sed \
                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..5d0bd77113 100644
--- a/ci/containers/opensuse-tumbleweed.Dockerfile
+++ b/ci/containers/opensuse-tumbleweed.Dockerfile
@@ -82,7 +82,7 @@ RUN zypper dist-upgrade -y && \
            sanlock-devel \
            sed \
            systemd-rpm-macros \
-           systemtap-sdt-devel \
+           systemtap-dtrace \
            wireshark-devel \
            xen-devel && \
     zypper clean --all && \
-- 
2.46.1
Re: [libvirt PATCH] ci: refresh generated files
Posted by Martin Kletzander 1 year, 4 months ago 
On Sat, Sep 21, 2024 at 02:09:51AM +0200, Ján Tomko wrote:
>Signed-off-by: Ján Tomko <jtomko@redhat.com>

Reviewed-by: Martin Kletzander <mkletzan@redhat.com>

>---
> ci/buildenv/fedora-rawhide.sh                | 2 +-
> ci/buildenv/opensuse-tumbleweed.sh           | 2 +-
> ci/containers/fedora-rawhide.Dockerfile      | 2 +-
> ci/containers/opensuse-tumbleweed.Dockerfile | 2 +-
> 4 files changed, 4 insertions(+), 4 deletions(-)
>
>diff --git a/ci/buildenv/fedora-rawhide.sh b/ci/buildenv/fedora-rawhide.sh
>index f89a87ad63..17ed6fe7a4 100644
>--- a/ci/buildenv/fedora-rawhide.sh
>+++ b/ci/buildenv/fedora-rawhide.sh
>@@ -81,7 +81,7 @@ function install_buildenv() {
>         sed \
>         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..59a786efac 100644
>--- a/ci/buildenv/opensuse-tumbleweed.sh
>+++ b/ci/buildenv/opensuse-tumbleweed.sh
>@@ -81,7 +81,7 @@ function install_buildenv() {
>            sanlock-devel \
>            sed \
>            systemd-rpm-macros \
>-           systemtap-sdt-devel \
>+           systemtap-dtrace \
>            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..90f2372663 100644
>--- a/ci/containers/fedora-rawhide.Dockerfile
>+++ b/ci/containers/fedora-rawhide.Dockerfile
>@@ -92,7 +92,7 @@ exec "$@"\n' > /usr/bin/nosync && \
>                sed \
>                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..5d0bd77113 100644
>--- a/ci/containers/opensuse-tumbleweed.Dockerfile
>+++ b/ci/containers/opensuse-tumbleweed.Dockerfile
>@@ -82,7 +82,7 @@ RUN zypper dist-upgrade -y && \
>            sanlock-devel \
>            sed \
>            systemd-rpm-macros \
>-           systemtap-sdt-devel \
>+           systemtap-dtrace \
>            wireshark-devel \
>            xen-devel && \
>     zypper clean --all && \
>-- 
>2.46.1
>
Re: [libvirt PATCH] ci: refresh generated files
Posted by Ján Tomko 1 year, 4 months ago 
On a Monday in 2024, Martin Kletzander wrote:
>On Sat, Sep 21, 2024 at 02:09:51AM +0200, Ján Tomko wrote:
>>Signed-off-by: Ján Tomko <jtomko@redhat.com>
>
>Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
>
>>---
>>ci/buildenv/fedora-rawhide.sh                | 2 +-
>>ci/buildenv/opensuse-tumbleweed.sh           | 2 +-
>>ci/containers/fedora-rawhide.Dockerfile      | 2 +-
>>ci/containers/opensuse-tumbleweed.Dockerfile | 2 +-
>>4 files changed, 4 insertions(+), 4 deletions(-)
>>
>>diff --git a/ci/buildenv/fedora-rawhide.sh b/ci/buildenv/fedora-rawhide.sh
>>index f89a87ad63..17ed6fe7a4 100644
>>--- a/ci/buildenv/fedora-rawhide.sh
>>+++ b/ci/buildenv/fedora-rawhide.sh
>>@@ -81,7 +81,7 @@ function install_buildenv() {
>>        sed \
>>        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..59a786efac 100644
>>--- a/ci/buildenv/opensuse-tumbleweed.sh
>>+++ b/ci/buildenv/opensuse-tumbleweed.sh
>>@@ -81,7 +81,7 @@ function install_buildenv() {
>>           sanlock-devel \
>>           sed \
>>           systemd-rpm-macros \
>>-           systemtap-sdt-devel \
>>+           systemtap-dtrace \

Oops, this is incorrect. We need both so this patch needs to adjust
ci/lcitool/projects/libvirt.yml too. v2 on the way.

Jano

>>           wireshark-devel \
>>           xen-devel
>>    rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.