diff mbox series

[ovs-dev,v7,2/2] rhel: Enable USDT scripts by default in Fedora builds

Message ID 20240125170530.337087-3-aconole@redhat.com
State Superseded
Delegated to: aaron conole
Headers show
Series debugging: Add a revalidator probe, and monitor script | expand

Checks

Context Check Description
ovsrobot/apply-robot warning apply and check: warning
ovsrobot/github-robot-_Build_and_Test fail github build: failed
ovsrobot/intel-ovs-compilation success test: success

Commit Message

Aaron Conole Jan. 25, 2024, 5:05 p.m. UTC
All supported versions of Fedora do package libbpf, so it
makes sense to enable USDT support.

Signed-off-by: Aaron Conole <aconole@redhat.com>
---
 rhel/openvswitch-fedora.spec.in | 5 +++++
 1 file changed, 5 insertions(+)

Comments

Simon Horman Jan. 26, 2024, 10:53 a.m. UTC | #1
On Thu, Jan 25, 2024 at 12:05:30PM -0500, Aaron Conole wrote:
> All supported versions of Fedora do package libbpf, so it
> makes sense to enable USDT support.
> 
> Signed-off-by: Aaron Conole <aconole@redhat.com>
> ---
>  rhel/openvswitch-fedora.spec.in | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/rhel/openvswitch-fedora.spec.in b/rhel/openvswitch-fedora.spec.in
> index 5d24ebcda8..3d9afeac59 100644
> --- a/rhel/openvswitch-fedora.spec.in
> +++ b/rhel/openvswitch-fedora.spec.in
> @@ -28,6 +28,8 @@
>  %bcond_with dpdk
>  # To disable AF_XDP support, specify '--without afxdp' when building
>  %bcond_without afxdp
> +# To control the USDT support
> +%bcond_without usdt
>  
>  # If there is a need to automatically enable the package after installation,
>  # specify the "--with autoenable"
> @@ -173,6 +175,9 @@ This package provides IPsec tunneling support for OVS tunnels.
>          --enable-afxdp \
>  %else
>          --disable-afxdp \
> +%endif
> +%if %{with usdt}
> +        --enable-usdt-probes \
>  %endif
>          --enable-ssl \
>          --disable-static \

Hi Aaron,

Our mutual friend ovsrobot didn't seem to like this one :(

 configure: error: unable to find sys/sdt.h needed for USDT support
error: Bad exit status from /var/tmp/rpm-tmp.pNLYFp (%build)
    Macro expanded in comment on line 23: %define kernel 2.6.40.4-5.fc15.x86_64

    Bad exit status from /var/tmp/rpm-tmp.pNLYFp (%build)

Link: https://github.com/ovsrobot/ovs/actions/runs/7658135907/job/20870414014
Aaron Conole Jan. 26, 2024, 3:53 p.m. UTC | #2
Simon Horman <horms@ovn.org> writes:

> On Thu, Jan 25, 2024 at 12:05:30PM -0500, Aaron Conole wrote:
>> All supported versions of Fedora do package libbpf, so it
>> makes sense to enable USDT support.
>> 
>> Signed-off-by: Aaron Conole <aconole@redhat.com>
>> ---
>>  rhel/openvswitch-fedora.spec.in | 5 +++++
>>  1 file changed, 5 insertions(+)
>> 
>> diff --git a/rhel/openvswitch-fedora.spec.in b/rhel/openvswitch-fedora.spec.in
>> index 5d24ebcda8..3d9afeac59 100644
>> --- a/rhel/openvswitch-fedora.spec.in
>> +++ b/rhel/openvswitch-fedora.spec.in
>> @@ -28,6 +28,8 @@
>>  %bcond_with dpdk
>>  # To disable AF_XDP support, specify '--without afxdp' when building
>>  %bcond_without afxdp
>> +# To control the USDT support
>> +%bcond_without usdt
>>  
>>  # If there is a need to automatically enable the package after installation,
>>  # specify the "--with autoenable"
>> @@ -173,6 +175,9 @@ This package provides IPsec tunneling support for OVS tunnels.
>>          --enable-afxdp \
>>  %else
>>          --disable-afxdp \
>> +%endif
>> +%if %{with usdt}
>> +        --enable-usdt-probes \
>>  %endif
>>          --enable-ssl \
>>          --disable-static \
>
> Hi Aaron,
>
> Our mutual friend ovsrobot didn't seem to like this one :(
>
>  configure: error: unable to find sys/sdt.h needed for USDT support
> error: Bad exit status from /var/tmp/rpm-tmp.pNLYFp (%build)
>     Macro expanded in comment on line 23: %define kernel 2.6.40.4-5.fc15.x86_64
>
>     Bad exit status from /var/tmp/rpm-tmp.pNLYFp (%build)
>
> Link: https://github.com/ovsrobot/ovs/actions/runs/7658135907/job/20870414014

Thanks - fixed in v8
diff mbox series

Patch

diff --git a/rhel/openvswitch-fedora.spec.in b/rhel/openvswitch-fedora.spec.in
index 5d24ebcda8..3d9afeac59 100644
--- a/rhel/openvswitch-fedora.spec.in
+++ b/rhel/openvswitch-fedora.spec.in
@@ -28,6 +28,8 @@ 
 %bcond_with dpdk
 # To disable AF_XDP support, specify '--without afxdp' when building
 %bcond_without afxdp
+# To control the USDT support
+%bcond_without usdt
 
 # If there is a need to automatically enable the package after installation,
 # specify the "--with autoenable"
@@ -173,6 +175,9 @@  This package provides IPsec tunneling support for OVS tunnels.
         --enable-afxdp \
 %else
         --disable-afxdp \
+%endif
+%if %{with usdt}
+        --enable-usdt-probes \
 %endif
         --enable-ssl \
         --disable-static \