From patchwork Wed Aug 14 20:39:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bethany Jamison X-Patchwork-Id: 1972551 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 4Wkg9x6dLBz1yZl for ; Thu, 15 Aug 2024 06:40:21 +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 1seKn2-0006Ok-H5; Wed, 14 Aug 2024 20:40:16 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1seKmo-0006K3-JH for kernel-team@lists.ubuntu.com; Wed, 14 Aug 2024 20:40:02 +0000 Received: from mail-io1-f72.google.com (mail-io1-f72.google.com [209.85.166.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-1.canonical.com (Postfix) with ESMTPS id 3F8A63F0F8 for ; Wed, 14 Aug 2024 20:40:02 +0000 (UTC) Received: by mail-io1-f72.google.com with SMTP id ca18e2360f4ac-81f901cd3b5so36659239f.1 for ; Wed, 14 Aug 2024 13:40:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723668001; x=1724272801; 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=4L5hKsOKDPVCzW+lkPnp0hUWRWxIv3E5OsgprjdMb6I=; b=lq5VUjkLUrG5mktr9ZE2aW3geUycXnCEeHoiJFYhX1Vw+BpovCHyoEzpmatw79rvRr 3LN7Vi6ACk1chwk12UWgJ2PLf3kXjjxtyyFxL4Ra5H7l7zGWzwawrrfbXGKbrc8c5I4o FYefqRMT/ZxEY9FFGSTmvP5f3f+/51OSUhSc3P9Dco5DIsfMXme2tIKXoEIv/SAJs0Zs 2G/wCNi98+MQDSvo8DK8Nfi7dedIYisYfsz3961ltq0NA3G2v1ChjX+NXlPDTVXqRm2Q iC3IDhGTVwIxyJGI+5oSswIJrl8rnvMO0RQcp/52DX8mYHRuA6vH60Go7vU8znFc6IXW QXvw== X-Gm-Message-State: AOJu0YyUgaKiryQt05EnHmpHAvEBn09Z5wQzWlQM9zqhPOZbXPa1Z+Wb UJ7cPjVWhfxJ0+nN8KF0/LQaWZQjR6dxgnjEWoCk/M8SJHttD4rxxM2LWNaSH/vlbbonkEH63Ao st+2SDaecTLtTXmwl43HyiExLswk+MOA4QG0tVigs2zEoozYG0BChe+YRyoQiZDnLMjOmxBg3uE w1Ot4vG1NhZA== X-Received: by 2002:a05:6602:1508:b0:822:2584:2f98 with SMTP id ca18e2360f4ac-824dadbe641mr483227839f.11.1723668000932; Wed, 14 Aug 2024 13:40:00 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG6ucBWTLOfZdbQvAtVuFvObIwyJkr+nvw8xMp1KV2rfTmDpl3+UJLRxAfUwXMk2Cc8sld/1A== X-Received: by 2002:a05:6602:1508:b0:822:2584:2f98 with SMTP id ca18e2360f4ac-824dadbe641mr483226239f.11.1723668000483; Wed, 14 Aug 2024 13:40:00 -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 8926c6da1cb9f-4ca769122c6sm3472634173.22.2024.08.14.13.39.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Aug 2024 13:40:00 -0700 (PDT) From: Bethany Jamison To: kernel-team@lists.ubuntu.com Subject: [SRU][N][PATCH 1/1] UBUNTU: [Packaging]: perf: reenable libtraceevent Date: Wed, 14 Aug 2024 15:39:58 -0500 Message-Id: <20240814203958.36218-3-bethany.jamison@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240814203958.36218-1-bethany.jamison@canonical.com> References: <20240814203958.36218-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 commit 92550b568d due to LP#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 89d1eb769ed90..fe66f8a0c0887 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -665,11 +665,11 @@ ifeq ($(do_tools_perf),true) cd $(builddirpa) && $(kmake) syncconfig cd $(builddirpa) && $(kmake) prepare 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 ifeq ($(do_tools_bpftool),true) 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 rm -f $(builddirpa)/vmlinux endif ifeq ($(do_tools_x86),true) diff --git a/debian/rules.d/3-binary-indep.mk b/debian/rules.d/3-binary-indep.mk index 5a3418cd66b01..75b8e457b7d07 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