diff mbox series

[11/16] UBUNTU: [Packaging] bpftool: always use vmlinux to generate headers

Message ID 20230316090529.199884-12-andrea.righi@canonical.com
State New
Headers show
Series [01/16] UBUNTU: [Packaging] propagate makefile variables to kernelconfig | expand

Commit Message

Andrea Righi March 16, 2023, 9:05 a.m. UTC 
BugLink: https://bugs.launchpad.net/bugs/2007654

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
---
 debian/rules.d/2-binary-arch.mk | 5 +++++
 1 file changed, 5 insertions(+)
diff mbox series

Patch

diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk
index 4cebe66dfd32..9fd4b1707f46 100644
--- a/debian/rules.d/2-binary-arch.mk
+++ b/debian/rules.d/2-binary-arch.mk
@@ -315,6 +315,9 @@  ifeq ($(do_dbgsym_package),true)
 	rm -f $(dbgpkgdir)/usr/lib/debug/lib/modules/$(abi_release)-$*/modules.*
 	rm -fr $(dbgpkgdir)/usr/lib/debug/lib/firmware
 endif
+ifeq ($(do_tools_bpftool),true)
+	cp $(builddir)/build-$*/vmlinux tools/bpf/bpftool/
+endif
 
 	# The flavour specific headers image
 	# TODO: Would be nice if we didn't have to dupe the original builddir
@@ -729,7 +732,9 @@  ifeq ($(do_tools_perf),true)
 		$(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)
+	mv $(builddirpa)/tools/bpf/bpftool/vmlinux $(builddirpa)/vmlinux
 	$(kmake) CROSS_COMPILE=$(CROSS_COMPILE) -C $(builddirpa)/tools/bpf/bpftool
+	rm -f $(builddirpa)/vmlinux
 endif
 ifeq ($(do_tools_x86),true)
 	cd $(builddirpa)/tools/power/x86/x86_energy_perf_policy && make CROSS_COMPILE=$(CROSS_COMPILE)