From patchwork Fri Mar 22 15:42:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrea Righi X-Patchwork-Id: 1914973 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4V1RX90mXxz1yWp for ; Sat, 23 Mar 2024 02:46:48 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1rnh6N-0005S1-Nx; Fri, 22 Mar 2024 15:46:39 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1rnh6L-0005RY-Nj for kernel-team@lists.ubuntu.com; Fri, 22 Mar 2024 15:46:37 +0000 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 704763F274 for ; Fri, 22 Mar 2024 15:46:37 +0000 (UTC) Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-41463be093aso11455735e9.3 for ; Fri, 22 Mar 2024 08:46:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711122397; x=1711727197; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6LJcxiWC7UyhF2d+dipG67+LeGpFXRMT4GLlK3FD8uY=; b=vx/fTCHJkb6qToG2lAx2hWH0OWfaMw33iSD+YC8xjjttE30oO/55oKJt1erpUlv7A+ ky6rfC0d+wZHg0Tl1yLd6deWFw3hI2Li+COey4UnvngL26lFfpMM5KIAhYAIpu3OP5Dc gEJbcRvp70/exuAI4zH6xPoVz3AJzpwHJXFfLuaYEPAmq+IoWdEwiUdvk9YCDR1aSqPd G7ONQt/8vYZGGkQCsR39IU0I5VIJzqFoh1qMfAw0yDeFJYcm6o8nFc65TYlk40rLLra5 6zZrmM+Xzl2PlAhkgp1b1e91lO42nGYAxWAxDxlvpbuhJYP6mqJUUpXXMLzmZU2DCsFv b7Mg== X-Gm-Message-State: AOJu0YziDuq3agG1D/7PBe9+9iBKV633kTAtiqx6Kg8whzrusC6TZrTH /2D1dCmzktUXcm/MBw9WjpV7dTYeADoShqTYkkxXEtxOJmPJfuDlaCWmG3uxUxVk1Q8B08y9uWW uwJWGhzIFOoXT9x4YLtP0qz3kzlT/qYLxYdS8cYqn6f8KE5RNu1V3Pi9DiyfMQ0v511/f4INl4n 3CiWQsw+2ZZQ== X-Received: by 2002:a05:600c:1c26:b0:414:c64:f3d0 with SMTP id j38-20020a05600c1c2600b004140c64f3d0mr1715554wms.27.1711122396934; Fri, 22 Mar 2024 08:46:36 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGQpB5JRr9o7dARq0lmO3minyesAkvHleSsVeDRaMreT5dUwH42JCRqYTy8xxc6e4isv7aEAw== X-Received: by 2002:a05:600c:1c26:b0:414:c64:f3d0 with SMTP id j38-20020a05600c1c2600b004140c64f3d0mr1715537wms.27.1711122396453; Fri, 22 Mar 2024 08:46:36 -0700 (PDT) Received: from gpd.station (net-188-217-54-181.cust.vodafonedsl.it. [188.217.54.181]) by smtp.gmail.com with ESMTPSA id fs7-20020a05600c3f8700b0041465c859d0sm3351286wmb.39.2024.03.22.08.46.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Mar 2024 08:46:36 -0700 (PDT) From: Andrea Righi To: kernel-team@lists.ubuntu.com Subject: [U/N][PATCH 1/2] UBUNTU: [Packaging] enable perf python module Date: Fri, 22 Mar 2024 16:42:39 +0100 Message-ID: <20240322154631.804565-2-andrea.righi@canonical.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240322154631.804565-1-andrea.righi@canonical.com> References: <20240322154631.804565-1-andrea.righi@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" 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 --- debian.master/control.stub.in | 1 + debian.master/rules.d/amd64.mk | 1 + debian.master/rules.d/arm64.mk | 1 + debian.master/rules.d/armhf.mk | 1 + debian.master/rules.d/ppc64el.mk | 1 + debian.master/rules.d/riscv64.mk | 1 + debian.master/rules.d/s390x.mk | 3 ++- debian/rules | 1 + debian/rules.d/1-maintainer.mk | 1 + debian/rules.d/2-binary-arch.mk | 5 ++++- 10 files changed, 14 insertions(+), 2 deletions(-) diff --git a/debian.master/control.stub.in b/debian.master/control.stub.in index 303fb5b01b79..ab80b3853f64 100644 --- a/debian.master/control.stub.in +++ b/debian.master/control.stub.in @@ -21,6 +21,7 @@ Build-Depends: pkg-config , python3 , python3-dev , + python3-setuptools , flex , bison , libunwind8-dev [amd64 arm64 armhf ppc64el] , diff --git a/debian.master/rules.d/amd64.mk b/debian.master/rules.d/amd64.mk index 5e2c7cb1182b..8ac9044a7dc0 100644 --- a/debian.master/rules.d/amd64.mk +++ b/debian.master/rules.d/amd64.mk @@ -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 diff --git a/debian.master/rules.d/arm64.mk b/debian.master/rules.d/arm64.mk index 3306ccfce186..3049c4f910df 100644 --- a/debian.master/rules.d/arm64.mk +++ b/debian.master/rules.d/arm64.mk @@ -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 diff --git a/debian.master/rules.d/armhf.mk b/debian.master/rules.d/armhf.mk index 3a1303c4f12a..21127fecc233 100644 --- a/debian.master/rules.d/armhf.mk +++ b/debian.master/rules.d/armhf.mk @@ -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 diff --git a/debian.master/rules.d/ppc64el.mk b/debian.master/rules.d/ppc64el.mk index 2ceed4eaba9d..e85cf3d5b71f 100644 --- a/debian.master/rules.d/ppc64el.mk +++ b/debian.master/rules.d/ppc64el.mk @@ -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 diff --git a/debian.master/rules.d/riscv64.mk b/debian.master/rules.d/riscv64.mk index a90e9b99f6f0..d8d518f967e9 100644 --- a/debian.master/rules.d/riscv64.mk +++ b/debian.master/rules.d/riscv64.mk @@ -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 diff --git a/debian.master/rules.d/s390x.mk b/debian.master/rules.d/s390x.mk index 27d3af23d1d0..af0b927e732a 100644 --- a/debian.master/rules.d/s390x.mk +++ b/debian.master/rules.d/s390x.mk @@ -14,5 +14,6 @@ sipl_signed = true do_tools_usbip = true do_tools_cpupower = true do_tools_perf = true -do_tools_perf_jvmti = true +to_tools_perf_jvmti = true +to_tools_perf_python = true do_tools_bpftool = true diff --git a/debian/rules b/debian/rules index 48298523431c..43eae8d5aaa8 100755 --- a/debian/rules +++ b/debian/rules @@ -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) diff --git a/debian/rules.d/1-maintainer.mk b/debian/rules.d/1-maintainer.mk index 928343e3f7e0..c01db7582f1d 100644 --- a/debian/rules.d/1-maintainer.mk +++ b/debian/rules.d/1-maintainer.mk @@ -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)" diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index c03a76a391e8..0e9e389e57e3 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -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)