UBUNTU: [Packaging] enable perf python module
BugLink: https://bugs.launchpad.net/bugs/2051560 The perf python module is required by some tools (e.g., tuned) and we are not currently providing it. Enable it to be able to support tools that require this module. Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
This commit is contained in:
committed by
Roxana Nicolescu
parent
759436dbda
commit
48357b9b6d
@@ -21,6 +21,7 @@ Build-Depends:
|
||||
pkg-config <!stage1>,
|
||||
python3 <!stage1>,
|
||||
python3-dev <!stage1>,
|
||||
python3-setuptools <!stage1>,
|
||||
flex <!stage1>,
|
||||
bison <!stage1>,
|
||||
libunwind8-dev [amd64 arm64 armhf ppc64el] <!stage1>,
|
||||
|
||||
@@ -12,6 +12,7 @@ do_tools_usbip = true
|
||||
do_tools_cpupower = true
|
||||
do_tools_perf = true
|
||||
do_tools_perf_jvmti = true
|
||||
do_tools_perf_python = true
|
||||
do_tools_bpftool = true
|
||||
do_tools_x86 = true
|
||||
do_tools_hyperv = true
|
||||
|
||||
@@ -15,6 +15,7 @@ do_tools_usbip = true
|
||||
do_tools_cpupower = true
|
||||
do_tools_perf = true
|
||||
do_tools_perf_jvmti = true
|
||||
do_tools_perf_python = true
|
||||
do_tools_bpftool = true
|
||||
|
||||
do_dtbs = true
|
||||
|
||||
@@ -11,6 +11,7 @@ do_tools_usbip = true
|
||||
do_tools_cpupower = true
|
||||
do_tools_perf = true
|
||||
do_tools_perf_jvmti = true
|
||||
do_tools_perf_python = true
|
||||
do_tools_bpftool = true
|
||||
|
||||
do_dtbs = true
|
||||
|
||||
@@ -12,6 +12,7 @@ do_tools_usbip = true
|
||||
do_tools_cpupower = true
|
||||
do_tools_perf = true
|
||||
do_tools_perf_jvmti = true
|
||||
do_tools_perf_python = true
|
||||
do_tools_bpftool = true
|
||||
|
||||
#do_flavour_image_package = false
|
||||
|
||||
@@ -20,5 +20,6 @@ do_tools_usbip = false
|
||||
do_tools_cpupower = false
|
||||
do_tools_perf = false
|
||||
do_tools_perf_jvmti = false
|
||||
do_tools_perf_python = false
|
||||
do_tools_bpftool = false
|
||||
do_dtbs = false
|
||||
|
||||
@@ -15,4 +15,5 @@ do_tools_usbip = true
|
||||
do_tools_cpupower = true
|
||||
do_tools_perf = true
|
||||
do_tools_perf_jvmti = true
|
||||
do_tools_perf_python = true
|
||||
do_tools_bpftool = true
|
||||
|
||||
Vendored
+1
@@ -48,6 +48,7 @@ include $(DROOT)/rules.d/1-maintainer.mk
|
||||
do_linux_tools=$(sort $(filter-out false,$(do_tools_usbip) $(do_tools_cpupower) $(do_tools_perf) $(do_tools_bpftool) $(do_tools_x86)))
|
||||
do_cloud_tools=$(sort $(filter-out false,$(do_tools_hyperv)))
|
||||
do_tools_perf_jvmti?=false
|
||||
do_tools_perf_python?=false
|
||||
|
||||
# Indep tools packages may only be built for the main linux source package
|
||||
ifeq ($(src_pkg_name),linux)
|
||||
|
||||
Vendored
+1
@@ -83,6 +83,7 @@ printenv:
|
||||
@echo " do_tools_host = $(do_tools_host)"
|
||||
@echo " do_tools_perf = $(do_tools_perf)"
|
||||
@echo " do_tools_perf_jvmti = $(do_tools_perf_jvmti)"
|
||||
@echo " do_tools_perf_python = $(do_tools_perf_python)"
|
||||
@echo " do_tools_usbip = $(do_tools_usbip)"
|
||||
@echo " do_tools_x86 = $(do_tools_x86)"
|
||||
@echo "do_cloud_tools = $(do_cloud_tools)"
|
||||
|
||||
Vendored
+4
-1
@@ -657,7 +657,7 @@ ifeq ($(do_tools_perf),true)
|
||||
cd $(builddirpa) && $(kmake) syncconfig
|
||||
cd $(builddirpa) && $(kmake) prepare
|
||||
cd $(builddirpa)/tools/perf && \
|
||||
$(kmake) prefix=/usr NO_LIBTRACEEVENT=1 HAVE_NO_LIBBFD=1 HAVE_CPLUS_DEMANGLE_SUPPORT=1 CROSS_COMPILE=$(CROSS_COMPILE) NO_LIBPYTHON=1 NO_LIBPERL=1 WERROR=0
|
||||
$(kmake) prefix=/usr NO_LIBTRACEEVENT=1 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
|
||||
@@ -702,6 +702,9 @@ ifeq ($(do_tools_perf),true)
|
||||
ifeq ($(do_tools_perf_jvmti),true)
|
||||
install -m755 $(builddirpa)/tools/perf/libperf-jvmti.so $(toolspkgdir)/usr/lib/$(src_pkg_name)-tools-$(abi_release)
|
||||
endif
|
||||
ifeq ($(do_tools_perf_python),true)
|
||||
install -m755 $(builddirpa)/tools/perf/python/perf*.so $(toolspkgdir)/usr/lib/python3/dist-packages
|
||||
endif
|
||||
endif
|
||||
ifeq ($(do_tools_bpftool),true)
|
||||
install -m755 $(builddirpa)/tools/bpf/bpftool/bpftool $(toolspkgdir)/usr/lib/$(src_pkg_name)-tools-$(abi_release)
|
||||
|
||||
Reference in New Issue
Block a user