From patchwork Fri Aug 30 16:34:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bethany Jamison X-Patchwork-Id: 1979130 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 4WwP044qypz1ygJ for ; Sat, 31 Aug 2024 02:35:32 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1sk4aq-00027B-2G; Fri, 30 Aug 2024 16:35:24 +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 1sk4an-00026B-2A for kernel-team@lists.ubuntu.com; Fri, 30 Aug 2024 16:35:21 +0000 Received: from mail-io1-f70.google.com (mail-io1-f70.google.com [209.85.166.70]) (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 600393F885 for ; Fri, 30 Aug 2024 16:35:20 +0000 (UTC) Received: by mail-io1-f70.google.com with SMTP id ca18e2360f4ac-8222bad34e9so36913039f.0 for ; Fri, 30 Aug 2024 09:35:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725035716; x=1725640516; 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=7kdyRLp2bYKfQwwm/Tmk/43xLbrfID+F/xS1DX7KXeQ=; b=AVpZiMbawpNZ/Aq2r9+RWFrDBx43KIhWrA5meLIgKe3EJ4V27wzzUjJzMLf1Q7/6jC 1ofw+2XjxQLIhWIbjsCOsQQAo1nxrnju7+CMcmqNLXsQQLRUq7zXQVJpL/QKAfxwElYj vEiF0QSAfxalMb6WH5Ff3vqVHy8qZ8Ezm1AIieCv3pK7Bj/X0MfMKRznk23AN+Aux1w+ 9mGusf3j74N8oPbyRgTbzU8lJuIBrQOk4eHOQB6v3kRAbmYlOlGPawm0VTd/OZWJKJdd I4TEydhF8orQxiEuOvMIU6plMe6UMRYC5j+EWB41c5VcvuK00EFSHH/neo344xjIXt2C 9J1w== X-Gm-Message-State: AOJu0YzqFu0RfZ5UhgBRwNyn7Q2ZPy3Sw/WagCJAsd2CP3Ex5qfhq4Qr bPL+bBC5J1kJRADqkGyw3m+FYyHsDAn9cjkAUrE39RcRZob81YDGY5M6hRDCRYtLycjLEO2gSaK JSHUMigbcSHLWeUzpweKo9RwZ9T0P1vs47aSAvmxjenzmzczAEiwOqYrzpeff9gYHFu1qnkjEHt 01ZwFwQpIyiA/p X-Received: by 2002:a6b:db0a:0:b0:80a:9c66:3842 with SMTP id ca18e2360f4ac-82a262dcc94mr177728739f.3.1725035716161; Fri, 30 Aug 2024 09:35:16 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG7XNf7A23JIMNtIZU6CkIozMppSzAKGXUVGUbE403de1BH+xTuEH8Q11xyVEDn5yU7umKYYQ== X-Received: by 2002:a6b:db0a:0:b0:80a:9c66:3842 with SMTP id ca18e2360f4ac-82a262dcc94mr177726639f.3.1725035715733; Fri, 30 Aug 2024 09:35:15 -0700 (PDT) Received: from smtp.gmail.com (167-248-51-36.oa02.lnk04.ne.dynamic.allophone.net. [167.248.51.36]) by smtp.gmail.com with ESMTPSA id ca18e2360f4ac-82a1a4c6034sm95389839f.49.2024.08.30.09.35.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Aug 2024 09:35:15 -0700 (PDT) From: Bethany Jamison To: kernel-team@lists.ubuntu.com Subject: [SRU][O][PATCH v3 1/1] UBUNTU: [Packaging] perf: reenable libtraceevent Date: Fri, 30 Aug 2024 11:34:36 -0500 Message-Id: <20240830163437.39869-2-bethany.jamison@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240830163437.39869-1-bethany.jamison@canonical.com> References: <20240830163437.39869-1-bethany.jamison@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" 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 --- 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