From patchwork Wed Aug 14 20:39:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bethany Jamison X-Patchwork-Id: 1972550 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 4Wkg9t6l3Wz1yZl for ; Thu, 15 Aug 2024 06:40:18 +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 1seKmx-0006Lq-Bi; Wed, 14 Aug 2024 20:40:11 +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 1seKmn-0006Jl-Vu for kernel-team@lists.ubuntu.com; Wed, 14 Aug 2024 20:40:02 +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-1.canonical.com (Postfix) with ESMTPS id A3CA43F0F8 for ; Wed, 14 Aug 2024 20:40:01 +0000 (UTC) Received: by mail-io1-f70.google.com with SMTP id ca18e2360f4ac-81f93601444so34491939f.2 for ; Wed, 14 Aug 2024 13:40:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723668000; x=1724272800; 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=vwRwnt4Uqych/Nfwt+M1tmbv4wtg18FkZd7BhQv4qYY=; b=M8eNacHXXYYkc+SXgmtEDh0pOx5YH+9nJ1OFd9wAxxBY0JsWm7Aa1FWEDV5U3yNniX 7L7QJlsO2MTXv3kFrU5hDEIom9rQ2HDRwc2pJnPrbKLA+td72x7HPJkgMNrs0xnp0GQM 7gkatgcCOqc9vyqhs1D5TM3Ax5O4HxS4+UAIIw7kgWhqoiGbROqCX32EFqay6HrNharf G0IdzV0EDETISXqq2YYJajSEpSsEkO7W3z9ndL61CJwyUa+28/dofpxgHZFN6zoTiqrk c8aUqWl33U0LV6QAIgCuzSDt82hhQrlvn6vDezpkD3hx1uLvqSD/7bvdsMXJxvULfc4r 8pDw== X-Gm-Message-State: AOJu0Yw3vulvX7yxW1YYNXVY0Jbv16a4Ez4RZeLXRAmGdg1R7Uo8tWWX EJDk+H/FUiIS1XnylFtHUtbmAVIvaNuVaFLEwVAonUrspy8Qx/z7pywwYKgA57xP2Qhpu1HbcBw NsJaOn8x2XuiA+zqutdXghIcNLP4kGN3qbOv7uj31iXVxVWfyX2QnDMBZu4ecUzFuunp19LopIA 9lymCfg75spQ== X-Received: by 2002:a05:6602:2d87:b0:814:9cb6:4272 with SMTP id ca18e2360f4ac-824dae10a53mr436266639f.17.1723668000263; Wed, 14 Aug 2024 13:40:00 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE4wc+YUwQYNRY9Qd1CHqCXW2tQhNW3qPBCGLoT734f7uyUfbkxwNk61U5r6zGBF8XhUIfm7A== X-Received: by 2002:a05:6602:2d87:b0:814:9cb6:4272 with SMTP id ca18e2360f4ac-824dae10a53mr436264539f.17.1723667999850; Wed, 14 Aug 2024 13:39:59 -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:39:59 -0700 (PDT) From: Bethany Jamison To: kernel-team@lists.ubuntu.com Subject: [SRU][O][PATCH 1/1] UBUNTU: [Packaging] perf: reenable libtraceevent Date: Wed, 14 Aug 2024 15:39:57 -0500 Message-Id: <20240814203958.36218-2-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 (92550b568d) due to LP:#2074190 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