diff mbox series

[J/realtime,15/15] UBUNTU: [Packaging] realtime: include rtla in tools package

Message ID 20220126185812.300679-16-krzysztof.kozlowski@canonical.com
State New
Headers show
Series Add rtla to realtime | expand

Commit Message

Krzysztof Kozlowski Jan. 26, 2022, 6:58 p.m. UTC 
BugLink: https://bugs.launchpad.net/bugs/1959130

Include newly added rtla tool in tools package.  The rtla will be
compiled if perf is chosen (do_tools_perf).  The rtla requires rst2man
from python3-docutils during full build, so move the python3-docutils
dependency to Build-Depends.

The rtla depends on libtracefs v1.3.0 (in development).

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
---
 debian.realtime/control.stub.in  | 5 ++++-
 debian/rules.d/2-binary-arch.mk  | 4 ++++
 debian/rules.d/3-binary-indep.mk | 1 +
 3 files changed, 9 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/debian.realtime/control.stub.in b/debian.realtime/control.stub.in
index dd0bea8b6c30..d37395171984 100644
--- a/debian.realtime/control.stub.in
+++ b/debian.realtime/control.stub.in
@@ -37,6 +37,10 @@  Build-Depends:
  curl <!stage1>,
  zstd [amd64 s390x] <!stage1>,
  dwarves [amd64 arm64 armhf ppc64el s390x] <!stage1>,
+ python3-docutils <!stage1>,
+ libtracefs-dev <!stage1>,
+ libtraceevent-dev <!stage1>,
+ libprocps-dev <!stage1>,
 Build-Depends-Indep:
  xmlto <!stage1>,
  docbook-utils <!stage1>,
@@ -48,7 +52,6 @@  Build-Depends-Indep:
  python3-sphinx <!stage1>,
  python3-sphinx-rtd-theme <!stage1>,
  fontconfig <!stage1>,
- python3-docutils <!stage1>,
  imagemagick <!stage1>,
  graphviz <!stage1>,
  dvipng <!stage1>,
diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk
index d50461a5c043..5f953c7e38f5 100644
--- a/debian/rules.d/2-binary-arch.mk
+++ b/debian/rules.d/2-binary-arch.mk
@@ -385,6 +385,7 @@  ifeq ($(do_tools_cpupower),true)
 endif
 ifeq ($(do_tools_perf),true)
 	$(LN) ../../$(src_pkg_name)-tools-$(abi_release)/perf $(toolspkgdir)/usr/lib/linux-tools/$(abi_release)-$*
+	$(LN) ../../$(src_pkg_name)-tools-$(abi_release)/rtla $(toolspkgdir)/usr/lib/linux-tools/$(abi_release)-$*
 ifeq ($(do_tools_perf_jvmti),true)
 	$(LN) ../../$(src_pkg_name)-tools-$(abi_release)/libperf-jvmti.so $(toolspkgdir)/usr/lib/linux-tools/$(abi_release)-$*
 endif
@@ -705,6 +706,8 @@  ifeq ($(do_tools_perf),true)
 	cd $(builddirpa) && $(kmake) prepare
 	cd $(builddirpa)/tools/perf && \
 		$(kmake) prefix=/usr HAVE_NO_LIBBFD=1 HAVE_CPLUS_DEMANGLE_SUPPORT=1 CROSS_COMPILE=$(CROSS_COMPILE) NO_LIBPYTHON=1 NO_LIBPERL=1 WERROR=0
+	cd $(builddirpa)/tools/tracing/rtla && \
+		$(kmake) prefix=/usr HAVE_NO_LIBBFD=1 HAVE_CPLUS_DEMANGLE_SUPPORT=1 CROSS_COMPILE=$(CROSS_COMPILE) NO_LIBPYTHON=1 NO_LIBPERL=1 WERROR=0
 endif
 ifeq ($(do_tools_bpftool),true)
 	$(kmake) CROSS_COMPILE=$(CROSS_COMPILE) -C $(builddirpa)/tools/bpf/bpftool
@@ -749,6 +752,7 @@  ifeq ($(do_tools_cpupower),true)
 endif
 ifeq ($(do_tools_perf),true)
 	install -m755 $(builddirpa)/tools/perf/perf $(toolspkgdir)/usr/lib/$(src_pkg_name)-tools-$(abi_release)
+	install -m755 $(builddirpa)/tools/tracing/rtla/rtla $(toolspkgdir)/usr/lib/$(src_pkg_name)-tools-$(abi_release)
 ifeq ($(do_tools_perf_jvmti),true)
 	install -m755 $(builddirpa)/tools/perf/libperf-jvmti.so $(toolspkgdir)/usr/lib/$(src_pkg_name)-tools-$(abi_release)
 endif
diff --git a/debian/rules.d/3-binary-indep.mk b/debian/rules.d/3-binary-indep.mk
index 0868ce04dfc3..acc68567dce6 100644
--- a/debian/rules.d/3-binary-indep.mk
+++ b/debian/rules.d/3-binary-indep.mk
@@ -118,6 +118,7 @@  ifeq ($(do_tools_common),true)
 	install -m644 $(CURDIR)/tools/power/cpupower/man/*.1 $(toolsman)/man1/
 
 	install -m755 debian/tools/generic $(toolsbin)/perf
+	install -m755 debian/tools/generic $(toolsbin)/rtla
 
 	install -m755 debian/tools/generic $(toolssbin)/bpftool
 	make -C $(builddir)/tools/tools/bpf/bpftool doc