From patchwork Wed Apr 3 05:13:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrea Righi X-Patchwork-Id: 1919027 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 4V8XzC2rNyz23ty for ; Wed, 3 Apr 2024 16:16:22 +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 1rrsyl-0003q0-D2; Wed, 03 Apr 2024 05:16:07 +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 1rrsyi-0003pS-8Q for kernel-team@lists.ubuntu.com; Wed, 03 Apr 2024 05:16:04 +0000 Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.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 DA9A53F274 for ; Wed, 3 Apr 2024 05:16:03 +0000 (UTC) Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-a4e8e4efe58so96700266b.0 for ; Tue, 02 Apr 2024 22:16:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712121363; x=1712726163; 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=F9g5tppGAAAJ0e3HSDhVJK3hz3SuV3eVzFbhFcqTZRI=; b=N8/ddn06NF//ax5u6gSl7ZbNlZiz34FUzSSG20ijlHx0v0dcaQ/3gKteod9GRIoIDF +ihucVSyknpBDLe+U+D9GFwOJyFZTUs4NICSQh+6wH4mbwXnYtZOMHgx7DAIkLwumwtR /B+WJUoDeuNiUBcU7Rx8ueIfq7dCPRjbvYPiAoafOjf/stnpVJaPE983LnpOHnedYjoE FMKki3o8ZLSIDTW7pnMChGka03p3682I6ePI4z4R40Dzivrd+anzxXYNjbnm1kdo/Wsf cSFaCuQhIfbcZz31jXDL9VDKGZGJDq26woQSRdkd686QjivMpxp2/E0QC2dXR2I4cGJP 9EJg== X-Gm-Message-State: AOJu0YwW8Kn3InGQP/VH39NMwNhdiBrIfoxGLtnxTneC/iX58bzwZw90 KMCK8K9xO8PnC4XKfa766moow7bLWFvbBLFjmhuEOPKTHvra37QSnW9FVa7C+oiR7SIAL6nqraF pLBnB2c4/UmBLHHmW/Slc1xxhM0w0PwwJxCiK4v9Nc0jSxLsZANswWc23O9YIKFc6RXRF0+p07N hM1ghzPNlUxg== X-Received: by 2002:a17:906:d92c:b0:a4e:96fa:e1ba with SMTP id rn12-20020a170906d92c00b00a4e96fae1bamr1196969ejb.3.1712121363280; Tue, 02 Apr 2024 22:16:03 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH4aQ5OMeTftUa5qQ06xc1HGYPIgh2F3ogdPY0vqh/btkd1UBy/dXOXcttPlTD6RpVJl+Nj0Q== X-Received: by 2002:a17:906:d92c:b0:a4e:96fa:e1ba with SMTP id rn12-20020a170906d92c00b00a4e96fae1bamr1196953ejb.3.1712121362712; Tue, 02 Apr 2024 22:16:02 -0700 (PDT) Received: from localhost.localdomain (host-95-248-169-71.retail.telecomitalia.it. [95.248.169.71]) by smtp.gmail.com with ESMTPSA id ae10-20020a17090725ca00b00a4e657a5f1asm3599298ejc.112.2024.04.02.22.16.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Apr 2024 22:16:02 -0700 (PDT) From: Andrea Righi To: kernel-team@lists.ubuntu.com Subject: [N/U][PATCH 1/2] UBUNTU: SAUCE: rtla: fix deb build Date: Wed, 3 Apr 2024 07:13:29 +0200 Message-ID: <20240403051553.257864-2-andrea.righi@canonical.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240403051553.257864-1-andrea.righi@canonical.com> References: <20240403051553.257864-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/2059080 We need to explicitly define build rules for C object files when building the deb, otherwise we may get the following build failure: make[1]: *** No rule to make target 'src/osnoise.o', needed by 'static'. Stop. This doesn't seem to happen when building rtla manually, but we need it when we build the deb package, so add the extra rule to make the build more robust. Signed-off-by: Andrea Righi --- tools/tracing/rtla/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/tracing/rtla/Makefile b/tools/tracing/rtla/Makefile index afd18c678ff5..f4916d402c03 100644 --- a/tools/tracing/rtla/Makefile +++ b/tools/tracing/rtla/Makefile @@ -111,6 +111,9 @@ warnings: $(WARNINGS) $(ERROR_OUT) endif +%.o: %.c + $(CC) $(CFLAGS) -c -o $@ $< + rtla: $(OBJ) $(CC) -o rtla $(LDFLAGS) $(OBJ) $(LIBS) From patchwork Wed Apr 3 05:13:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrea Righi X-Patchwork-Id: 1919026 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 4V8XzC1yydz23tv for ; Wed, 3 Apr 2024 16:16:22 +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 1rrsym-0003qR-Jg; Wed, 03 Apr 2024 05:16:08 +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 1rrsyi-0003pa-Il for kernel-team@lists.ubuntu.com; Wed, 03 Apr 2024 05:16:04 +0000 Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) (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 5A6F43F274 for ; Wed, 3 Apr 2024 05:16:04 +0000 (UTC) Received: by mail-ej1-f71.google.com with SMTP id a640c23a62f3a-a4d8e5d6722so416567966b.0 for ; Tue, 02 Apr 2024 22:16:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712121364; x=1712726164; 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=5zhgd78wp5nrPWo+7mvfR7TNivYyRNNwGpM8iUEaTxQ=; b=Px1huqXwvOxC2FlQQGSgRmDixt+VIFR2poUoikxjE2O805wUbwDDFdfXKtfh9eZwix gvjQGDACqBmwFGG2arr/Fj+e/eO8Lg4o1ErpC0QHIWqbzpJr3QQyilrXmO+J5KpPDuyA EzntsWDj126y2rg0yRtMZIw8S+IKm7gu8UfH3/b5biUbfWbk5l0urGEWIZJuRSgbU2od kDsCl8EAX2GAMwQKiHE+DKccpv6iRKQc6UrTAQoaMOg9oM09k2yzKZbBdgDT0Yyd2F2V hvz/0a9sHLAr7flIFaRi5ViuWLyb28qTcrf6QqgFQaOp50YctPlBO63qPWraAdCXCI1b Z6Pw== X-Gm-Message-State: AOJu0Yxh6qnEwRfttqXqoT8Kowy2IWtMsW9rTqBdDHXL+1bLyMyYjw5a Qj6y9WfL9WtEOVwLHyeny8Gqzz3fzpuPBnKH+U+8oYvqyXUhWnAKAXCP4pWhbkgKicUUSS5JWNB aIxJe/m/GkUYPorZy4ljWkds79Z5Ah1+Btp8fWBGUUXhhqw15BW+N+gtYpKElZHBK0Qd08CtoW8 nQqqlqRkOiiw== X-Received: by 2002:a17:907:7f17:b0:a46:8c03:b659 with SMTP id qf23-20020a1709077f1700b00a468c03b659mr10915496ejc.42.1712121363939; Tue, 02 Apr 2024 22:16:03 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFFhhaWWLeG3SJcP8du1BNjDH0H7cEWzMZdR89tvIDt7/yvBSpLMc1ohJEHUZJvchdIXs2QVA== X-Received: by 2002:a17:907:7f17:b0:a46:8c03:b659 with SMTP id qf23-20020a1709077f1700b00a468c03b659mr10915480ejc.42.1712121363512; Tue, 02 Apr 2024 22:16:03 -0700 (PDT) Received: from localhost.localdomain (host-95-248-169-71.retail.telecomitalia.it. [95.248.169.71]) by smtp.gmail.com with ESMTPSA id ae10-20020a17090725ca00b00a4e657a5f1asm3599298ejc.112.2024.04.02.22.16.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Apr 2024 22:16:03 -0700 (PDT) From: Andrea Righi To: kernel-team@lists.ubuntu.com Subject: [N/U][PATCH 2/2] UBUNTU: [Packaging] add Real-time Linux Analysis tool (rtla) to linux-tools Date: Wed, 3 Apr 2024 07:13:30 +0200 Message-ID: <20240403051553.257864-3-andrea.righi@canonical.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240403051553.257864-1-andrea.righi@canonical.com> References: <20240403051553.257864-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/2059080 Signed-off-by: Andrea Righi --- debian.master/control.stub.in | 2 ++ 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/s390x.mk | 1 + debian/rules.d/2-binary-arch.mk | 10 ++++++++++ debian/rules.d/3-binary-indep.mk | 2 ++ 8 files changed, 19 insertions(+) diff --git a/debian.master/control.stub.in b/debian.master/control.stub.in index ab80b3853f64..8ea81bcb4719 100644 --- a/debian.master/control.stub.in +++ b/debian.master/control.stub.in @@ -37,6 +37,8 @@ Build-Depends: libtool , uuid-dev , libnuma-dev [amd64 arm64 ppc64el s390x] , + libtraceevent-dev , + libtracefs-dev , dkms , curl , zstd , diff --git a/debian.master/rules.d/amd64.mk b/debian.master/rules.d/amd64.mk index 8ac9044a7dc0..668da4e33b9c 100644 --- a/debian.master/rules.d/amd64.mk +++ b/debian.master/rules.d/amd64.mk @@ -16,6 +16,7 @@ do_tools_perf_python = true do_tools_bpftool = true do_tools_x86 = true do_tools_hyperv = true +do_tools_rtla = true do_extras_package = true do_tools_acpidbg = true do_lib_rust = true diff --git a/debian.master/rules.d/arm64.mk b/debian.master/rules.d/arm64.mk index 3049c4f910df..2f23ecddcea0 100644 --- a/debian.master/rules.d/arm64.mk +++ b/debian.master/rules.d/arm64.mk @@ -17,5 +17,6 @@ do_tools_perf = true do_tools_perf_jvmti = true do_tools_perf_python = true do_tools_bpftool = true +do_tools_rtla = true do_dtbs = true diff --git a/debian.master/rules.d/armhf.mk b/debian.master/rules.d/armhf.mk index 21127fecc233..9036a5863606 100644 --- a/debian.master/rules.d/armhf.mk +++ b/debian.master/rules.d/armhf.mk @@ -13,5 +13,6 @@ do_tools_perf = true do_tools_perf_jvmti = true do_tools_perf_python = true do_tools_bpftool = true +do_tools_rtla = true do_dtbs = true diff --git a/debian.master/rules.d/ppc64el.mk b/debian.master/rules.d/ppc64el.mk index e85cf3d5b71f..c49edccfb4e4 100644 --- a/debian.master/rules.d/ppc64el.mk +++ b/debian.master/rules.d/ppc64el.mk @@ -14,5 +14,6 @@ do_tools_perf = true do_tools_perf_jvmti = true do_tools_perf_python = true do_tools_bpftool = true +do_tools_rtla = true #do_flavour_image_package = false diff --git a/debian.master/rules.d/s390x.mk b/debian.master/rules.d/s390x.mk index 5b1682c786e6..e679eaa83cad 100644 --- a/debian.master/rules.d/s390x.mk +++ b/debian.master/rules.d/s390x.mk @@ -17,3 +17,4 @@ do_tools_perf = true do_tools_perf_jvmti = true do_tools_perf_python = true do_tools_bpftool = true +do_tools_rtla = false diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index 84c2e13bfb04..986a18d7abac 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -352,6 +352,9 @@ endif ifeq ($(do_tools_cpupower),true) $(LN) ../../$(src_pkg_name)-tools-$(abi_release)/cpupower $(toolspkgdir)/usr/lib/linux-tools/$(abi_release)-$* endif +ifeq ($(do_tools_rtla),true) + $(LN) ../../$(src_pkg_name)-tools-$(abi_release)/rtla $(toolspkgdir)/usr/lib/linux-tools/$(abi_release)-$* +endif ifeq ($(do_tools_perf),true) $(LN) ../../$(src_pkg_name)-tools-$(abi_release)/perf $(toolspkgdir)/usr/lib/linux-tools/$(abi_release)-$* ifeq ($(do_tools_perf_jvmti),true) @@ -641,6 +644,9 @@ endif ifeq ($(do_tools_acpidbg),true) cd $(builddirpa)/tools/power/acpi && make clean && make CFLAGS="-g -O2 -static -I$(builddirpa)/include" CROSS_COMPILE=$(CROSS_COMPILE) acpidbg endif +ifeq ($(do_tools_rtla),true) + cd $(builddirpa)/tools/tracing/rtla && make clean && make CFLAGS='-g -O -Wall -I/usr/include/tracefs -I/usr/include/traceevent -DVERSION="\"6.8.1\""' static +endif ifeq ($(do_tools_cpupower),true) make -C $(builddirpa)/tools/power/cpupower \ CROSS_COMPILE=$(CROSS_COMPILE) \ @@ -697,6 +703,10 @@ ifeq ($(do_tools_cpupower),true) install -m755 $(builddirpa)/tools/power/cpupower/cpupower \ $(toolspkgdir)/usr/lib/$(src_pkg_name)-tools-$(abi_release) endif +ifeq ($(do_tools_rtla),true) + install -m755 $(builddirpa)/tools/tracing/rtla/rtla-static \ + $(toolspkgdir)/usr/lib/$(src_pkg_name)-tools-$(abi_release)/rtla +endif ifeq ($(do_tools_perf),true) install -m755 $(builddirpa)/tools/perf/perf $(toolspkgdir)/usr/lib/$(src_pkg_name)-tools-$(abi_release) ifeq ($(do_tools_perf_jvmti),true) diff --git a/debian/rules.d/3-binary-indep.mk b/debian/rules.d/3-binary-indep.mk index efe66df01d8b..5a3418cd66b0 100644 --- a/debian/rules.d/3-binary-indep.mk +++ b/debian/rules.d/3-binary-indep.mk @@ -89,6 +89,8 @@ ifeq ($(do_tools_common),true) install -m755 debian/tools/generic $(toolsbin)/cpupower install -m644 $(CURDIR)/tools/power/cpupower/man/*.1 $(toolsman)/man1/ + install -m755 debian/tools/generic $(toolsbin)/rtla + install -m755 debian/tools/generic $(toolsbin)/perf install -m755 debian/tools/generic $(toolssbin)/bpftool