tmakin/tegra-linux-noble
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UBUNTU: [Packaging] perf: reenable libtraceevent

Browse Source 
BugLink: https://bugs.launchpad.net/bugs/2076190

Reenable libtraceevent in perf to revert (92550b568d) due to
LP: #2076190

The control file actually still contains libtraceevent-dev which
presumably was the build dependency that was attempted to avoid.
Possibly also libtracefs-dev but not sure here.

Signed-off-by: Bethany Jamison <bethany.jamison@canonical.com>
Acked-by: Thibault Ferrante <thibault.ferrante@canonical.com>
Acked-by: Mehmet Basaran <mehmet.basaran@canonical.com>
[smb: Adjusted BugLink and patch as it would not apply]
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
This commit is contained in:
Bethany Jamison
2024-08-30 18:34:00 +02:00
committed by Stefan Bader
parent 6c22f0813f
commit bd9b792a77
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
debian/rules.d/2-binary-arch.mk
Vendored
+2 -2
View File
@@ -665,11 +665,11 @@ ifeq ($(do_tools_perf),true)
cd $(builddirpa) && $(kmake) syncconfig
cd $(builddirpa) && $(kmake) prepare
cd $(builddirpa)/tools/perf && \
$(kmake) prefix=/usr NO_LIBTRACEEVENT=1 HAVE_CPLUS_DEMANGLE_SUPPORT=1 CROSS_COMPILE=$(CROSS_COMPILE) NO_LIBPERL=1 WERROR=0
$(kmake) prefix=/usr HAVE_CPLUS_DEMANGLE_SUPPORT=1 CROSS_COMPILE=$(CROSS_COMPILE) NO_LIBPERL=1 WERROR=0
endif
ifeq ($(do_tools_bpftool),true)
mv $(builddirpa)/tools/bpf/bpftool/vmlinux $(builddirpa)/vmlinux
$(kmake) NO_LIBTRACEEVENT=1 CROSS_COMPILE=$(CROSS_COMPILE) -C $(builddirpa)/tools/bpf/bpftool
$(kmake) CROSS_COMPILE=$(CROSS_COMPILE) -C $(builddirpa)/tools/bpf/bpftool
rm -f $(builddirpa)/vmlinux
endif
ifeq ($(do_tools_x86),true)
debian/rules.d/3-binary-indep.mk
Vendored
+2 -2
View File
@@ -103,7 +103,7 @@ ifeq ($(do_tools_common),true)
install -m755 debian/tools/generic $(toolsbin)/x86_energy_perf_policy
install -m755 debian/tools/generic $(toolsbin)/turbostat
cd $(builddir)/tools/tools/perf && make NO_LIBTRACEEVENT=1 man
cd $(builddir)/tools/tools/perf && make man
install -m644 $(builddir)/tools/tools/perf/Documentation/*.1 \
$(toolsman)/man1
@@ -146,7 +146,7 @@ ifeq ($(do_tools_host),true)
install -m 644 $(CURDIR)/tools/kvm/kvm_stat/kvm_stat.service \
$(hosttoolssystemd)/
cd $(builddir)/tools/tools/kvm/kvm_stat && make NO_LIBTRACEEVENT=1 man
cd $(builddir)/tools/tools/kvm/kvm_stat && make man
install -m644 $(builddir)/tools/tools/kvm/kvm_stat/*.1 \
$(hosttoolsman)/man1
endif