On 7 Dec 2022, at 20:48, Ilya Maximets wrote:
> On 11/29/22 13:19, Eelco Chaudron wrote:
>> This change will install all the USDT scripts to the
>> {_datadir}/openvswitch/scripts/usdt directory with the
>> make install command.
>>
>> In addition it will also add them to the Fedora
>> openvswitch-test rpm.
>
> For consistency, we should also add them to the openvswitch-test
> debian package. What do you think?
Ack will do in V2
>
>>
>> Signed-off-by: Eelco Chaudron <[email protected]>
>> ---
>> Makefile.am | 2 ++
>> rhel/openvswitch-fedora.spec.in | 1 +
>> utilities/automake.mk | 4 ++++
>> 3 files changed, 7 insertions(+)
>>
>> diff --git a/Makefile.am b/Makefile.am
>> index d43853867..3ab1054f5 100644
>> --- a/Makefile.am
>> +++ b/Makefile.am
>> @@ -120,6 +120,7 @@ OVSIDL_BUILT =
>> pkgdata_DATA =
>> sbin_SCRIPTS =
>> scripts_SCRIPTS =
>> +scripts_usdt_SCRIPTS =
>
> Maybe just 'usdt_SCRIPTS' ?
Ack
>> completion_SCRIPTS =
>> scripts_DATA =
>> SUFFIXES =
>> @@ -133,6 +134,7 @@ C ?= 1
>> endif
>>
>> scriptsdir = $(pkgdatadir)/scripts
>> +scripts_usdtdir = $(pkgdatadir)/scripts/usdt
>> completiondir = $(sysconfdir)/bash_completion.d
>> pkgconfigdir = $(libdir)/pkgconfig
>>
>> diff --git a/rhel/openvswitch-fedora.spec.in
>> b/rhel/openvswitch-fedora.spec.in
>> index 67268cb78..51a6f4116 100644
>> --- a/rhel/openvswitch-fedora.spec.in
>> +++ b/rhel/openvswitch-fedora.spec.in
>> @@ -383,6 +383,7 @@ fi
>> %{_bindir}/ovs-pcap
>> %{_bindir}/ovs-tcpdump
>> %{_bindir}/ovs-tcpundump
>> +%{_datadir}/openvswitch/scripts/usdt/*
>> %{_mandir}/man8/ovs-test.8*
>> %{_mandir}/man8/ovs-vlan-test.8*
>> %{_mandir}/man8/ovs-l3ping.8*
>> diff --git a/utilities/automake.mk b/utilities/automake.mk
>> index eb57653a1..feb9e3883 100644
>> --- a/utilities/automake.mk
>> +++ b/utilities/automake.mk
>> @@ -20,6 +20,10 @@ scripts_SCRIPTS += \
>> utilities/ovs-kmod-ctl \
>> utilities/ovs-save
>> scripts_DATA += utilities/ovs-lib
>> +scripts_usdt_SCRIPTS += \
>> + utilities/usdt-scripts/bridge_loop.bt \
>> + utilities/usdt-scripts/upcall_cost.py \
>> + utilities/usdt-scripts/upcall_monitor.py
>
> Should these be removed from the EXTRA_DIST then?
We can not remove it here, as we get complains from the git check.
Other scripts are also still in the EXTRA_DIST section.
>>
>> completion_SCRIPTS += \
>> utilities/ovs-appctl-bashcomp.bash \
>>
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
