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 and Debian openvswitch-test rpm. Signed-off-by: Eelco Chaudron <[email protected]> --- v2: - Renamed scripts_usdt_SCRIPTS to usdt_SCRIPTS' - Added usdt scripts also to debian package Makefile.am | 2 ++ debian/openvswitch-test.install | 1 + rhel/openvswitch-fedora.spec.in | 1 + utilities/automake.mk | 4 ++++ 4 files changed, 8 insertions(+) diff --git a/Makefile.am b/Makefile.am index d43853867..606bcc22e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -120,6 +120,7 @@ OVSIDL_BUILT = pkgdata_DATA = sbin_SCRIPTS = scripts_SCRIPTS = +usdt_SCRIPTS = completion_SCRIPTS = scripts_DATA = SUFFIXES = @@ -133,6 +134,7 @@ C ?= 1 endif scriptsdir = $(pkgdatadir)/scripts +usdtdir = $(pkgdatadir)/scripts/usdt completiondir = $(sysconfdir)/bash_completion.d pkgconfigdir = $(libdir)/pkgconfig diff --git a/debian/openvswitch-test.install b/debian/openvswitch-test.install index b3a80d86a..88c825280 100644 --- a/debian/openvswitch-test.install +++ b/debian/openvswitch-test.install @@ -2,3 +2,4 @@ usr/bin/ovs-l3ping usr/bin/ovs-test usr/share/man/man8/ovs-l3ping.8 usr/share/man/man8/ovs-test.8 +usr/share/openvswitch/scripts/usdt/* 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..132a16942 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 +usdt_SCRIPTS += \ + utilities/usdt-scripts/bridge_loop.bt \ + utilities/usdt-scripts/upcall_cost.py \ + utilities/usdt-scripts/upcall_monitor.py completion_SCRIPTS += \ utilities/ovs-appctl-bashcomp.bash \ _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
