diff mbox series

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

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

Checks

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

Commit Message

Aaron Conole Jan. 25, 2024, 8:55 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>
---
v8: Include the correct devel package as a dependency

 rhel/openvswitch-fedora.spec.in | 8 ++++++++
 1 file changed, 8 insertions(+)

Comments

Simon Horman Jan. 30, 2024, 9:50 a.m. UTC | #1
On Thu, Jan 25, 2024 at 03:55:44PM -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>
> ---
> v8: Include the correct devel package as a dependency

Thanks for the update, this one looks good.

Acked-by: Simon Horman <horms@ovn.org>
Ilya Maximets Jan. 30, 2024, 9:54 a.m. UTC | #2
On 1/25/24 21:55, 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>
> ---
> v8: Include the correct devel package as a dependency
> 
>  rhel/openvswitch-fedora.spec.in | 8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff --git a/rhel/openvswitch-fedora.spec.in b/rhel/openvswitch-fedora.spec.in
> index 5d24ebcda8..b97f509cae 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"
> @@ -77,6 +79,9 @@ Provides: %{name}-dpdk = %{version}-%{release}
>  %if %{with afxdp}
>  BuildRequires: libxdp-devel libbpf-devel numactl-devel
>  %endif
> +%if %{with afxdp}

Did you mean usdt ?

> +BuildRequires: libbpf-devel systemtap-sdt-devel
> +%endif
>  BuildRequires: unbound unbound-devel
>  
>  Requires: openssl hostname iproute module-init-tools unbound
> @@ -173,6 +178,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 \
Aaron Conole Jan. 30, 2024, 2:45 p.m. UTC | #3
Ilya Maximets <i.maximets@ovn.org> writes:

> On 1/25/24 21:55, 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>
>> ---
>> v8: Include the correct devel package as a dependency
>> 
>>  rhel/openvswitch-fedora.spec.in | 8 ++++++++
>>  1 file changed, 8 insertions(+)
>> 
>> diff --git a/rhel/openvswitch-fedora.spec.in b/rhel/openvswitch-fedora.spec.in
>> index 5d24ebcda8..b97f509cae 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"
>> @@ -77,6 +79,9 @@ Provides: %{name}-dpdk = %{version}-%{release}
>>  %if %{with afxdp}
>>  BuildRequires: libxdp-devel libbpf-devel numactl-devel
>>  %endif
>> +%if %{with afxdp}
>
> Did you mean usdt ?

Ugh... yes.  I'll post the update.  Thanks for catching it.

>> +BuildRequires: libbpf-devel systemtap-sdt-devel
>> +%endif
>>  BuildRequires: unbound unbound-devel
>>  
>>  Requires: openssl hostname iproute module-init-tools unbound
>> @@ -173,6 +178,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 \
diff mbox series

Patch

diff --git a/rhel/openvswitch-fedora.spec.in b/rhel/openvswitch-fedora.spec.in
index 5d24ebcda8..b97f509cae 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"
@@ -77,6 +79,9 @@  Provides: %{name}-dpdk = %{version}-%{release}
 %if %{with afxdp}
 BuildRequires: libxdp-devel libbpf-devel numactl-devel
 %endif
+%if %{with afxdp}
+BuildRequires: libbpf-devel systemtap-sdt-devel
+%endif
 BuildRequires: unbound unbound-devel
 
 Requires: openssl hostname iproute module-init-tools unbound
@@ -173,6 +178,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 \