From bd9b792a7740956f1c170fd55ab918172aa69be7 Mon Sep 17 00:00:00 2001 From: Bethany Jamison Date: Fri, 30 Aug 2024 18:34:00 +0200 Subject: [PATCH] UBUNTU: [Packaging] perf: reenable libtraceevent 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 Acked-by: Thibault Ferrante Acked-by: Mehmet Basaran [smb: Adjusted BugLink and patch as it would not apply] Signed-off-by: Stefan Bader --- debian/rules.d/2-binary-arch.mk | 4 ++-- debian/rules.d/3-binary-indep.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index 89d1eb769ed9..fe66f8a0c088 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -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) diff --git a/debian/rules.d/3-binary-indep.mk b/debian/rules.d/3-binary-indep.mk index 5a3418cd66b0..75b8e457b7d0 100644 --- a/debian/rules.d/3-binary-indep.mk +++ b/debian/rules.d/3-binary-indep.mk @@ -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