APPLIED [O] Re: [SRU][O][PATCH v3 1/1] UBUNTU: [Packaging] perf: reenable libtraceevent

[Timo Aaltonen]

Bethany Jamison kirjoitti 30.8.2024 klo 19.34:
> Reenable libtraceevent in perf to revert (92550b568d) due to
> LP:#2076190
> 
> Buglink: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/2076190
> 
> Signed-off-by: Bethany Jamison <bethany.jamison at canonical.com>
> ---
>   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 792276bf8458..f003f1e1bba7 100644
> --- a/debian/rules.d/2-binary-arch.mk
> +++ b/debian/rules.d/2-binary-arch.mk
> @@ -655,10 +655,10 @@ ifeq ($(do_tools_cpupower),true)
>   endif
>   ifeq ($(do_tools_perf),true)
>   	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
>   	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
>   	$(builddirpa)/tools/bpf/bpftool/bpftool btf dump file $(builddirpa)/vmlinux format c > $(builddirpa)/vmlinux.h
>   	rm -f $(builddirpa)/vmlinux
>   ifeq ($(do_tools_x86),true)
> diff --git a/debian/rules.d/3-binary-indep.mk b/debian/rules.d/3-binary-indep.mk
> index 73973445a737..141716c26c47 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


Both of the patches were targeted for oracular, but I believe this was 
the one meant for it and needed some wiggling to apply as it didn't 
apply after other patches.

-- 
t